[dpdk-dev] [PATCH] examples/ipsec-secgw: use mbuf packet type in ev worker

[Nithin Dabilpuram]

Use mbuf packet type for traffic identification as
packet is parsed already by HW before and HW/PMD updates
necessary info in mbuf packet type of the found protocols.

This change is specifically for event mode.

Signed-off-by: Nithin Dabilpuram <ndabilpuram at marvell.com>
---
 examples/ipsec-secgw/ipsec_worker.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c
index 647e22d..b77afb5 100644
--- a/examples/ipsec-secgw/ipsec_worker.c
+++ b/examples/ipsec-secgw/ipsec_worker.c
@@ -16,19 +16,22 @@ static inline enum pkt_type
 process_ipsec_get_pkt_type(struct rte_mbuf *pkt, uint8_t **nlp)
 {
 	struct rte_ether_hdr *eth;
+	uint32_t ptype = pkt->packet_type;
 
 	eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
-	if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) {
+	rte_prefetch0(eth);
+
+	if (RTE_ETH_IS_IPV4_HDR(ptype)) {
 		*nlp = RTE_PTR_ADD(eth, RTE_ETHER_HDR_LEN +
 				offsetof(struct ip, ip_p));
-		if (**nlp == IPPROTO_ESP)
+		if ((ptype & RTE_PTYPE_TUNNEL_MASK) == RTE_PTYPE_TUNNEL_ESP)
 			return PKT_TYPE_IPSEC_IPV4;
 		else
 			return PKT_TYPE_PLAIN_IPV4;
-	} else if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) {
+	} else if (RTE_ETH_IS_IPV6_HDR(ptype)) {
 		*nlp = RTE_PTR_ADD(eth, RTE_ETHER_HDR_LEN +
 				offsetof(struct ip6_hdr, ip6_nxt));
-		if (**nlp == IPPROTO_ESP)
+		if ((ptype & RTE_PTYPE_TUNNEL_MASK) == RTE_PTYPE_TUNNEL_ESP)
 			return PKT_TYPE_IPSEC_IPV6;
 		else
 			return PKT_TYPE_PLAIN_IPV6;
@@ -336,7 +339,7 @@ process_ipsec_ev_outbound(struct ipsec_ctx *ctx, struct route_table *rt,
 	}
 
 	/* Validate sa_idx */
-	if (sa_idx >= ctx->sa_ctx->nb_sa)
+	if (unlikely(sa_idx >= ctx->sa_ctx->nb_sa))
 		goto drop_pkt_and_exit;
 
 	/* Else the packet has to be protected */
@@ -351,7 +354,7 @@ process_ipsec_ev_outbound(struct ipsec_ctx *ctx, struct route_table *rt,
 	sess = ipsec_get_primary_session(sa);
 
 	/* Allow only inline protocol for now */
-	if (sess->type != RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL) {
+	if (unlikely(sess->type != RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL)) {
 		RTE_LOG(ERR, IPSEC, "SA type not supported\n");
 		goto drop_pkt_and_exit;
 	}
-- 
2.8.4