X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fbuffer.c;h=6add0630d8509d843c6ac3c5468519fad427df3a;hb=8f818cc35972f447acd3cf68229d5f9e634926f3;hp=7f6c118a4a5dc00e626ca514a86c71ecb48f75a6;hpb=6f70e913c58b81ff40bb980359cfa1f3c88ff150;p=vpp.git

diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index 7f6c118a4a5..6add0630d85 100644
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -55,6 +55,13 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
   mp = rte_mempool_create_empty ((char *) name, vec_len (bp->buffers),
 				 elt_size, 512, sizeof (priv),
 				 bp->numa_node, 0);
+  if (!mp)
+    {
+      vec_free (name);
+      return clib_error_return (0,
+				"failed to create normal mempool for numa node %u",
+				bp->index);
+    }
   vec_reset_length (name);
 
   /* non-cached mempool */
@@ -62,6 +69,14 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
   nmp = rte_mempool_create_empty ((char *) name, vec_len (bp->buffers),
 				  elt_size, 0, sizeof (priv),
 				  bp->numa_node, 0);
+  if (!nmp)
+    {
+      rte_mempool_free (mp);
+      vec_free (name);
+      return clib_error_return (0,
+				"failed to create non-cache mempool for numa nude %u",
+				bp->index);
+    }
   vec_free (name);
 
   dpdk_mempool_by_buffer_pool_index[bp->index] = mp;
@@ -74,7 +89,7 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
 
   /* Call the mempool priv initializer */
   priv.mbuf_data_room_size = VLIB_BUFFER_PRE_DATA_SIZE +
-    VLIB_BUFFER_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);
@@ -222,7 +237,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;