app: add a test on mbuf alignment

[dpdk.git] / app / test / test_mbuf.c

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index d09f87f..3efad0f 100644 (file)
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -30,7 +30,6 @@
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- *  version: DPDK.L.1.2.3-3
  */
 
 #include <string.h>
@@ -91,7 +90,7 @@ static struct rte_mempool *ctrlmbuf_pool = NULL;
 static struct rte_mempool *refcnt_pool = NULL;
 static struct rte_ring *refcnt_mbuf_ring = NULL;
 static volatile uint32_t refcnt_stop_slaves;
-static uint32_t refcnt_lcore[RTE_MAX_LCORE];
+static unsigned refcnt_lcore[RTE_MAX_LCORE];
 
 #endif
 
@@ -459,7 +458,59 @@ test_pktmbuf_pool(void)
        return ret;
 }
 
+/*
+ * test that the pointer to the data on a packet mbuf is set properly
+ */
+static int
+test_pktmbuf_pool_ptr(void)
+{
+       unsigned i;
+       struct rte_mbuf *m[NB_MBUF];
+       int ret = 0;
+               
+       for (i=0; i<NB_MBUF; i++)
+               m[i] = NULL;
+
+       /* alloc NB_MBUF mbufs */
+       for (i=0; i<NB_MBUF; i++) {
+               m[i] = rte_pktmbuf_alloc(pktmbuf_pool);
+               if (m[i] == NULL) {
+                       printf("rte_pktmbuf_alloc() failed (%u)\n", i);
+                       ret = -1;
+               }
+               m[i]->pkt.data = RTE_PTR_ADD(m[i]->pkt.data, 64);
+       }
+
+       /* free them */
+       for (i=0; i<NB_MBUF; i++) {
+               if (m[i] != NULL)
+                       rte_pktmbuf_free(m[i]);
+       }
+       
+       for (i=0; i<NB_MBUF; i++)
+               m[i] = NULL;
+               
+       /* alloc NB_MBUF mbufs */
+       for (i=0; i<NB_MBUF; i++) {
+               m[i] = rte_pktmbuf_alloc(pktmbuf_pool);
+               if (m[i] == NULL) {
+                       printf("rte_pktmbuf_alloc() failed (%u)\n", i);
+                       ret = -1;
+               }
+               if (m[i]->pkt.data != RTE_PTR_ADD(m[i]->buf_addr, RTE_PKTMBUF_HEADROOM)) {
+                       printf ("pkt.data pointer not set properly\n");
+                       ret = -1;
+               }
+       }
 
+       /* free them */
+       for (i=0; i<NB_MBUF; i++) {
+               if (m[i] != NULL)
+                       rte_pktmbuf_free(m[i]);
+       }
+
+       return ret;
+}
 
 static int
 test_pktmbuf_free_segment(void)
@@ -509,8 +560,8 @@ test_pktmbuf_free_segment(void)
 static int
 test_refcnt_slave(__attribute__((unused)) void *arg)
 {
-       uint32_t lcore, free;
-       void *mp;
+       unsigned lcore, free;
+       void *mp = 0;
 
        lcore = rte_lcore_id();
        printf("%s started at lcore %u\n", __func__, lcore);
@@ -531,10 +582,10 @@ test_refcnt_slave(__attribute__((unused)) void *arg)
 }
 
 static void
-test_refcnt_iter(uint32_t lcore, uint32_t iter)
+test_refcnt_iter(unsigned lcore, unsigned iter)
 {
        uint16_t ref;
-       uint32_t i, n, tref, wn;
+       unsigned i, n, tref, wn;
        struct rte_mbuf *m;
 
        tref = 0;
@@ -589,7 +640,7 @@ test_refcnt_iter(uint32_t lcore, uint32_t iter)
 static int
 test_refcnt_master(void)
 {
-       uint32_t i, lcore;
+       unsigned i, lcore;
 
        lcore = rte_lcore_id();
        printf("%s started at lcore %u\n", __func__, lcore);
@@ -611,7 +662,7 @@ test_refcnt_mbuf(void)
 {
 #if defined RTE_MBUF_SCATTER_GATHER  && defined RTE_MBUF_REFCNT_ATOMIC
 
-       uint32_t lnum, master, slave, tref;
+       unsigned lnum, master, slave, tref;
 
 
        if ((lnum = rte_lcore_count()) == 1) {
@@ -813,6 +864,12 @@ test_mbuf(void)
                printf("test_mbuf_pool() failed (2)\n");
                return -1;
        }
+       
+       /* test that the pointer to the data on a packet mbuf is set properly */
+       if (test_pktmbuf_pool_ptr() < 0) {
+               printf("test_pktmbuf_pool_ptr() failed\n");
+               return -1;
+       }
 
        /* test data manipulation in mbuf */
        if (test_one_pktmbuf() < 0) {