mbuf: flatten struct vlan_macip

The vlan_macip structure combined a vlan tag id with l2 and l3 headers
lengths for tracking offloads. However, this structure was only used as
a unit by the e1000 and ixgbe drivers, not generally.

This patch removes the structure from the mbuf header and places the
fields into the mbuf structure directly at the required point, without
any net effect on the structure layout. This allows us to treat the vlan
tags and header length fields as separate for future mbuf changes. The
drivers which were written to use the combined structure still do so,
using a driver-local definition of it.

Reduce perf regression caused by splitting vlan_macip field. This is
done by providing a single uint16_t value to allow writing/clearing
the l2 and l3 lengths together. There is still a small perf hit to the
slow path TX due to the reads from vlan_tci and l2/l3 lengths being
separated. (<5% in my tests with testpmd with no extra params).
Unfortunately, this cannot be eliminated, without restoring the vlan
tags and l2/l3 lengths as a combined 32-bit field. This would prevent
us from ever looking to move those fields about and is an artificial tie
that applies only for performance in igb and ixgbe drivers. Therefore,
this patch keeps the vlan_tci field separate from the lengths as the
best solution going forward.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 655b6d8f411b6628ae02777e1503f37a7bc3423b..28b66f58739c383509c82781056de394b9ab26c0 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -432,8 +432,8 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                }
 
                /* Combine the packet header write. VLAN is not consider here */
-               mb->vlan_macip.f.l2_len = l2_len;
-               mb->vlan_macip.f.l3_len = l3_len;
+               mb->l2_len = l2_len;
+               mb->l3_len = l3_len;
                mb->ol_flags = ol_flags;
        }
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_rx);

diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index 17dbf8356adb9a2efabf77c4f38ac317b822db77..b091b6d331eb18b4c9c1d9fe75c2752977d78583 100644 (file)
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -205,13 +205,13 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
                udp_hdr->dgram_len      = RTE_CPU_TO_BE_16(pkt_size -
                                                           sizeof(*eth_hdr) -
                                                           sizeof(*ip_hdr));
-               pkt->nb_segs                    = 1;
-               pkt->pkt_len                    = pkt_size;
-               pkt->ol_flags                   = ol_flags;
-               pkt->vlan_macip.f.vlan_tci      = vlan_tci;
-               pkt->vlan_macip.f.l2_len        = sizeof(struct ether_hdr);
-               pkt->vlan_macip.f.l3_len        = sizeof(struct ipv4_hdr);
-               pkts_burst[nb_pkt]              = pkt;
+               pkt->nb_segs            = 1;
+               pkt->pkt_len            = pkt_size;
+               pkt->ol_flags           = ol_flags;
+               pkt->vlan_tci           = vlan_tci;
+               pkt->l2_len             = sizeof(struct ether_hdr);
+               pkt->l3_len             = sizeof(struct ipv4_hdr);
+               pkts_burst[nb_pkt]      = pkt;
 
                next_flow = (next_flow + 1) % cfg_n_flows;
        }

diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c
index 999c8e3302db788a9670db31f9f643ffc4534295..4b905cddd13df3337080ec472d248f1241215e51 100644 (file)
--- a/app/test-pmd/macfwd.c
+++ b/app/test-pmd/macfwd.c
@@ -116,9 +116,9 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
                ether_addr_copy(&ports[fs->tx_port].eth_addr,
                                &eth_hdr->s_addr);
                mb->ol_flags = txp->tx_ol_flags;
-               mb->vlan_macip.f.l2_len = sizeof(struct ether_hdr);
-               mb->vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
-               mb->vlan_macip.f.vlan_tci = txp->tx_vlan_id;
+               mb->l2_len = sizeof(struct ether_hdr);
+               mb->l3_len = sizeof(struct ipv4_hdr);
+               mb->vlan_tci = txp->tx_vlan_id;
        }
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_rx);
        fs->tx_packets += nb_tx;

diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
index 731f48739be6eea4e7ba7d0159d92f9a710179aa..c5b3a0cbe004e4efa031f471fffaa23f881e053d 100644 (file)
--- a/app/test-pmd/macswap.c
+++ b/app/test-pmd/macswap.c
@@ -118,9 +118,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
                ether_addr_copy(&addr, &eth_hdr->s_addr);
 
                mb->ol_flags = txp->tx_ol_flags;
-               mb->vlan_macip.f.l2_len = sizeof(struct ether_hdr);
-               mb->vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
-               mb->vlan_macip.f.vlan_tci = txp->tx_vlan_id;
+               mb->l2_len = sizeof(struct ether_hdr);
+               mb->l3_len = sizeof(struct ipv4_hdr);
+               mb->vlan_tci = txp->tx_vlan_id;
        }
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_rx);
        fs->tx_packets += nb_tx;

diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
index c34a5e13ff5bb468c7880783bb7b7b76338aa558..5bc74dad03e8c12a6b0f9679e1622483e03204bc 100644 (file)
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -165,8 +165,7 @@ pkt_burst_receive(struct fwd_stream *fs)
                        printf(" - FDIR hash=0x%x - FDIR id=0x%x ",
                               mb->hash.fdir.hash, mb->hash.fdir.id);
                if (ol_flags & PKT_RX_VLAN_PKT)
