mbuf: add new Rx flags for stripped VLAN

[dpdk.git] / lib / librte_mbuf / rte_mbuf.c

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 26b6f12..2ece742 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -58,6 +58,7 @@
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
 #include <rte_hexdump.h>
+#include <rte_errno.h>
 
 /*
  * ctrlmbuf constructor, given as a callback function to
@@ -85,7 +86,7 @@ rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg)
        struct rte_pktmbuf_pool_private default_mbp_priv;
        uint16_t roomsz;
 
-       RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct rte_mbuf));
+       RTE_ASSERT(mp->elt_size >= sizeof(struct rte_mbuf));
 
        /* if no structure is provided, assume no mbuf private area */
        user_mbp_priv = opaque_arg;
@@ -99,7 +100,7 @@ rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg)
                user_mbp_priv = &default_mbp_priv;
        }
 
-       RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct rte_mbuf) +
+       RTE_ASSERT(mp->elt_size >= sizeof(struct rte_mbuf) +
                user_mbp_priv->mbuf_data_room_size +
                user_mbp_priv->mbuf_priv_size);
 
@@ -119,17 +120,20 @@ rte_pktmbuf_init(struct rte_mempool *mp,
                 __attribute__((unused)) unsigned i)
 {
        struct rte_mbuf *m = _m;
-       uint32_t mbuf_size, buf_len;
+       uint32_t mbuf_size, buf_len, priv_size;
 
-       mbuf_size = sizeof(struct rte_mbuf) + rte_pktmbuf_priv_size(mp);
+       priv_size = rte_pktmbuf_priv_size(mp);
+       mbuf_size = sizeof(struct rte_mbuf) + priv_size;
        buf_len = rte_pktmbuf_data_room_size(mp);
 
-       RTE_MBUF_ASSERT(mp->elt_size >= mbuf_size);
-       RTE_MBUF_ASSERT(buf_len <= UINT16_MAX);
+       RTE_ASSERT(RTE_ALIGN(priv_size, RTE_MBUF_PRIV_ALIGN) == priv_size);
+       RTE_ASSERT(mp->elt_size >= mbuf_size);
+       RTE_ASSERT(buf_len <= UINT16_MAX);
 
        memset(m, 0, mp->elt_size);
 
-       /* start of buffer is just after mbuf structure */
+       /* start of buffer is after mbuf structure and priv data */
+       m->priv_size = priv_size;
        m->buf_addr = (char *)m + mbuf_size;
        m->buf_physaddr = rte_mempool_virt2phy(mp, m) + mbuf_size;
        m->buf_len = (uint16_t)buf_len;
@@ -152,7 +156,12 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
        struct rte_pktmbuf_pool_private mbp_priv;
        unsigned elt_size;
 
-
+       if (RTE_ALIGN(priv_size, RTE_MBUF_PRIV_ALIGN) != priv_size) {
+               RTE_LOG(ERR, MBUF, "mbuf priv_size=%u is not aligned\n",
+                       priv_size);
+               rte_errno = EINVAL;
+               return NULL;
+       }
        elt_size = sizeof(struct rte_mbuf) + (unsigned)priv_size +
                (unsigned)data_room_size;
        mbp_priv.mbuf_data_room_size = data_room_size;
@@ -244,19 +253,15 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)
        case PKT_RX_FDIR: return "PKT_RX_FDIR";
        case PKT_RX_L4_CKSUM_BAD: return "PKT_RX_L4_CKSUM_BAD";
        case PKT_RX_IP_CKSUM_BAD: return "PKT_RX_IP_CKSUM_BAD";
-       /* case PKT_RX_EIP_CKSUM_BAD: return "PKT_RX_EIP_CKSUM_BAD"; */
+       case PKT_RX_EIP_CKSUM_BAD: return "PKT_RX_EIP_CKSUM_BAD";
        /* case PKT_RX_OVERSIZE: return "PKT_RX_OVERSIZE"; */
        /* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */
        /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */
        /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */
-       case PKT_RX_IPV4_HDR: return "PKT_RX_IPV4_HDR";
-       case PKT_RX_IPV4_HDR_EXT: return "PKT_RX_IPV4_HDR_EXT";
-       case PKT_RX_IPV6_HDR: return "PKT_RX_IPV6_HDR";
-       case PKT_RX_IPV6_HDR_EXT: return "PKT_RX_IPV6_HDR_EXT";
+       case PKT_RX_VLAN_STRIPPED: return "PKT_RX_VLAN_STRIPPED";
        case PKT_RX_IEEE1588_PTP: return "PKT_RX_IEEE1588_PTP";
        case PKT_RX_IEEE1588_TMST: return "PKT_RX_IEEE1588_TMST";
-       case PKT_RX_TUNNEL_IPV4_HDR: return "PKT_RX_TUNNEL_IPV4_HDR";
-       case PKT_RX_TUNNEL_IPV6_HDR: return "PKT_RX_TUNNEL_IPV6_HDR";
+       case PKT_RX_QINQ_STRIPPED: return "PKT_RX_QINQ_STRIPPED";
        default: return NULL;
        }
 }