Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/111722

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali@marvell.com>
Date: Tuesday, May 24 2022 09:57:17 
Applied on: CommitID:981a025741f80b4036f994ed30b04e757299ab19
Apply patch set 111722 failed:

Checking patch examples/ipsec-secgw/ipsec-secgw.c...
Hunk #2 succeeded at 107 (offset 7 lines).
error: while searching for:
			process_pkts_outbound(&qconf->outbound, &traffic);
	}

	route4_pkts(qconf->rt4_ctx, traffic.ip4.pkts, traffic.ip4.num,
		    qconf->outbound.ipv4_offloads, true);
	route6_pkts(qconf->rt6_ctx, traffic.ip6.pkts, traffic.ip6.num);
}

static inline void

error: patch failed: examples/ipsec-secgw/ipsec-secgw.c:561
Hunk #4 succeeded at 1969 (offset 562 lines).
Hunk #5 succeeded at 2292 (offset 421 lines).
Checking patch examples/ipsec-secgw/ipsec_lpm_neon.h...
Checking patch examples/ipsec-secgw/ipsec_neon.h...
Checking patch examples/ipsec-secgw/ipsec_worker.c...
error: while searching for:
				v6_num = ip6.num;
			}

			route4_pkts(rt4_ctx, v4, v4_num, 0, false);
			route6_pkts(rt6_ctx, v6, v6_num);
		}
	}
}

error: patch failed: examples/ipsec-secgw/ipsec_worker.c:1248
Applying patch examples/ipsec-secgw/ipsec-secgw.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Applied patch examples/ipsec-secgw/ipsec_lpm_neon.h cleanly.
Applied patch examples/ipsec-secgw/ipsec_neon.h cleanly.
Applying patch examples/ipsec-secgw/ipsec_worker.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
diff a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c	(rejected hunks)
@@ -561,9 +571,16 @@ process_pkts(struct lcore_conf *qconf, struct rte_mbuf **pkts,
 			process_pkts_outbound(&qconf->outbound, &traffic);
 	}
 
+#if defined __ARM_NEON
+	/* Neon optimized packet routing */
+	route4_pkts_neon(qconf->rt4_ctx, traffic.ip4.pkts, traffic.ip4.num,
+			 qconf->outbound.ipv4_offloads, true);
+	route6_pkts_neon(qconf->rt6_ctx, traffic.ip6.pkts, traffic.ip6.num);
+#else
 	route4_pkts(qconf->rt4_ctx, traffic.ip4.pkts, traffic.ip4.num,
 		    qconf->outbound.ipv4_offloads, true);
 	route6_pkts(qconf->rt6_ctx, traffic.ip6.pkts, traffic.ip6.num);
+#endif
 }
 
 static inline void
diff a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c	(rejected hunks)
@@ -1248,8 +1252,13 @@ ipsec_poll_mode_wrkr_inl_pr(void)
 				v6_num = ip6.num;
 			}
 
+#if defined __ARM_NEON
+			route4_pkts_neon(rt4_ctx, v4, v4_num, 0, false);
+			route6_pkts_neon(rt6_ctx, v6, v6_num);
+#else
 			route4_pkts(rt4_ctx, v4, v4_num, 0, false);
 			route6_pkts(rt6_ctx, v6, v6_num);
+#endif
 		}
 	}
 }

https://lab.dpdk.org/results/dashboard/patchsets/22263/

UNH-IOL DPDK Community Lab