mbuf: add namespace to offload flags

[dpdk.git] / examples / ipsec-secgw / ipsec_worker.c

diff --git a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c
index c545497..6d3f72a 100644 (file)
--- a/examples/ipsec-secgw/ipsec_worker.c
+++ b/examples/ipsec-secgw/ipsec_worker.c
@@ -21,19 +21,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;
@@ -49,8 +52,8 @@ update_mac_addrs(struct rte_mbuf *pkt, uint16_t portid)
        struct rte_ether_hdr *ethhdr;
 
        ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
-       memcpy(&ethhdr->s_addr, &ethaddr_tbl[portid].src, RTE_ETHER_ADDR_LEN);
-       memcpy(&ethhdr->d_addr, &ethaddr_tbl[portid].dst, RTE_ETHER_ADDR_LEN);
+       memcpy(&ethhdr->src_addr, &ethaddr_tbl[portid].src, RTE_ETHER_ADDR_LEN);
+       memcpy(&ethhdr->dst_addr, &ethaddr_tbl[portid].dst, RTE_ETHER_ADDR_LEN);
 }
 
 static inline void
@@ -208,9 +211,9 @@ process_ipsec_ev_inbound(struct ipsec_ctx *ctx, struct route_table *rt,
 
        switch (type) {
        case PKT_TYPE_PLAIN_IPV4:
-               if (pkt->ol_flags & PKT_RX_SEC_OFFLOAD) {
+               if (pkt->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD) {
                        if (unlikely(pkt->ol_flags &
-                                    PKT_RX_SEC_OFFLOAD_FAILED)) {
+                                    RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED)) {
                                RTE_LOG(ERR, IPSEC,
                                        "Inbound security offload failed\n");
                                goto drop_pkt_and_exit;
@@ -226,9 +229,9 @@ process_ipsec_ev_inbound(struct ipsec_ctx *ctx, struct route_table *rt,
                break;
 
        case PKT_TYPE_PLAIN_IPV6:
-               if (pkt->ol_flags & PKT_RX_SEC_OFFLOAD) {
+               if (pkt->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD) {
                        if (unlikely(pkt->ol_flags &
-                                    PKT_RX_SEC_OFFLOAD_FAILED)) {
+                                    RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED)) {
                                RTE_LOG(ERR, IPSEC,
                                        "Inbound security offload failed\n");
                                goto drop_pkt_and_exit;
@@ -343,7 +346,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 */
@@ -358,7 +361,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;
        }
@@ -367,7 +370,7 @@ process_ipsec_ev_outbound(struct ipsec_ctx *ctx, struct route_table *rt,
                                      sess->security.ses, pkt, NULL);
 
        /* Mark the packet for Tx security offload */
-       pkt->ol_flags |= PKT_TX_SEC_OFFLOAD;
+       pkt->ol_flags |= RTE_MBUF_F_TX_SEC_OFFLOAD;
 
        /* Get the port to which this pkt need to be submitted */
        port_id = sa->portid;
@@ -482,7 +485,7 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
                                                      NULL);
 
                        /* Mark the packet for Tx security offload */
-                       pkt->ol_flags |= PKT_TX_SEC_OFFLOAD;
+                       pkt->ol_flags |= RTE_MBUF_F_TX_SEC_OFFLOAD;
 
                        /* Provide L2 len for Outbound processing */
                        pkt->l2_len = RTE_ETHER_HDR_LEN;