-                       printf(" - VLAN tci=0x%x",
-                               mb->vlan_macip.f.vlan_tci);
+                       printf(" - VLAN tci=0x%x", mb->vlan_tci);
                printf("\n");
                if (ol_flags != 0) {
                        int rxf;

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index d13a53a9a37492bcd0ef0bcdf5495dedd77d9e42..b426dfc3d6eb4023b98847af2f60457cb4fe84e4 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -406,7 +406,8 @@ testpmd_mbuf_ctor(struct rte_mempool *mp,
        mb->ol_flags     = 0;
        mb->data         = (char *) mb->buf_addr + RTE_PKTMBUF_HEADROOM;
        mb->nb_segs      = 1;
-       mb->vlan_macip.data = 0;
+       mb->l2_l3_len       = 0;
+       mb->vlan_tci     = 0;
        mb->hash.rss     = 0;
 }
 

diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c
index 1b2f66169d6cb32f09d12e065d2fc8ae3a4bbc63..813526420b33a36858ab87e8f87dfa9197536477 100644 (file)
--- a/app/test-pmd/txonly.c
+++ b/app/test-pmd/txonly.c
@@ -263,9 +263,9 @@ pkt_burst_transmit(struct fwd_stream *fs)
                pkt->nb_segs = tx_pkt_nb_segs;
                pkt->pkt_len = tx_pkt_length;
                pkt->ol_flags = ol_flags;
-               pkt->vlan_macip.f.vlan_tci  = vlan_tci;
-               pkt->vlan_macip.f.l2_len = sizeof(struct ether_hdr);
-               pkt->vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
+               pkt->vlan_tci  = vlan_tci;
+               pkt->l2_len = sizeof(struct ether_hdr);
+               pkt->l3_len = sizeof(struct ipv4_hdr);
                pkts_burst[nb_pkt] = pkt;
        }
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_pkt);

diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c
index 8740348371fa14766c99c5c5d402050e7439a35d..db7f02345f33116ca3d026c8278cd9cf6163a5fb 100644 (file)
--- a/app/test/packet_burst_generator.c
+++ b/app/test/packet_burst_generator.c
@@ -260,19 +260,19 @@ nomore_mbuf:
                 */
                pkt->nb_segs = tx_pkt_nb_segs;
                pkt->pkt_len = tx_pkt_length;
-               pkt->vlan_macip.f.l2_len = eth_hdr_size;
+               pkt->l2_len = eth_hdr_size;
 
                if (ipv4) {
-                       pkt->vlan_macip.f.vlan_tci  = ETHER_TYPE_IPv4;
-                       pkt->vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
+                       pkt->vlan_tci  = ETHER_TYPE_IPv4;
+                       pkt->l3_len = sizeof(struct ipv4_hdr);
 
                        if (vlan_enabled)
                                pkt->ol_flags = PKT_RX_IPV4_HDR | PKT_RX_VLAN_PKT;
                        else
                                pkt->ol_flags = PKT_RX_IPV4_HDR;
                } else {
-                       pkt->vlan_macip.f.vlan_tci  = ETHER_TYPE_IPv6;
-                       pkt->vlan_macip.f.l3_len = sizeof(struct ipv6_hdr);
+                       pkt->vlan_tci  = ETHER_TYPE_IPv6;
+                       pkt->l3_len = sizeof(struct ipv6_hdr);
 
                        if (vlan_enabled)
                                pkt->ol_flags = PKT_RX_IPV6_HDR | PKT_RX_VLAN_PKT;

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index ac8d4f7987aa40659fcf15648bbe7edd95b56f1f..6d309b593869ee1b1fa36ee5d72617d1a38a232c 100644 (file)
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -413,7 +413,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                        rte_panic("No headroom in mbuf.\n");
                }
 
-               m->vlan_macip.f.l2_len = sizeof(struct ether_hdr);
+               m->l2_len = sizeof(struct ether_hdr);
 
                /* 02:00:00:00:00:xx */
                d_addr_bytes = &eth_hdr->d_addr.addr_bytes[0];

diff --git a/examples/ip_pipeline/pipeline_rx.c b/examples/ip_pipeline/pipeline_rx.c
index 7a8309c1aa277d6478439619e25354f389bbe936..8f1f7817993ae6bc3289b35edcd8f3781ae86112 100644 (file)
--- a/examples/ip_pipeline/pipeline_rx.c
+++ b/examples/ip_pipeline/pipeline_rx.c
@@ -255,8 +255,8 @@ app_pkt_metadata_fill(struct rte_mbuf *m)
        /* Pop Ethernet header */
        if (app.ether_hdr_pop_push) {
                rte_pktmbuf_adj(m, (uint16_t)sizeof(struct ether_hdr));
-               m->vlan_macip.f.l2_len = 0;
-               m->vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
+               m->l2_len = 0;
+               m->l3_len = sizeof(struct ipv4_hdr);
        }
 }
 

