test: move to app directory
[dpdk.git] / app / test / test_mbuf.c
index 1b25481..9e82a20 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <string.h>
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_log.h>
-#include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
-#include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -62,7 +30,7 @@
 
 #include "test.h"
 
-#define MBUF_SIZE               2048
+#define MBUF_DATA_SIZE          2048
 #define NB_MBUF                 128
 #define MBUF_TEST_DATA_LEN      1464
 #define MBUF_TEST_DATA_LEN2     50
 #define MBUF_TEST_HDR2_LEN      30
 #define MBUF_TEST_ALL_HDRS_LEN  (MBUF_TEST_HDR1_LEN+MBUF_TEST_HDR2_LEN)
 
+/* size of private data for mbuf in pktmbuf_pool2 */
+#define MBUF2_PRIV_SIZE         128
+
 #define REFCNT_MAX_ITER         64
 #define REFCNT_MAX_TIMEOUT      10
 #define REFCNT_MAX_REF          (RTE_MAX_LCORE)
 #define REFCNT_MBUF_NUM         64
-#define REFCNT_MBUF_SIZE        (sizeof (struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 #define REFCNT_RING_SIZE        (REFCNT_MBUF_NUM * REFCNT_MAX_REF)
 
-#define MAKE_STRING(x)          # x
+#define MAGIC_DATA              0x42424242
 
-static struct rte_mempool *pktmbuf_pool = NULL;
+#define MAKE_STRING(x)          # x
 
-#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
+#ifdef RTE_MBUF_REFCNT_ATOMIC
 
-static struct rte_mempool *refcnt_pool = NULL;
-static struct rte_ring *refcnt_mbuf_ring = NULL;
 static volatile uint32_t refcnt_stop_slaves;
 static unsigned refcnt_lcore[RTE_MAX_LCORE];
 
@@ -124,6 +92,10 @@ static unsigned refcnt_lcore[RTE_MAX_LCORE];
  *    - Repeat the test to check that allocation operations
  *      reinitialize the mbuf correctly.
  *
+ * #. Test packet cloning
+ *    - Clone a mbuf and verify the data
+ *    - Clone the cloned mbuf and verify the data
+ *    - Attach a mbuf to another that does not have the same priv_size.
  */
 
 #define GOTO_FAIL(str, ...) do {                                       \
@@ -136,7 +108,7 @@ static unsigned refcnt_lcore[RTE_MAX_LCORE];
  * test data manipulation in mbuf with non-ascii data
  */
 static int
