dpdk: fix build error when mlx support enabled

[vpp.git] / src / plugins / dpdk / buffer.c

diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index 21340e5..dd7bf4c 100644 (file)
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -27,14 +27,6 @@
 STATIC_ASSERT (VLIB_BUFFER_PRE_DATA_SIZE == RTE_PKTMBUF_HEADROOM,
               "VLIB_BUFFER_PRE_DATA_SIZE must be equal to RTE_PKTMBUF_HEADROOM");
 
-
-typedef struct
-{
-  /* must be first */
-  struct rte_pktmbuf_pool_private mbp_priv;
-  u8 buffer_pool_index;
-} dpdk_mempool_private_t;
-
 #ifndef CLIB_MARCH_VARIANT
 struct rte_mempool **dpdk_mempool_by_buffer_pool_index = 0;
 struct rte_mempool **dpdk_no_cache_mempool_by_buffer_pool_index = 0;
@@ -44,7 +36,7 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
 {
   uword buffer_mem_start = vm->buffer_main->buffer_mem_start;
   struct rte_mempool *mp, *nmp;
-  dpdk_mempool_private_t priv;
+  struct rte_pktmbuf_pool_private priv;
   enum rte_iova_mode iova_mode;
   u32 *bi;
   u8 *name = 0;
@@ -75,14 +67,15 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
   dpdk_mempool_by_buffer_pool_index[bp->index] = mp;
   dpdk_no_cache_mempool_by_buffer_pool_index[bp->index] = nmp;
 
+  mp->pool_id = nmp->pool_id = bp->index;
+
   rte_mempool_set_ops_byname (mp, "vpp", NULL);
   rte_mempool_set_ops_byname (nmp, "vpp-no-cache", NULL);
 
   /* Call the mempool priv initializer */
-  priv.mbp_priv.mbuf_data_room_size = VLIB_BUFFER_PRE_DATA_SIZE +
-    VLIB_BUFFER_DATA_SIZE;
-  priv.mbp_priv.mbuf_priv_size = VLIB_BUFFER_HDR_SIZE;
-  priv.buffer_pool_index = bp->index;
+  priv.mbuf_data_room_size = VLIB_BUFFER_PRE_DATA_SIZE +
+    vlib_buffer_get_default_data_size (vm);
+  priv.mbuf_priv_size = VLIB_BUFFER_HDR_SIZE;
   rte_pktmbuf_pool_init (mp, &priv);
   rte_pktmbuf_pool_init (nmp, &priv);
 
@@ -124,6 +117,7 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
       uword i;
       size_t page_sz;
       vlib_physmem_map_t *pm;
+      int do_vfio_map = 1;
 
       pm = vlib_physmem_get_map (vm, bp->physmem_map_index);
       page_sz = 1ULL << pm->log2_page_size;
@@ -134,8 +128,21 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
          uword pa = (iova_mode == RTE_IOVA_VA) ?
            pointer_to_uword (va) : pm->page_table[i];
 
-         if (rte_vfio_dma_map (pointer_to_uword (va), pa, page_sz))
-           break;
+         if (do_vfio_map &&
+             rte_vfio_dma_map (pointer_to_uword (va), pa, page_sz))
+           do_vfio_map = 0;
+
+         struct rte_mempool_memhdr *memhdr;
+         memhdr = clib_mem_alloc (sizeof (*memhdr));
+         memhdr->mp = mp;
+         memhdr->addr = va;
+         memhdr->iova = pa;
+         memhdr->len = page_sz;
+         memhdr->free_cb = 0;
+         memhdr->opaque = 0;
+
+         STAILQ_INSERT_TAIL (&mp->mem_list, memhdr, next);
+         mp->nb_mem_chunks++;
        }
     }
 
@@ -176,8 +183,7 @@ CLIB_MULTIARCH_FN (dpdk_ops_vpp_enqueue) (struct rte_mempool * mp,
   const int batch_size = 32;
   vlib_main_t *vm = vlib_get_main ();
   vlib_buffer_t bt;
-  dpdk_mempool_private_t *privp = rte_mempool_get_priv (mp);
-  u8 buffer_pool_index = privp->buffer_pool_index;
+  u8 buffer_pool_index = mp->pool_id;
   vlib_buffer_pool_t *bp = vlib_get_buffer_pool (vm, buffer_pool_index);
   u32 bufs[batch_size];
   u32 n_left = n;
@@ -216,7 +222,7 @@ CLIB_MULTIARCH_FN (dpdk_ops_vpp_enqueue) (struct rte_mempool * mp,
     {
       vlib_get_buffer_indices_with_offset (vm, (void **) obj_table, bufs,
                                           n, sizeof (struct rte_mbuf));
-      vlib_buffer_pool_put (vm, buffer_pool_index, bufs, batch_size);
+      vlib_buffer_pool_put (vm, buffer_pool_index, bufs, n);
     }
 
   return 0;
@@ -249,10 +255,9 @@ CLIB_MULTIARCH_FN (dpdk_ops_vpp_enqueue_no_cache) (struct rte_mempool * cmp,
 {
   vlib_main_t *vm = vlib_get_main ();
   vlib_buffer_t bt;
-  dpdk_mempool_private_t *privp = rte_mempool_get_priv (cmp);
   struct rte_mempool *mp;
-  mp = dpdk_mempool_by_buffer_pool_index[privp->buffer_pool_index];
-  u8 buffer_pool_index = privp->buffer_pool_index;
+  mp = dpdk_mempool_by_buffer_pool_index[cmp->pool_id];
+  u8 buffer_pool_index = cmp->pool_id;
   vlib_buffer_pool_t *bp = vlib_get_buffer_pool (vm, buffer_pool_index);
   vlib_buffer_copy_template (&bt, &bp->buffer_template);
 
@@ -285,8 +290,7 @@ CLIB_MULTIARCH_FN (dpdk_ops_vpp_dequeue) (struct rte_mempool * mp,
   const int batch_size = 32;
   vlib_main_t *vm = vlib_get_main ();
   u32 bufs[batch_size], total = 0, n_alloc = 0;
-  dpdk_mempool_private_t *privp = rte_mempool_get_priv (mp);
-  u8 buffer_pool_index = privp->buffer_pool_index;
+  u8 buffer_pool_index = mp->pool_id;
   void **obj = obj_table;
 
   while (n >= batch_size)
@@ -356,10 +360,8 @@ dpdk_ops_vpp_get_count (const struct rte_mempool *mp)
 static unsigned
 dpdk_ops_vpp_get_count_no_cache (const struct rte_mempool *mp)
 {
-  dpdk_mempool_private_t *privp;
   struct rte_mempool *cmp;
-  privp = rte_mempool_get_priv ((struct rte_mempool *) mp);
-  cmp = dpdk_no_cache_mempool_by_buffer_pool_index[privp->buffer_pool_index];
+  cmp = dpdk_no_cache_mempool_by_buffer_pool_index[mp->pool_id];
   return dpdk_ops_vpp_get_count (cmp);
 }