diff --git a/examples/ip_pipeline/pipeline_tx.c b/examples/ip_pipeline/pipeline_tx.c
index b9491e3ce989dfb5cb45040a4f95a1e503d64d8f..64904b2eca384c28634109b0cd1bd783c166ba3d 100644 (file)
--- a/examples/ip_pipeline/pipeline_tx.c
+++ b/examples/ip_pipeline/pipeline_tx.c
@@ -66,7 +66,7 @@ app_pkt_metadata_flush(struct rte_mbuf *pkt)
        ether_addr_copy(&pkt_meta->nh_arp, &ether_hdr->d_addr);
        ether_addr_copy(&local_ether_addr, &ether_hdr->s_addr);
        ether_hdr->ether_type = rte_bswap16(ETHER_TYPE_IPv4);
-       pkt->vlan_macip.f.l2_len = sizeof(struct ether_hdr);
+       pkt->l2_len = sizeof(struct ether_hdr);
 }
 
 static int

diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index 8184aad78b0a8d50ca8648c4c9877e11696e3975..b6b4f599d8941406ff06675076e6d5957d23cc0b 100644 (file)
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -412,8 +412,8 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
                        dr = &qconf->death_row;
 
                        /* prepare mbuf: setup l2_len/l3_len. */
-                       m->vlan_macip.f.l2_len = sizeof(*eth_hdr);
-                       m->vlan_macip.f.l3_len = sizeof(*ip_hdr);
+                       m->l2_len = sizeof(*eth_hdr);
+                       m->l3_len = sizeof(*ip_hdr);
 
                        /* process this fragment. */
                        mo = rte_ipv4_frag_reassemble_packet(tbl, dr, m, tms, ip_hdr);
@@ -455,8 +455,8 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
                        dr  = &qconf->death_row;
 
                        /* prepare mbuf: setup l2_len/l3_len. */
-                       m->vlan_macip.f.l2_len = sizeof(*eth_hdr);
-                       m->vlan_macip.f.l3_len = sizeof(*ip_hdr) + sizeof(*frag_hdr);
+                       m->l2_len = sizeof(*eth_hdr);
+                       m->l3_len = sizeof(*ip_hdr) + sizeof(*frag_hdr);
 
                        mo = rte_ipv6_frag_reassemble_packet(tbl, dr, m, tms, ip_hdr, frag_hdr);
                        if (mo == NULL)

diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 223285181a18d805fd978cc13237df2277ce407a..35bd842a2c5abbf443316297c4e7a128180cc7c5 100644 (file)
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -338,7 +338,8 @@ mcast_out_pkt(struct rte_mbuf *pkt, int use_clone)
 
        /* copy metadata from source packet*/
        hdr->port = pkt->port;
-       hdr->vlan_macip = pkt->vlan_macip;
+       hdr->vlan_tci = pkt->vlan_tci;
+       hdr->l2_l3_len = pkt->l2_l3_len;
        hdr->hash = pkt->hash;
 
        hdr->ol_flags = pkt->ol_flags;

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index f0f8cfaa749e148c91f1bb80b746f0edeb29164a..4e1c103cc057ad6cf6342bb7a9636809e3c5cfaa 100644 (file)
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -2690,9 +2690,9 @@ virtio_tx_route_zcp(struct virtio_net *dev, struct rte_mbuf *m,
                mbuf->buf_addr = m->buf_addr;
        }
        mbuf->ol_flags = PKT_TX_VLAN_PKT;
-       mbuf->vlan_macip.f.vlan_tci = vlan_tag;
-       mbuf->vlan_macip.f.l2_len = sizeof(struct ether_hdr);
-       mbuf->vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
+       mbuf->vlan_tci = vlan_tag;
+       mbuf->l2_len = sizeof(struct ether_hdr);
+       mbuf->l3_len = sizeof(struct ipv4_hdr);
        MBUF_HEADROOM_UINT32(mbuf) = (uint32_t)desc_idx;
 
        tx_q->m_table[len] = mbuf;

diff --git a/lib/librte_ip_frag/ip_frag_common.h b/lib/librte_ip_frag/ip_frag_common.h
index 81ca23a4d77152f4686d5524cff94723e1ea4b44..210f409d605101da68ce04617c7c6ed5940ccd06 100644 (file)
--- a/lib/librte_ip_frag/ip_frag_common.h
+++ b/lib/librte_ip_frag/ip_frag_common.h
@@ -173,8 +173,7 @@ ip_frag_chain(struct rte_mbuf *mn, struct rte_mbuf *mp)
        struct rte_mbuf *ms;
 
        /* adjust start of the last fragment data. */
-       rte_pktmbuf_adj(mp, (uint16_t)(mp->vlan_macip.f.l2_len +
-               mp->vlan_macip.f.l3_len));
+       rte_pktmbuf_adj(mp, (uint16_t)(mp->l2_len + mp->l3_len));
 
        /* chain two fragments. */
        ms = rte_pktmbuf_lastseg(mn);

diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
index 0b10310480cadb10efbff75cd44e1483d5ce6e4f..6b9f07d10597ea5c0ba049dfa1698f1c3e08c870 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c
+++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
@@ -198,7 +198,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
                    out_pkt->pkt_len - sizeof(struct ipv4_hdr));
 
                out_pkt->ol_flags |= PKT_TX_IP_CKSUM;
-               out_pkt->vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
+               out_pkt->l3_len = sizeof(struct ipv4_hdr);
 
                /* Write the fragment to the output list */
                pkts_out[out_pkt_pos] = out_pkt;

diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/librte_ip_frag/rte_ipv4_reassembly.c
index 06c37affaa5e43894431dc7a39df17b52d80dd17..0b8ceebdd5fd9e5f3f062d354873b66296bbe983 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv4_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv4_reassembly.c
@@ -87,10 +87,10 @@ ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
 
        /* update ipv4 header for the reassmebled packet */
        ip_hdr = (struct ipv4_hdr*)(rte_pktmbuf_mtod(m, uint8_t *) +
-               m->vlan_macip.f.l2_len);
+               m->l2_len);
 
        ip_hdr->total_length = rte_cpu_to_be_16((uint16_t)(fp->total_size +
-               m->vlan_macip.f.l3_len));
+               m->l3_len));
        ip_hdr->fragment_offset = (uint16_t)(ip_hdr->fragment_offset &
                rte_cpu_to_be_16(IPV4_HDR_DF_FLAG));
        ip_hdr->hdr_checksum = 0;
@@ -137,7 +137,7 @@ rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,
 
        ip_ofs *= IPV4_HDR_OFFSET_UNITS;
        ip_len = (uint16_t)(rte_be_to_cpu_16(ip_hdr->total_length) -
-               mb->vlan_macip.f.l3_len);
+               mb->l3_len);
 
        IP_FRAG_LOG(DEBUG, "%s:%d:\n"
                "mbuf: %p, tms: %" PRIu64

diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/librte_ip_frag/rte_ipv6_reassembly.c
index dee34252f6c1c2fbd3d6528d983f20e89e4c1472..71cf721c24548d727763242ab968c757ba4c55b1 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv6_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv6_reassembly.c
@@ -109,7 +109,7 @@ ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
 
        /* update ipv6 header for the reassembled datagram */
        ip_hdr = (struct ipv6_hdr *) (rte_pktmbuf_mtod(m, uint8_t *) +
-                                                                 m->vlan_macip.f.l2_len);
+                                                                 m->l2_len);
 
        ip_hdr->payload_len = rte_cpu_to_be_16(payload_len);
 
@@ -120,8 +120,7 @@ ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
         * other headers, so we assume there are no other headers and thus update
         * the main IPv6 header instead.
         */
-       move_len = m->vlan_macip.f.l2_len + m->vlan_macip.f.l3_len -
-                       sizeof(*frag_hdr);
+       move_len = m->l2_len + m->l3_len - sizeof(*frag_hdr);
        frag_hdr = (struct ipv6_extension_fragment *) (ip_hdr + 1);
        ip_hdr->proto = frag_hdr->next_header;
 

diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 047a5a79538cfa2589b3e90a9210709153d3810c..a523d826e15f69bbca8ee0f5ea35cb9ffd78ec1b 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -111,27 +111,6 @@ extern "C" {
  */
 #define PKT_TX_OFFLOAD_MASK (PKT_TX_VLAN_PKT | PKT_TX_IP_CKSUM | PKT_TX_L4_MASK)
 
-/** Offload features */
-union rte_vlan_macip {
-       uint32_t data;
-       struct {
-               uint16_t l3_len:9; /**< L3 (IP) Header Length. */
-               uint16_t l2_len:7; /**< L2 (MAC) Header Length. */
-               uint16_t vlan_tci;
-               /**< VLAN Tag Control Identifier (CPU order). */
-       } f;
-};
-
-/*
- * Compare mask for vlan_macip_len.data,
- * should be in sync with rte_vlan_macip.f layout.
- * */
-#define TX_VLAN_CMP_MASK        0xFFFF0000  /**< VLAN length - 16-bits. */
-#define TX_MAC_LEN_CMP_MASK     0x0000FE00  /**< MAC length - 7-bits. */
-#define TX_IP_LEN_CMP_MASK      0x000001FF  /**< IP  length - 9-bits. */
-/**< MAC+IP  length. */
-#define TX_MACIP_LEN_CMP_MASK   (TX_MAC_LEN_CMP_MASK | TX_IP_LEN_CMP_MASK)
-
 /**
  * The generic rte_mbuf, containing a packet mbuf.
  */
@@ -170,7 +149,14 @@ struct rte_mbuf {
        uint32_t pkt_len;       /**< Total pkt len: sum of all segment data_len. */
 
        /* offload features, valid for first segment only */
-       union rte_vlan_macip vlan_macip;
+       union {
+               uint16_t l2_l3_len; /**< combined l2/l3 lengths as single var */
+               struct {
+                       uint16_t l3_len:9;      /**< L3 (IP) Header Length. */
+                       uint16_t l2_len:7;      /**< L2 (MAC) Header Length. */
+               };
+       };
+       uint16_t vlan_tci;      /**< VLAN Tag Control Identifier (CPU order). */
        union {
                uint32_t rss;       /**< RSS hash result if RSS enabled */
                struct {
@@ -540,7 +526,8 @@ static inline void rte_pktmbuf_reset(struct rte_mbuf *m)
 
        m->next = NULL;
        m->pkt_len = 0;
-       m->vlan_macip.data = 0;
+       m->l2_l3_len = 0;
+       m->vlan_tci = 0;
        m->nb_segs = 1;
        m->port = 0xff;
 
@@ -607,7 +594,8 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *md)
        mi->data = md->data;
        mi->data_len = md->data_len;
        mi->port = md->port;
-       mi->vlan_macip = md->vlan_macip;
+       mi->vlan_tci = md->vlan_tci;
+       mi->l2_l3_len = md->l2_l3_len;
        mi->hash = md->hash;
 
        mi->next = NULL;

diff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c
index 074c9b335dea268b75856370bf54cb5cc41f55e0..ba7e3a9da73fa3a49d278e924e337c5605a81e4b 100644 (file)
--- a/lib/librte_pmd_e1000/em_rxtx.c
+++ b/lib/librte_pmd_e1000/em_rxtx.c
@@ -144,13 +144,34 @@ enum {
        EM_CTX_NUM  = 1, /**< CTX NUM */
 };
 
+/** Offload features */
+union em_vlan_macip {
+       uint32_t data;
+       struct {
+               uint16_t l3_len:9; /**< L3 (IP) Header Length. */
+               uint16_t l2_len:7; /**< L2 (MAC) Header Length. */
+               uint16_t vlan_tci;
+               /**< VLAN Tag Control Identifier (CPU order). */
+       } f;
+};
+
+/*
+ * Compare mask for vlan_macip_len.data,
+ * should be in sync with em_vlan_macip.f layout.
+ * */
+#define TX_VLAN_CMP_MASK        0xFFFF0000  /**< VLAN length - 16-bits. */
+#define TX_MAC_LEN_CMP_MASK     0x0000FE00  /**< MAC length - 7-bits. */
+#define TX_IP_LEN_CMP_MASK      0x000001FF  /**< IP  length - 9-bits. */
+/** MAC+IP  length. */
+#define TX_MACIP_LEN_CMP_MASK   (TX_MAC_LEN_CMP_MASK | TX_IP_LEN_CMP_MASK)
+
 /**
  * Structure to check if new context need be built
  */
 struct em_ctx_info {
-       uint16_t flags;               /**< ol_flags related to context build. */
-       uint32_t cmp_mask;            /**< compare mask */
-       union rte_vlan_macip hdrlen;  /**< L2 and L3 header lenghts */
+       uint16_t flags;              /**< ol_flags related to context build. */
+       uint32_t cmp_mask;           /**< compare mask */
+       union em_vlan_macip hdrlen;  /**< L2 and L3 header lenghts */
 };
 
 /**
@@ -219,7 +240,7 @@ static inline void
 em_set_xmit_ctx(struct em_tx_queue* txq,
                volatile struct e1000_context_desc *ctx_txd,
                uint16_t flags,
-               union rte_vlan_macip hdrlen)
+               union em_vlan_macip hdrlen)
 {
        uint32_t cmp_mask, cmd_len;
        uint16_t ipcse, l2len;
@@ -285,7 +306,7 @@ em_set_xmit_ctx(struct em_tx_queue* txq,
  */
 static inline uint32_t
 what_ctx_update(struct em_tx_queue *txq, uint16_t flags,
-               union rte_vlan_macip hdrlen)
+               union em_vlan_macip hdrlen)
 {
        /* If match with the current context */
        if (likely (txq->ctx_cache.flags == flags &&
@@ -391,7 +412,7 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        uint16_t tx_ol_req;
        uint32_t ctx;
        uint32_t new_ctx;
-       union rte_vlan_macip hdrlen;
+       union em_vlan_macip hdrlen;
 
        txq = tx_queue;
        sw_ring = txq->sw_ring;
@@ -421,7 +442,9 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                tx_ol_req = (uint16_t)(ol_flags & (PKT_TX_IP_CKSUM |
                                                        PKT_TX_L4_MASK));
                if (tx_ol_req) {
-                       hdrlen = tx_pkt->vlan_macip;
+                       hdrlen.f.vlan_tci = tx_pkt->vlan_tci;
+                       hdrlen.f.l2_len = tx_pkt->l2_len;
+                       hdrlen.f.l3_len = tx_pkt->l3_len;
                        /* If new context to be built or reuse the exist ctx. */
                        ctx = what_ctx_update(txq, tx_ol_req, hdrlen);
 
@@ -516,8 +539,7 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                /* Set VLAN Tag offload fields. */
                if (ol_flags & PKT_TX_VLAN_PKT) {
                        cmd_type_len |= E1000_TXD_CMD_VLE;
-                       popts_spec = tx_pkt->vlan_macip.f.vlan_tci <<
-                               E1000_TXD_VLAN_SHIFT;
+                       popts_spec = tx_pkt->vlan_tci << E1000_TXD_VLAN_SHIFT;
                }
 
                if (tx_ol_req) {
@@ -784,7 +806,7 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                                rx_desc_error_to_pkt_flags(rxd.errors));
 
                /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
-               rxm->vlan_macip.f.vlan_tci = rte_le_to_cpu_16(rxd.special);
+               rxm->vlan_tci = rte_le_to_cpu_16(rxd.special);
 
                /*
                 * Store the mbuf address into the next entry of the array
@@ -1010,7 +1032,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                                        rx_desc_error_to_pkt_flags(rxd.errors));
 
                /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
-               rxm->vlan_macip.f.vlan_tci = rte_le_to_cpu_16(rxd.special);
+               rxm->vlan_tci = rte_le_to_cpu_16(rxd.special);
 
                /* Prefetch data of first segment, if configured to do so. */
                rte_packet_prefetch(first_seg->data);

diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
index 8b33b6dfe06da2a1243d16624138c20682697343..d4a803edbd125abe49de68b4855398116416e509 100644 (file)
--- a/lib/librte_pmd_e1000/igb_rxtx.c
+++ b/lib/librte_pmd_e1000/igb_rxtx.c
@@ -153,13 +153,33 @@ enum igb_advctx_num {
        IGB_CTX_NUM  = 2, /**< CTX_NUM */
 };
 
+/** Offload features */
+union igb_vlan_macip {
+       uint32_t data;
+       struct {
+               uint16_t l2_l3_len; /**< 7bit L2 and 9b L3 lengths combined */
+               uint16_t vlan_tci;
+               /**< VLAN Tag Control Identifier (CPU order). */
+       } f;
+};
+
+/*
+ * Compare mask for vlan_macip_len.data,
+ * should be in sync with igb_vlan_macip.f layout.
+ * */
+#define TX_VLAN_CMP_MASK        0xFFFF0000  /**< VLAN length - 16-bits. */
+#define TX_MAC_LEN_CMP_MASK     0x0000FE00  /**< MAC length - 7-bits. */
+#define TX_IP_LEN_CMP_MASK      0x000001FF  /**< IP  length - 9-bits. */
+/** MAC+IP  length. */
+#define TX_MACIP_LEN_CMP_MASK   (TX_MAC_LEN_CMP_MASK | TX_IP_LEN_CMP_MASK)
+
 /**
  * Strucutre to check if new context need be built
  */
 struct igb_advctx_info {
        uint16_t flags;           /**< ol_flags related to context build. */
        uint32_t cmp_mask;        /**< compare mask for vlan_macip_lens */
-       union rte_vlan_macip vlan_macip_lens; /**< vlan, mac & ip length. */
+       union igb_vlan_macip vlan_macip_lens; /**< vlan, mac & ip length. */
 };
 
 /**
@@ -342,6 +362,7 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        volatile union e1000_adv_tx_desc *txd;
        struct rte_mbuf     *tx_pkt;
        struct rte_mbuf     *m_seg;
+       union igb_vlan_macip vlan_macip_lens;
        uint64_t buf_dma_addr;
        uint32_t olinfo_status;
        uint32_t cmd_type_len;
@@ -355,7 +376,6 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        uint16_t tx_ol_req;
        uint32_t new_ctx = 0;
        uint32_t ctx = 0;
-       uint32_t vlan_macip_lens;
 
        txq = tx_queue;
        sw_ring = txq->sw_ring;
@@ -380,13 +400,14 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                tx_last = (uint16_t) (tx_id + tx_pkt->nb_segs - 1);
 
                ol_flags = tx_pkt->ol_flags;
-               vlan_macip_lens = tx_pkt->vlan_macip.data;
+               vlan_macip_lens.f.vlan_tci = tx_pkt->vlan_tci;
+               vlan_macip_lens.f.l2_l3_len = tx_pkt->l2_l3_len;
                tx_ol_req = (uint16_t)(ol_flags & PKT_TX_OFFLOAD_MASK);
 
                /* If a Context Descriptor need be built . */
                if (tx_ol_req) {
                        ctx = what_advctx_update(txq, tx_ol_req,
-                               vlan_macip_lens);
+                               vlan_macip_lens.data);
                        /* Only allocate context descriptor if required*/
                        new_ctx = (ctx == IGB_CTX_NUM);
                        ctx = txq->ctx_curr;
@@ -502,7 +523,7 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                                }
 
                                igbe_set_xmit_ctx(txq, ctx_txd, tx_ol_req,
-                                   vlan_macip_lens);
+                                   vlan_macip_lens.data);
 
                                txe->last_id = tx_last;
                                tx_id = txe->next_id;
@@ -764,8 +785,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                rxm->hash.rss = rxd.wb.lower.hi_dword.rss;
                hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data);
                /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
-               rxm->vlan_macip.f.vlan_tci =
-                       rte_le_to_cpu_16(rxd.wb.upper.vlan);
+               rxm->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan);
 
                pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss);
                pkt_flags = (uint16_t)(pkt_flags |
@@ -1001,8 +1021,7 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                 * The vlan_tci field is only valid when PKT_RX_VLAN_PKT is
                 * set in the pkt_flags field.
                 */
-               first_seg->vlan_macip.f.vlan_tci =
-                       rte_le_to_cpu_16(rxd.wb.upper.vlan);
+               first_seg->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan);
                hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data);
                pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss);
                pkt_flags = (uint16_t)(pkt_flags |

diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c
index c4819760a02a9df093c2efc5b86d22ae7f2c335b..e41e8d0ee545f6a211dc02859beacd3d9130fcd6 100644 (file)
--- a/lib/librte_pmd_i40e/i40e_rxtx.c
+++ b/lib/librte_pmd_i40e/i40e_rxtx.c
@@ -613,7 +613,7 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)
                                I40E_RXD_QW1_LENGTH_PBUF_SHIFT) - rxq->crc_len;
                        mb->data_len = pkt_len;
                        mb->pkt_len = pkt_len;