-test_pktmbuf_with_non_ascii_data(void)
+test_pktmbuf_with_non_ascii_data(struct rte_mempool *pktmbuf_pool)
 {
        struct rte_mbuf *m = NULL;
        char *data;
@@ -174,7 +146,7 @@ fail:
  * test data manipulation in mbuf
  */
 static int
-test_one_pktmbuf(void)
+test_one_pktmbuf(struct rte_mempool *pktmbuf_pool)
 {
        struct rte_mbuf *m = NULL;
        char *data, *data2, *hdr;
@@ -320,60 +292,222 @@ fail:
 }
 
 static int
-testclone_testupdate_testdetach(void)
+testclone_testupdate_testdetach(struct rte_mempool *pktmbuf_pool)
 {
-#ifndef RTE_MBUF_REFCNT
-       return 0;
-#else
-       struct rte_mbuf *mc = NULL;
+       struct rte_mbuf *m = NULL;
        struct rte_mbuf *clone = NULL;
+       struct rte_mbuf *clone2 = NULL;
+       unaligned_uint32_t *data;
 
        /* alloc a mbuf */
-
-       mc = rte_pktmbuf_alloc(pktmbuf_pool);
-       if (mc == NULL)
+       m = rte_pktmbuf_alloc(pktmbuf_pool);
+       if (m == NULL)
                GOTO_FAIL("ooops not allocating mbuf");
 
-       if (rte_pktmbuf_pkt_len(mc) != 0)
+       if (rte_pktmbuf_pkt_len(m) != 0)
                GOTO_FAIL("Bad length");
 
+       rte_pktmbuf_append(m, sizeof(uint32_t));
+       data = rte_pktmbuf_mtod(m, unaligned_uint32_t *);
+       *data = MAGIC_DATA;
 
        /* clone the allocated mbuf */
-       clone = rte_pktmbuf_clone(mc, pktmbuf_pool);
+       clone = rte_pktmbuf_clone(m, pktmbuf_pool);
        if (clone == NULL)
                GOTO_FAIL("cannot clone data\n");
+
+       data = rte_pktmbuf_mtod(clone, unaligned_uint32_t *);
+       if (*data != MAGIC_DATA)
+               GOTO_FAIL("invalid data in clone\n");
+
+       if (rte_mbuf_refcnt_read(m) != 2)
+               GOTO_FAIL("invalid refcnt in m\n");
+
+       /* free the clone */
        rte_pktmbuf_free(clone);
+       clone = NULL;
 
-       mc->next = rte_pktmbuf_alloc(pktmbuf_pool);
-       if(mc->next == NULL)
+       /* same test with a chained mbuf */
+       m->next = rte_pktmbuf_alloc(pktmbuf_pool);
+       if (m->next == NULL)
                GOTO_FAIL("Next Pkt Null\n");
 
-       clone = rte_pktmbuf_clone(mc, pktmbuf_pool);
+       rte_pktmbuf_append(m->next, sizeof(uint32_t));
+       data = rte_pktmbuf_mtod(m->next, unaligned_uint32_t *);
+       *data = MAGIC_DATA;
+
+       clone = rte_pktmbuf_clone(m, pktmbuf_pool);
        if (clone == NULL)
                GOTO_FAIL("cannot clone data\n");
 
+       data = rte_pktmbuf_mtod(clone, unaligned_uint32_t *);
+       if (*data != MAGIC_DATA)
+               GOTO_FAIL("invalid data in clone\n");
+
+       data = rte_pktmbuf_mtod(clone->next, unaligned_uint32_t *);
+       if (*data != MAGIC_DATA)
+               GOTO_FAIL("invalid data in clone->next\n");
+
+       if (rte_mbuf_refcnt_read(m) != 2)
+               GOTO_FAIL("invalid refcnt in m\n");
+
+       if (rte_mbuf_refcnt_read(m->next) != 2)
+               GOTO_FAIL("invalid refcnt in m->next\n");
+
+       /* try to clone the clone */
+
+       clone2 = rte_pktmbuf_clone(clone, pktmbuf_pool);
+       if (clone2 == NULL)
+               GOTO_FAIL("cannot clone the clone\n");
+
+       data = rte_pktmbuf_mtod(clone2, unaligned_uint32_t *);
+       if (*data != MAGIC_DATA)
+               GOTO_FAIL("invalid data in clone2\n");
+
+       data = rte_pktmbuf_mtod(clone2->next, unaligned_uint32_t *);
+       if (*data != MAGIC_DATA)
+               GOTO_FAIL("invalid data in clone2->next\n");
+
+       if (rte_mbuf_refcnt_read(m) != 3)
+               GOTO_FAIL("invalid refcnt in m\n");
+
+       if (rte_mbuf_refcnt_read(m->next) != 3)
+               GOTO_FAIL("invalid refcnt in m->next\n");
+
        /* free mbuf */
-       rte_pktmbuf_free(mc);
+       rte_pktmbuf_free(m);
        rte_pktmbuf_free(clone);
-       mc = NULL;
+       rte_pktmbuf_free(clone2);
+
+       m = NULL;
        clone = NULL;
+       clone2 = NULL;
+       printf("%s ok\n", __func__);
        return 0;
 
 fail:
-       if (mc)
-               rte_pktmbuf_free(mc);
+       if (m)
+               rte_pktmbuf_free(m);
+       if (clone)
+               rte_pktmbuf_free(clone);
+       if (clone2)
+               rte_pktmbuf_free(clone2);
        return -1;
-#endif /* RTE_MBUF_REFCNT */
 }
-#undef GOTO_FAIL
 
+static int
+test_attach_from_different_pool(struct rte_mempool *pktmbuf_pool,
+                               struct rte_mempool *pktmbuf_pool2)
+{
+       struct rte_mbuf *m = NULL;
+       struct rte_mbuf *clone = NULL;
+       struct rte_mbuf *clone2 = NULL;
+       char *data, *c_data, *c_data2;
+
+       /* alloc a mbuf */
+       m = rte_pktmbuf_alloc(pktmbuf_pool);
+       if (m == NULL)
+               GOTO_FAIL("cannot allocate mbuf");
+
+       if (rte_pktmbuf_pkt_len(m) != 0)
+               GOTO_FAIL("Bad length");
+
+       data = rte_pktmbuf_mtod(m, char *);
 
+       /* allocate a new mbuf from the second pool, and attach it to the first
+        * mbuf */
+       clone = rte_pktmbuf_alloc(pktmbuf_pool2);
+       if (clone == NULL)
+               GOTO_FAIL("cannot allocate mbuf from second pool\n");
+
+       /* check data room size and priv size, and erase priv */
+       if (rte_pktmbuf_data_room_size(clone->pool) != 0)
+               GOTO_FAIL("data room size should be 0\n");
+       if (rte_pktmbuf_priv_size(clone->pool) != MBUF2_PRIV_SIZE)
+               GOTO_FAIL("data room size should be %d\n", MBUF2_PRIV_SIZE);
+       memset(clone + 1, 0, MBUF2_PRIV_SIZE);
+
+       /* save data pointer to compare it after detach() */
+       c_data = rte_pktmbuf_mtod(clone, char *);
+       if (c_data != (char *)clone + sizeof(*clone) + MBUF2_PRIV_SIZE)
+               GOTO_FAIL("bad data pointer in clone");
+       if (rte_pktmbuf_headroom(clone) != 0)
+               GOTO_FAIL("bad headroom in clone");
+
+       rte_pktmbuf_attach(clone, m);
+
+       if (rte_pktmbuf_mtod(clone, char *) != data)
+               GOTO_FAIL("clone was not attached properly\n");
+       if (rte_pktmbuf_headroom(clone) != RTE_PKTMBUF_HEADROOM)
+               GOTO_FAIL("bad headroom in clone after attach");
+       if (rte_mbuf_refcnt_read(m) != 2)
+               GOTO_FAIL("invalid refcnt in m\n");
+
+       /* allocate a new mbuf from the second pool, and attach it to the first
+        * cloned mbuf */
+       clone2 = rte_pktmbuf_alloc(pktmbuf_pool2);
+       if (clone2 == NULL)
+               GOTO_FAIL("cannot allocate clone2 from second pool\n");
+
+       /* check data room size and priv size, and erase priv */
+       if (rte_pktmbuf_data_room_size(clone2->pool) != 0)
+               GOTO_FAIL("data room size should be 0\n");
+       if (rte_pktmbuf_priv_size(clone2->pool) != MBUF2_PRIV_SIZE)
+               GOTO_FAIL("data room size should be %d\n", MBUF2_PRIV_SIZE);
+       memset(clone2 + 1, 0, MBUF2_PRIV_SIZE);
+
+       /* save data pointer to compare it after detach() */
+       c_data2 = rte_pktmbuf_mtod(clone2, char *);
+       if (c_data2 != (char *)clone2 + sizeof(*clone2) + MBUF2_PRIV_SIZE)
+               GOTO_FAIL("bad data pointer in clone2");
+       if (rte_pktmbuf_headroom(clone2) != 0)
+               GOTO_FAIL("bad headroom in clone2");
+
+       rte_pktmbuf_attach(clone2, clone);
+
+       if (rte_pktmbuf_mtod(clone2, char *) != data)
+               GOTO_FAIL("clone2 was not attached properly\n");
+       if (rte_pktmbuf_headroom(clone2) != RTE_PKTMBUF_HEADROOM)
+               GOTO_FAIL("bad headroom in clone2 after attach");
+       if (rte_mbuf_refcnt_read(m) != 3)
+               GOTO_FAIL("invalid refcnt in m\n");
+
+       /* detach the clones */
+       rte_pktmbuf_detach(clone);
+       if (c_data != rte_pktmbuf_mtod(clone, char *))
+               GOTO_FAIL("clone was not detached properly\n");
+       if (rte_mbuf_refcnt_read(m) != 2)
+               GOTO_FAIL("invalid refcnt in m\n");
+
+       rte_pktmbuf_detach(clone2);
+       if (c_data2 != rte_pktmbuf_mtod(clone2, char *))
+               GOTO_FAIL("clone2 was not detached properly\n");
+       if (rte_mbuf_refcnt_read(m) != 1)
+               GOTO_FAIL("invalid refcnt in m\n");
+
+       /* free the clones and the initial mbuf */
+       rte_pktmbuf_free(clone2);
+       rte_pktmbuf_free(clone);
+       rte_pktmbuf_free(m);
+       printf("%s ok\n", __func__);
+       return 0;
+
+fail:
+       if (m)
+               rte_pktmbuf_free(m);
+       if (clone)
+               rte_pktmbuf_free(clone);
+       if (clone2)
+               rte_pktmbuf_free(clone2);
+       return -1;
+}
+#undef GOTO_FAIL
 
 /*
  * test allocation and free of mbufs
  */
 static int
-test_pktmbuf_pool(void)
+test_pktmbuf_pool(struct rte_mempool *pktmbuf_pool)
 {
        unsigned i;
        struct rte_mbuf *m[NB_MBUF];
@@ -396,13 +530,11 @@ test_pktmbuf_pool(void)
                printf("Error pool not empty");
                ret = -1;
        }
-#ifdef RTE_MBUF_REFCNT
        extra = rte_pktmbuf_clone(m[0], pktmbuf_pool);
        if(extra != NULL) {
                printf("Error pool not empty");
                ret = -1;
        }
-#endif
        /* free them */
        for (i=0; i<NB_MBUF; i++) {
                if (m[i] != NULL)
@@ -416,7 +548,7 @@ test_pktmbuf_pool(void)
  * test that the pointer to the data on a packet mbuf is set properly
  */
 static int
-test_pktmbuf_pool_ptr(void)
+test_pktmbuf_pool_ptr(struct rte_mempool *pktmbuf_pool)
 {
        unsigned i;
        struct rte_mbuf *m[NB_MBUF];
@@ -431,6 +563,7 @@ test_pktmbuf_pool_ptr(void)
                if (m[i] == NULL) {
                        printf("rte_pktmbuf_alloc() failed (%u)\n", i);
                        ret = -1;
+                       break;
                }
                m[i]->data_off += 64;
        }
@@ -450,6 +583,7 @@ test_pktmbuf_pool_ptr(void)
                if (m[i] == NULL) {
                        printf("rte_pktmbuf_alloc() failed (%u)\n", i);
                        ret = -1;
+                       break;
                }
                if (m[i]->data_off != RTE_PKTMBUF_HEADROOM) {
                        printf("invalid data_off\n");
@@ -467,7 +601,7 @@ test_pktmbuf_pool_ptr(void)
 }
 
 static int
-test_pktmbuf_free_segment(void)
+test_pktmbuf_free_segment(struct rte_mempool *pktmbuf_pool)
 {
        unsigned i;
        struct rte_mbuf *m[NB_MBUF];
@@ -504,18 +638,18 @@ test_pktmbuf_free_segment(void)
 
 /*
  * Stress test for rte_mbuf atomic refcnt.
- * Implies that:
- * RTE_MBUF_REFCNT and RTE_MBUF_REFCNT_ATOMIC are both defined.
- * For more efficency, recomended to run with RTE_LIBRTE_MBUF_DEBUG defined.
+ * Implies that RTE_MBUF_REFCNT_ATOMIC is defined.
+ * For more efficiency, recommended to run with RTE_LIBRTE_MBUF_DEBUG defined.
  */
 
-#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
+#ifdef RTE_MBUF_REFCNT_ATOMIC
 
 static int
-test_refcnt_slave(__attribute__((unused)) void *arg)
+test_refcnt_slave(void *arg)
 {
        unsigned lcore, free;
        void *mp = 0;
+       struct rte_ring *refcnt_mbuf_ring = arg;
 
        lcore = rte_lcore_id();
        printf("%s started at lcore %u\n", __func__, lcore);
@@ -524,7 +658,7 @@ test_refcnt_slave(__attribute__((unused)) void *arg)
        while (refcnt_stop_slaves == 0) {
                if (rte_ring_dequeue(refcnt_mbuf_ring, &mp) == 0) {
                        free++;
-                       rte_pktmbuf_free((struct rte_mbuf *)mp);
+                       rte_pktmbuf_free(mp);
                }
        }
 
@@ -532,11 +666,13 @@ test_refcnt_slave(__attribute__((unused)) void *arg)
        printf("%s finished at lcore %u, "
               "number of freed mbufs: %u\n",
               __func__, lcore, free);
-       return (0);
+       return 0;
 }
 
 static void
-test_refcnt_iter(unsigned lcore, unsigned iter)
+test_refcnt_iter(unsigned int lcore, unsigned int iter,
+                struct rte_mempool *refcnt_pool,
+                struct rte_ring *refcnt_mbuf_ring)
 {
        uint16_t ref;
        unsigned i, n, tref, wn;
@@ -549,7 +685,7 @@ test_refcnt_iter(unsigned lcore, unsigned iter)
         * - increment it's reference up to N+1,
         * - enqueue it N times into the ring for slave cores to free.
         */
-       for (i = 0, n = rte_mempool_count(refcnt_pool);
+       for (i = 0, n = rte_mempool_avail_count(refcnt_pool);
            i != n && (m = rte_pktmbuf_alloc(refcnt_pool)) != NULL;
            i++) {
                ref = RTE_MAX(rte_rand() % REFCNT_MAX_REF, 1UL);
@@ -577,14 +713,14 @@ test_refcnt_iter(unsigned lcore, unsigned iter)
 
        /* check that all mbufs are back into mempool by now */
        for (wn = 0; wn != REFCNT_MAX_TIMEOUT; wn++) {
-               if ((i = rte_mempool_count(refcnt_pool)) == n) {
+               if ((i = rte_mempool_avail_count(refcnt_pool)) == n) {
                        refcnt_lcore[lcore] += tref;
                        printf("%s(lcore=%u, iter=%u) completed, "
                            "%u references processed\n",
                            __func__, lcore, iter, tref);
                        return;
                }
-               rte_delay_ms(1000);
+               rte_delay_ms(100);
        }
 
        rte_panic("(lcore=%u, iter=%u): after %us only "
@@ -592,7 +728,8 @@ test_refcnt_iter(unsigned lcore, unsigned iter)
 }
 
 static int
-test_refcnt_master(void)
+test_refcnt_master(struct rte_mempool *refcnt_pool,
+                  struct rte_ring *refcnt_mbuf_ring)
 {
        unsigned i, lcore;
 
@@ -600,13 +737,13 @@ test_refcnt_master(void)
        printf("%s started at lcore %u\n", __func__, lcore);
 
        for (i = 0; i != REFCNT_MAX_ITER; i++)
-               test_refcnt_iter(lcore, i);
+               test_refcnt_iter(lcore, i, refcnt_pool, refcnt_mbuf_ring);
 
        refcnt_stop_slaves = 1;
        rte_wmb();
 
        printf("%s finished at lcore %u\n", __func__, lcore);
-       return (0);
+       return 0;
 }
 
 #endif
@@ -614,48 +751,47 @@ test_refcnt_master(void)
 static int
 test_refcnt_mbuf(void)
 {
-#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
-
+#ifdef RTE_MBUF_REFCNT_ATOMIC
        unsigned lnum, master, slave, tref;
-
+       int ret = -1;
+       struct rte_mempool *refcnt_pool = NULL;
+       struct rte_ring *refcnt_mbuf_ring = NULL;
 
        if ((lnum = rte_lcore_count()) == 1) {
                printf("skipping %s, number of lcores: %u is not enough\n",
                    __func__, lnum);
-               return (0);
+               return 0;
        }
 
        printf("starting %s, at %u lcores\n", __func__, lnum);
 
        /* create refcnt pool & ring if they don't exist */
 
-       if (refcnt_pool == NULL &&
-                       (refcnt_pool = rte_mempool_create(
-                       MAKE_STRING(refcnt_pool),
-                       REFCNT_MBUF_NUM, REFCNT_MBUF_SIZE, 0,
-                       sizeof(struct rte_pktmbuf_pool_private),
-                       rte_pktmbuf_pool_init, NULL, rte_pktmbuf_init, NULL,
-                       SOCKET_ID_ANY, 0)) == NULL) {
+       refcnt_pool = rte_pktmbuf_pool_create(MAKE_STRING(refcnt_pool),
+                                             REFCNT_MBUF_NUM, 0, 0, 0,
+                                             SOCKET_ID_ANY);
+       if (refcnt_pool == NULL) {
                printf("%s: cannot allocate " MAKE_STRING(refcnt_pool) "\n",
                    __func__);
-               return (-1);
+               return -1;
        }
 
-       if (refcnt_mbuf_ring == NULL &&
-                       (refcnt_mbuf_ring = rte_ring_create("refcnt_mbuf_ring",
-                       REFCNT_RING_SIZE, SOCKET_ID_ANY,
-                       RING_F_SP_ENQ)) == NULL) {
+       refcnt_mbuf_ring = rte_ring_create("refcnt_mbuf_ring",
+                       rte_align32pow2(REFCNT_RING_SIZE), SOCKET_ID_ANY,
+                                       RING_F_SP_ENQ);
+       if (refcnt_mbuf_ring == NULL) {
                printf("%s: cannot allocate " MAKE_STRING(refcnt_mbuf_ring)
                    "\n", __func__);
-               return (-1);
+               goto err;
        }
 
        refcnt_stop_slaves = 0;
        memset(refcnt_lcore, 0, sizeof (refcnt_lcore));
 
-       rte_eal_mp_remote_launch(test_refcnt_slave, NULL, SKIP_MASTER);
+       rte_eal_mp_remote_launch(test_refcnt_slave, refcnt_mbuf_ring,
+                                SKIP_MASTER);
 
-       test_refcnt_master();
+       test_refcnt_master(refcnt_pool, refcnt_mbuf_ring);
 
        rte_eal_mp_wait_lcore();
 
@@ -673,25 +809,21 @@ test_refcnt_mbuf(void)
        rte_mempool_dump(stdout, refcnt_pool);
        rte_ring_dump(stdout, refcnt_mbuf_ring);
 
-#endif
-       return (0);
-}
-
-#ifdef RTE_EXEC_ENV_BAREMETAL
+       ret = 0;
 
-/* baremetal - don't test failing sanity checks */
-static int
-test_failing_mbuf_sanity_check(void)
-{
+err:
+       rte_mempool_free(refcnt_pool);
+       rte_ring_free(refcnt_mbuf_ring);
+       return ret;
+#else
        return 0;
+#endif
 }
 
-#else
-
 #include <unistd.h>
 #include <sys/wait.h>
 
-/* linuxapp - use fork() to test mbuf errors panic */
+/* use fork() to test mbuf errors panic */
 static int
 verify_mbuf_check_panics(struct rte_mbuf *buf)
 {
@@ -715,7 +847,7 @@ verify_mbuf_check_panics(struct rte_mbuf *buf)
 }
 
 static int
-test_failing_mbuf_sanity_check(void)
+test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool)
 {
        struct rte_mbuf *buf;
        struct rte_mbuf badbuf;
@@ -745,7 +877,7 @@ test_failing_mbuf_sanity_check(void)
        }
 
        badbuf = *buf;
-       badbuf.buf_physaddr = 0;
+       badbuf.buf_iova = 0;
        if (verify_mbuf_check_panics(&badbuf)) {
                printf("Error with bad-physaddr mbuf test\n");
                return -1;
@@ -758,7 +890,6 @@ test_failing_mbuf_sanity_check(void)
                return -1;
        }
 
-#ifdef RTE_MBUF_REFCNT
        badbuf = *buf;
        badbuf.refcnt = 0;
        if (verify_mbuf_check_panics(&badbuf)) {
@@ -772,56 +903,182 @@ test_failing_mbuf_sanity_check(void)
                printf("Error with bad-refcnt(MAX) mbuf test\n");
                return -1;
        }
-#endif
 
        return 0;
 }
-#endif
 
+static int
+test_mbuf_linearize(struct rte_mempool *pktmbuf_pool, int pkt_len,
+                   int nb_segs)
+{
+
+       struct rte_mbuf *m = NULL, *mbuf = NULL;
+       uint8_t *data;
+       int data_len = 0;
+       int remain;
+       int seg, seg_len;
+       int i;
+
+       if (pkt_len < 1) {
+               printf("Packet size must be 1 or more (is %d)\n", pkt_len);
+               return -1;
+       }
+
+       if (nb_segs < 1) {
+               printf("Number of segments must be 1 or more (is %d)\n",
+                               nb_segs);
+               return -1;
+       }
+
+       seg_len = pkt_len / nb_segs;
+       if (seg_len == 0)
+               seg_len = 1;
+
+       remain = pkt_len;
+
+       /* Create chained mbuf_src and fill it generated data */
+       for (seg = 0; remain > 0; seg++) {
+
+               m = rte_pktmbuf_alloc(pktmbuf_pool);
+               if (m == NULL) {
+                       printf("Cannot create segment for source mbuf");
+                       goto fail;
+               }
+
+               /* Make sure if tailroom is zeroed */
+               memset(rte_pktmbuf_mtod(m, uint8_t *), 0,
+                               rte_pktmbuf_tailroom(m));
+
+               data_len = remain;
+               if (data_len > seg_len)
+                       data_len = seg_len;
+
+               data = (uint8_t *)rte_pktmbuf_append(m, data_len);
+               if (data == NULL) {
+                       printf("Cannot append %d bytes to the mbuf\n",
+                                       data_len);
+                       goto fail;
+               }
+
+               for (i = 0; i < data_len; i++)
+                       data[i] = (seg * seg_len + i) % 0x0ff;
+
+               if (seg == 0)
+                       mbuf = m;
+               else
+                       rte_pktmbuf_chain(mbuf, m);
+
+               remain -= data_len;
+       }
+
+       /* Create destination buffer to store coalesced data */
+       if (rte_pktmbuf_linearize(mbuf)) {
+               printf("Mbuf linearization failed\n");
+               goto fail;
+       }
+
+       if (!rte_pktmbuf_is_contiguous(mbuf)) {
+               printf("Source buffer should be contiguous after "
+                               "linearization\n");
+               goto fail;
+       }
+
+       data = rte_pktmbuf_mtod(mbuf, uint8_t *);
+
+       for (i = 0; i < pkt_len; i++)
+               if (data[i] != (i % 0x0ff)) {
+                       printf("Incorrect data in linearized mbuf\n");
+                       goto fail;
+               }
+
+       rte_pktmbuf_free(mbuf);
+       return 0;
+
+fail:
+       if (mbuf)
+               rte_pktmbuf_free(mbuf);
+       return -1;
+}
+
+static int
+test_mbuf_linearize_check(struct rte_mempool *pktmbuf_pool)
+{
+       struct test_mbuf_array {
+               int size;
+               int nb_segs;
+       } mbuf_array[] = {
+                       { 128, 1 },
+                       { 64, 64 },
+                       { 512, 10 },
+                       { 250, 11 },
+                       { 123, 8 },
+       };
+       unsigned int i;
+
+       printf("Test mbuf linearize API\n");
+
+       for (i = 0; i < RTE_DIM(mbuf_array); i++)
+               if (test_mbuf_linearize(pktmbuf_pool, mbuf_array[i].size,
+                               mbuf_array[i].nb_segs)) {
+                       printf("Test failed for %d, %d\n", mbuf_array[i].size,
+                                       mbuf_array[i].nb_segs);
+                       return -1;
+               }
+
+       return 0;
+}
 
 static int
 test_mbuf(void)
 {
-       RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) != 64);
+       int ret = -1;
+       struct rte_mempool *pktmbuf_pool = NULL;
+       struct rte_mempool *pktmbuf_pool2 = NULL;
+
+
+       RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) != RTE_CACHE_LINE_MIN_SIZE * 2);
 
        /* create pktmbuf pool if it does not exist */
+       pktmbuf_pool = rte_pktmbuf_pool_create("test_pktmbuf_pool",
+                       NB_MBUF, 32, 0, MBUF_DATA_SIZE, SOCKET_ID_ANY);
+
        if (pktmbuf_pool == NULL) {
-               pktmbuf_pool =
-                       rte_mempool_create("test_pktmbuf_pool", NB_MBUF,
-                                          MBUF_SIZE, 32,
-                                          sizeof(struct rte_pktmbuf_pool_private),
-                                          rte_pktmbuf_pool_init, NULL,
-                                          rte_pktmbuf_init, NULL,
-                                          SOCKET_ID_ANY, 0);
+               printf("cannot allocate mbuf pool\n");
+               goto err;
        }
 
-       if (pktmbuf_pool == NULL) {
+       /* create a specific pktmbuf pool with a priv_size != 0 and no data
+        * room size */
+       pktmbuf_pool2 = rte_pktmbuf_pool_create("test_pktmbuf_pool2",
+                       NB_MBUF, 32, MBUF2_PRIV_SIZE, 0, SOCKET_ID_ANY);
+
+       if (pktmbuf_pool2 == NULL) {
                printf("cannot allocate mbuf pool\n");
-               return -1;
+               goto err;
        }
 
        /* test multiple mbuf alloc */
-       if (test_pktmbuf_pool() < 0) {
+       if (test_pktmbuf_pool(pktmbuf_pool) < 0) {
                printf("test_mbuf_pool() failed\n");
-               return -1;
+               goto err;
        }
 
        /* do it another time to check that all mbufs were freed */
-       if (test_pktmbuf_pool() < 0) {
+       if (test_pktmbuf_pool(pktmbuf_pool) < 0) {
                printf("test_mbuf_pool() failed (2)\n");
-               return -1;
+               goto err;
        }
 
        /* test that the pointer to the data on a packet mbuf is set properly */
-       if (test_pktmbuf_pool_ptr() < 0) {
+       if (test_pktmbuf_pool_ptr(pktmbuf_pool) < 0) {
                printf("test_pktmbuf_pool_ptr() failed\n");
-               return -1;
+               goto err;
        }
 
        /* test data manipulation in mbuf */
-       if (test_one_pktmbuf() < 0) {
+       if (test_one_pktmbuf(pktmbuf_pool) < 0) {
                printf("test_one_mbuf() failed\n");
-               return -1;
+               goto err;
        }
 
 
@@ -829,41 +1086,52 @@ test_mbuf(void)
         * do it another time, to check that allocation reinitialize
         * the mbuf correctly
         */
-       if (test_one_pktmbuf() < 0) {
+       if (test_one_pktmbuf(pktmbuf_pool) < 0) {
                printf("test_one_mbuf() failed (2)\n");
-               return -1;
+               goto err;
        }
 
-       if (test_pktmbuf_with_non_ascii_data() < 0) {
+       if (test_pktmbuf_with_non_ascii_data(pktmbuf_pool) < 0) {
                printf("test_pktmbuf_with_non_ascii_data() failed\n");
-               return -1;
+               goto err;
        }
 
        /* test free pktmbuf segment one by one */
-       if (test_pktmbuf_free_segment() < 0) {
+       if (test_pktmbuf_free_segment(pktmbuf_pool) < 0) {
                printf("test_pktmbuf_free_segment() failed.\n");
-               return -1;
+               goto err;
        }
 
-       if (testclone_testupdate_testdetach()<0){
+       if (testclone_testupdate_testdetach(pktmbuf_pool) < 0) {
                printf("testclone_and_testupdate() failed \n");
-               return -1;
+               goto err;
+       }
+
+       if (test_attach_from_different_pool(pktmbuf_pool, pktmbuf_pool2) < 0) {
+               printf("test_attach_from_different_pool() failed\n");
+               goto err;
        }
 
        if (test_refcnt_mbuf()<0){
                printf("test_refcnt_mbuf() failed \n");
-               return -1;
+               goto err;
        }
 
-       if (test_failing_mbuf_sanity_check() < 0) {
+       if (test_failing_mbuf_sanity_check(pktmbuf_pool) < 0) {
                printf("test_failing_mbuf_sanity_check() failed\n");
-               return -1;
+               goto err;
        }
-       return 0;
+
+       if (test_mbuf_linearize_check(pktmbuf_pool) < 0) {
+               printf("test_mbuf_linearize_check() failed\n");
+               goto err;
+       }
+       ret = 0;
+
+err:
+       rte_mempool_free(pktmbuf_pool);
+       rte_mempool_free(pktmbuf_pool2);
+       return ret;
 }
 
-static struct test_command mbuf_cmd = {
-       .command = "mbuf_autotest",
-       .callback = test_mbuf,
-};
-REGISTER_TEST_COMMAND(mbuf_cmd);
+REGISTER_TEST_COMMAND(mbuf_autotest, test_mbuf);