mbuf: fix reset on mbuf free

[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 56a1a98..5f77840 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -22,7 +22,6 @@
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
-#include <rte_atomic.h>
 #include <rte_branch_prediction.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
@@ -77,9 +76,9 @@ rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg)
  */
 void
 rte_pktmbuf_init(struct rte_mempool *mp,
-                __attribute__((unused)) void *opaque_arg,
+                __rte_unused void *opaque_arg,
                 void *_m,
-                __attribute__((unused)) unsigned i)
+                __rte_unused unsigned i)
 {
        struct rte_mbuf *m = _m;
        uint32_t mbuf_size, buf_len, priv_size;
@@ -105,7 +104,7 @@ rte_pktmbuf_init(struct rte_mempool *mp,
        /* init some constant fields */
        m->pool = mp;
        m->nb_segs = 1;
-       m->port = MBUF_INVALID_PORT;
+       m->port = RTE_MBUF_PORT_INVALID;
        rte_mbuf_refcnt_set(m, 1);
        m->next = NULL;
 }
@@ -118,7 +117,8 @@ rte_pktmbuf_init(struct rte_mempool *mp,
  * indirect buffer) mbufs on detaching from the mbuf with pinned external
  * buffer.
  */
-static void rte_pktmbuf_free_pinned_extmem(void *addr, void *opaque)
+static void
+rte_pktmbuf_free_pinned_extmem(void *addr, void *opaque)
 {
        struct rte_mbuf *m = opaque;
 
@@ -129,10 +129,10 @@ static void rte_pktmbuf_free_pinned_extmem(void *addr, void *opaque)
 
        rte_mbuf_ext_refcnt_set(m->shinfo, 1);
        m->ol_flags = EXT_ATTACHED_MBUF;
-       if (m->next != NULL) {
+       if (m->next != NULL)
                m->next = NULL;
+       if (m->nb_segs != 1)
                m->nb_segs = 1;
-       }
        rte_mbuf_raw_free(m);
 }
 
@@ -166,7 +166,7 @@ static void
 __rte_pktmbuf_init_extmem(struct rte_mempool *mp,
                          void *opaque_arg,
                          void *_m,
-                         __attribute__((unused)) unsigned int i)
+                         __rte_unused unsigned int i)
 {
        struct rte_mbuf *m = _m;
        struct rte_pktmbuf_extmem_init_ctx *ctx = opaque_arg;
@@ -190,14 +190,14 @@ __rte_pktmbuf_init_extmem(struct rte_mempool *mp,
        ext_mem = ctx->ext_mem + ctx->ext;
 
        RTE_ASSERT(ctx->ext < ctx->ext_num);
-       RTE_ASSERT(ctx->off < ext_mem->buf_len);
+       RTE_ASSERT(ctx->off + ext_mem->elt_size <= ext_mem->buf_len);
 
        m->buf_addr = RTE_PTR_ADD(ext_mem->buf_ptr, ctx->off);
        m->buf_iova = ext_mem->buf_iova == RTE_BAD_IOVA ?
                      RTE_BAD_IOVA : (ext_mem->buf_iova + ctx->off);
 
        ctx->off += ext_mem->elt_size;
-       if (ctx->off >= ext_mem->buf_len) {
+       if (ctx->off + ext_mem->elt_size > ext_mem->buf_len) {
                ctx->off = 0;
                ++ctx->ext;
        }
@@ -207,7 +207,7 @@ __rte_pktmbuf_init_extmem(struct rte_mempool *mp,
        /* init some constant fields */
        m->pool = mp;
        m->nb_segs = 1;
-       m->port = MBUF_INVALID_PORT;
+       m->port = RTE_MBUF_PORT_INVALID;
        m->ol_flags = EXT_ATTACHED_MBUF;
        rte_mbuf_refcnt_set(m, 1);
        m->next = NULL;
@@ -764,7 +764,6 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)
        case PKT_RX_QINQ_STRIPPED: return "PKT_RX_QINQ_STRIPPED";
        case PKT_RX_QINQ: return "PKT_RX_QINQ";
        case PKT_RX_LRO: return "PKT_RX_LRO";
-       case PKT_RX_TIMESTAMP: return "PKT_RX_TIMESTAMP";
        case PKT_RX_SEC_OFFLOAD: return "PKT_RX_SEC_OFFLOAD";
        case PKT_RX_SEC_OFFLOAD_FAILED: return "PKT_RX_SEC_OFFLOAD_FAILED";
        case PKT_RX_OUTER_L4_CKSUM_BAD: return "PKT_RX_OUTER_L4_CKSUM_BAD";
@@ -808,7 +807,6 @@ rte_get_rx_ol_flag_list(uint64_t mask, char *buf, size_t buflen)
                { PKT_RX_FDIR_FLX, PKT_RX_FDIR_FLX, NULL },
                { PKT_RX_QINQ_STRIPPED, PKT_RX_QINQ_STRIPPED, NULL },
                { PKT_RX_LRO, PKT_RX_LRO, NULL },
-               { PKT_RX_TIMESTAMP, PKT_RX_TIMESTAMP, NULL },
                { PKT_RX_SEC_OFFLOAD, PKT_RX_SEC_OFFLOAD, NULL },
                { PKT_RX_SEC_OFFLOAD_FAILED, PKT_RX_SEC_OFFLOAD_FAILED, NULL },
                { PKT_RX_QINQ, PKT_RX_QINQ, NULL },