-                       mb->vlan_macip.f.vlan_tci = rx_status &
+                       mb->vlan_tci = rx_status &
                                (1 << I40E_RX_DESC_STATUS_L2TAG1P_SHIFT) ?
                        rte_le_to_cpu_16(\
                                rxdp[j].wb.qword0.lo_dword.l2tag1) : 0;
@@ -850,7 +850,7 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                rxm->data_len = rx_packet_len;
                rxm->port = rxq->port_id;
 
-               rxm->vlan_macip.f.vlan_tci = rx_status &
+               rxm->vlan_tci = rx_status &
                        (1 << I40E_RX_DESC_STATUS_L2TAG1P_SHIFT) ?
                        rte_le_to_cpu_16(rxd.wb.qword0.lo_dword.l2tag1) : 0;
                pkt_flags = i40e_rxd_status_to_pkt_flags(qword1);
@@ -1003,7 +1003,7 @@ i40e_recv_scattered_pkts(void *rx_queue,
                }
 
                first_seg->port = rxq->port_id;
-               first_seg->vlan_macip.f.vlan_tci = (rx_status &
+               first_seg->vlan_tci = (rx_status &
                        (1 << I40E_RX_DESC_STATUS_L2TAG1P_SHIFT)) ?
                        rte_le_to_cpu_16(rxd.wb.qword0.lo_dword.l2tag1) : 0;
                pkt_flags = i40e_rxd_status_to_pkt_flags(qword1);
@@ -1105,8 +1105,8 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                RTE_MBUF_PREFETCH_TO_FREE(txe->mbuf);
 
                ol_flags = tx_pkt->ol_flags;
-               l2_len = tx_pkt->vlan_macip.f.l2_len;
-               l3_len = tx_pkt->vlan_macip.f.l3_len;
+               l2_len = tx_pkt->l2_len;
+               l3_len = tx_pkt->l3_len;
 
                /* Calculate the number of context descriptors needed. */
                nb_ctx = i40e_calc_context_desc(ol_flags);
@@ -1142,8 +1142,8 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
                /* Descriptor based VLAN insertion */
                if (ol_flags & PKT_TX_VLAN_PKT) {
-                       tx_flags |= tx_pkt->vlan_macip.f.vlan_tci <<
-                                               I40E_TX_FLAG_L2TAG1_SHIFT;
+                       tx_flags |= tx_pkt->vlan_tci <<
+                                       I40E_TX_FLAG_L2TAG1_SHIFT;
                        tx_flags |= I40E_TX_FLAG_INSERT_VLAN;
                        td_cmd |= I40E_TX_DESC_CMD_IL2TAG1;
                        td_tag = (tx_flags & I40E_TX_FLAG_L2TAG1_MASK) >>

diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index eec1458a2dca18aaa254d0ad8d001740c1d8b27e..575a0143bbb724b1c7796c49062d4a55e77d6262 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -540,6 +540,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        volatile union ixgbe_adv_tx_desc *txd;
        struct rte_mbuf     *tx_pkt;
        struct rte_mbuf     *m_seg;
+       union ixgbe_vlan_macip vlan_macip_lens;
        uint64_t buf_dma_addr;
        uint32_t olinfo_status;
        uint32_t cmd_type_len;
@@ -551,7 +552,6 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        uint16_t nb_tx;
        uint16_t nb_used;
        uint16_t tx_ol_req;
-       uint32_t vlan_macip_lens;
        uint32_t ctx = 0;
        uint32_t new_ctx;
 
@@ -579,14 +579,15 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                 * are needed for offload functionality.
                 */
                ol_flags = tx_pkt->ol_flags;
-               vlan_macip_lens = tx_pkt->vlan_macip.data;
+               vlan_macip_lens.f.vlan_tci = tx_pkt->vlan_tci;
+               vlan_macip_lens.f.l2_l3_len = tx_pkt->l2_l3_len;
 
                /* If hardware offload required */
                tx_ol_req = (uint16_t)(ol_flags & PKT_TX_OFFLOAD_MASK);
                if (tx_ol_req) {
                        /* If new context need be built or reuse the exist ctx. */
                        ctx = what_advctx_update(txq, tx_ol_req,
-                               vlan_macip_lens);
+                               vlan_macip_lens.data);
                        /* Only allocate context descriptor if required*/
                        new_ctx = (ctx == IXGBE_CTX_NUM);
                        ctx = txq->ctx_curr;
@@ -728,7 +729,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                                }
 
                                ixgbe_set_xmit_ctx(txq, ctx_txd, tx_ol_req,
-                                   vlan_macip_lens);
+                                   vlan_macip_lens.data);
 
                                txe->last_id = tx_last;
                                tx_id = txe->next_id;
@@ -939,7 +940,7 @@ ixgbe_rx_scan_hw_ring(struct igb_rx_queue *rxq)
                                                        rxq->crc_len);
                        mb->data_len = pkt_len;
                        mb->pkt_len = pkt_len;
-                       mb->vlan_macip.f.vlan_tci = rxdp[j].wb.upper.vlan;
+                       mb->vlan_tci = rxdp[j].wb.upper.vlan;
                        mb->hash.rss = rxdp[j].wb.lower.hi_dword.rss;
 
                        /* convert descriptor fields to rte mbuf flags */
@@ -1257,8 +1258,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 
                hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data);
                /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
-               rxm->vlan_macip.f.vlan_tci =
-                       rte_le_to_cpu_16(rxd.wb.upper.vlan);
+               rxm->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan);
 
                pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss);
                pkt_flags = (uint16_t)(pkt_flags |
@@ -1502,8 +1502,7 @@ ixgbe_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                 * The vlan_tci field is only valid when PKT_RX_VLAN_PKT is
                 * set in the pkt_flags field.
                 */
-               first_seg->vlan_macip.f.vlan_tci =
-                               rte_le_to_cpu_16(rxd.wb.upper.vlan);
+               first_seg->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan);
                hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data);
                pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss);
                pkt_flags = (uint16_t)(pkt_flags |

diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h
index 4c9cb74059b80381868bfbef30d3e8b26a87c4cf..41042ac0254a105af8d5dac60992215595e2e9c9 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h
@@ -153,6 +153,26 @@ enum ixgbe_advctx_num {
        IXGBE_CTX_NUM  = 2, /**< CTX NUMBER  */
 };
 
+/** Offload features */
+union ixgbe_vlan_macip {
+       uint32_t data;
+       struct {
+               uint16_t l2_l3_len; /**< combined 9-bit l3, 7-bit l2 lengths */
+               uint16_t vlan_tci;
+               /**< VLAN Tag Control Identifier (CPU order). */
+       } f;
+};
+
+/*
+ * Compare mask for vlan_macip_len.data,
+ * should be in sync with ixgbe_vlan_macip.f layout.
+ * */
+#define TX_VLAN_CMP_MASK        0xFFFF0000  /**< VLAN length - 16-bits. */
+#define TX_MAC_LEN_CMP_MASK     0x0000FE00  /**< MAC length - 7-bits. */
+#define TX_IP_LEN_CMP_MASK      0x000001FF  /**< IP  length - 9-bits. */
+/** MAC+IP  length. */
+#define TX_MACIP_LEN_CMP_MASK   (TX_MAC_LEN_CMP_MASK | TX_IP_LEN_CMP_MASK)
+
 /**
  * Structure to check if new context need be built
  */
@@ -160,7 +180,7 @@ enum ixgbe_advctx_num {
 struct ixgbe_advctx_info {
        uint16_t flags;           /**< ol_flags for context build. */
        uint32_t cmp_mask;        /**< compare mask for vlan_macip_lens */
-       union rte_vlan_macip vlan_macip_lens; /**< vlan, mac ip length. */
+       union ixgbe_vlan_macip vlan_macip_lens; /**< vlan, mac ip length. */
 };
 
 /**

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
index 4afb1161c1d76eaf462bd7b5f3ee23e76544cf46..e74b6fd121eb195393a7ddf3610d6f961d2fb011 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
@@ -551,8 +551,8 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                                               rte_pktmbuf_mtod(rxm, void *));
 #endif
                                /* Copy vlan tag in packet buffer */
-                               rxm->vlan_macip.f.vlan_tci =
-                                       rte_le_to_cpu_16((uint16_t)rcd->tci);
+                               rxm->vlan_tci = rte_le_to_cpu_16(
+                                               (uint16_t)rcd->tci);
 
                        } else
                                rxm->ol_flags = 0;
@@ -564,7 +564,7 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                        rxm->pkt_len = (uint16_t)rcd->len;
                        rxm->data_len = (uint16_t)rcd->len;
                        rxm->port = rxq->port_id;
-                       rxm->vlan_macip.f.vlan_tci = 0;
+                       rxm->vlan_tci = 0;
                        rxm->data = (char *)rxm->buf_addr + RTE_PKTMBUF_HEADROOM;
 
                        rx_pkts[nb_rx++] = rxm;