buffers: major cleanup and improvements

This patch introduces following changes:
- deprecated free lists which are not used and not compatible
  with external buffer managers (i.e. DPDK)
- introduces native support for per-numa buffer pools
- significantly improves performance of buffer alloc and free

Change-Id: I4a8e723ae47056717afd6cac0efe87cb731b5be7
Signed-off-by: Damjan Marion <damarion@cisco.com>

15 files changed, 339 insertions, 684 deletions

diff --git a/src/plugins/avf/avf.h b/src/plugins/avf/avf.h
index 518c7d8329a..b79a22b073f 100644
--- a/src/plugins/avf/avf.h
+++ b/src/plugins/avf/avf.h
@@ -102,6 +102,7 @@ typedef struct
   u32 *bufs;
   u16 n_enqueued;
   u8 int_mode;
+  u8 buffer_pool_index;
 } avf_rxq_t;
 
 typedef struct
diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c
index f73e5d372d2..039a8203edb 100644
--- a/src/plugins/avf/device.c
+++ b/src/plugins/avf/device.c
@@ -229,6 +229,9 @@ avf_rxq_init (vlib_main_t * vm, avf_device_t * ad, u16 qid, u16 rxq_size)
 						   2 * CLIB_CACHE_LINE_BYTES,
 						   ad->numa_node);
 
+  rxq->buffer_pool_index =
+    vlib_buffer_pool_get_default_for_numa (vm, ad->numa_node);
+
   if (rxq->descs == 0)
     return vlib_physmem_last_error (vm);
 
@@ -239,7 +242,8 @@ avf_rxq_init (vlib_main_t * vm, avf_device_t * ad, u16 qid, u16 rxq_size)
   vec_validate_aligned (rxq->bufs, rxq->size, CLIB_CACHE_LINE_BYTES);
   rxq->qrx_tail = ad->bar0 + AVF_QRX_TAIL (qid);
 
-  n_alloc = vlib_buffer_alloc (vm, rxq->bufs, rxq->size - 8);
+  n_alloc = vlib_buffer_alloc_from_pool (vm, rxq->bufs, rxq->size - 8,
+					 rxq->buffer_pool_index);
 
   if (n_alloc == 0)
     return clib_error_return (0, "buffer allocation error");
diff --git a/src/plugins/avf/input.c b/src/plugins/avf/input.c
index fc884ce39f6..beb5c052423 100644
--- a/src/plugins/avf/input.c
+++ b/src/plugins/avf/input.c
@@ -72,7 +72,9 @@ avf_rxq_refill (vlib_main_t * vm, vlib_node_runtime_t * node, avf_rxq_t * rxq,
   slot = (rxq->next - n_refill - 1) & mask;
 
   n_refill &= ~7;		/* round to 8 */
-  n_alloc = vlib_buffer_alloc_to_ring (vm, rxq->bufs, slot, size, n_refill);
+  n_alloc =
+    vlib_buffer_alloc_to_ring_from_pool (vm, rxq->bufs, slot, size, n_refill,
+					 rxq->buffer_pool_index);
 
   if (PREDICT_FALSE (n_alloc != n_refill))
     {
@@ -368,6 +370,7 @@ no_more_desc:
 
   vnet_buffer (bt)->sw_if_index[VLIB_RX] = ad->sw_if_index;
   vnet_buffer (bt)->sw_if_index[VLIB_TX] = ~0;
+  bt->buffer_pool_index = rxq->buffer_pool_index;
 
   if (n_tail_desc)
     n_rx_bytes = avf_process_rx_burst (vm, node, ptd, n_rx_packets, 1);
diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index aed194074cc..73310eff95a 100644
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -12,586 +12,378 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * buffer.c: allocate/free network buffers.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file
- *
- * Allocate/free network buffers.
- */
 
 #include <unistd.h>
+#include <errno.h>
 
 #include <rte_config.h>
-
-#include <rte_common.h>
-#include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_tailq.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_launch.h>
-#include <rte_atomic.h>
-#include <rte_cycles.h>
-#include <rte_prefetch.h>
-#include <rte_lcore.h>
-#include <rte_per_lcore.h>
-#include <rte_branch_prediction.h>
-#include <rte_interrupts.h>
-#include <rte_vfio.h>
-#include <rte_random.h>
-#include <rte_debug.h>
-#include <rte_ether.h>
-#include <rte_ethdev.h>
-#include <rte_ring.h>
-#include <rte_mempool.h>
 #include <rte_mbuf.h>
-#include <rte_version.h>
+#include <rte_ethdev.h>
+#include <rte_vfio.h>
 
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/vnet.h>
-#include <dpdk/device/dpdk.h>
-#include <dpdk/device/dpdk_priv.h>
 #include <dpdk/buffer.h>
 
 STATIC_ASSERT (VLIB_BUFFER_PRE_DATA_SIZE == RTE_PKTMBUF_HEADROOM,
 	       "VLIB_BUFFER_PRE_DATA_SIZE must be equal to RTE_PKTMBUF_HEADROOM");
 
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  struct rte_mbuf **mbuf_alloc_list;
-} dpdk_buffer_per_thread_data;
 
 typedef struct
 {
-  int vfio_container_fd;
-  dpdk_buffer_per_thread_data *ptd;
-} dpdk_buffer_main_t;
-
-dpdk_buffer_main_t dpdk_buffer_main;
-
-static_always_inline void
-dpdk_rte_pktmbuf_free (vlib_main_t * vm, u32 thread_index, vlib_buffer_t * b,
-		       int maybe_next)
-{
-  struct rte_mbuf *mb;
-  u32 next, flags;
+  /* must be first */
+  struct rte_pktmbuf_pool_private mbp_priv;
+  u8 buffer_pool_index;
+} dpdk_mempool_private_t;
 
-next:
-  flags = b->flags;
-  next = b->next_buffer;
-  mb = rte_mbuf_from_vlib_buffer (b);
-
-  if (PREDICT_FALSE (b->n_add_refs))
-    {
-      rte_mbuf_refcnt_update (mb, b->n_add_refs);
-      b->n_add_refs = 0;
-    }
-
-  if ((mb = rte_pktmbuf_prefree_seg (mb)))
-    rte_mempool_put (mb->pool, mb);
-
-  if (maybe_next && (flags & VLIB_BUFFER_NEXT_PRESENT))
-    {
-      b = vlib_get_buffer (vm, next);
-      goto next;
-    }
-}
+#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;
 
-/* Make sure free list has at least given number of free buffers. */
-uword
-CLIB_MULTIARCH_FN (dpdk_buffer_fill_free_list) (vlib_main_t * vm,
-						vlib_buffer_free_list_t * fl,
-						uword min_free_buffers)
+clib_error_t *
+dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
 {
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_buffer_main_t *dbm = &dpdk_buffer_main;
-  struct rte_mbuf **mb;
-  uword n_left, first;
-  word n_alloc;
-  unsigned socket_id = rte_socket_id ();
-  u32 thread_index = vlib_get_thread_index ();
-  dpdk_buffer_per_thread_data *d = vec_elt_at_index (dbm->ptd, thread_index);
-  struct rte_mempool *rmp = dm->pktmbuf_pools[socket_id];
-  dpdk_mempool_private_t *privp = rte_mempool_get_priv (rmp);
-  vlib_buffer_t bt;
+  struct rte_mempool *mp, *nmp;
+  dpdk_mempool_private_t priv;
+  enum rte_iova_mode iova_mode;
   u32 *bi;
+  u8 *name = 0;
 
-  /* Too early? */
-  if (PREDICT_FALSE (rmp == 0))
-    return 0;
-
-  /* Already have enough free buffers on free list? */
-  n_alloc = min_free_buffers - vec_len (fl->buffers);
-  if (n_alloc <= 0)
-    return min_free_buffers;
-
-  /* Always allocate round number of buffers. */
-  n_alloc = round_pow2 (n_alloc, CLIB_CACHE_LINE_BYTES / sizeof (u32));
+  u32 elt_size =
+    sizeof (struct rte_mbuf) + sizeof (vlib_buffer_t) + bp->data_size;
 
-  /* Always allocate new buffers in reasonably large sized chunks. */
-  n_alloc = clib_max (n_alloc, fl->min_n_buffers_each_alloc);
-
-  vec_validate_aligned (d->mbuf_alloc_list, n_alloc - 1,
+  /* create empty mempools */
+  vec_validate_aligned (dpdk_mempool_by_buffer_pool_index, bp->index,
+			CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (dpdk_no_cache_mempool_by_buffer_pool_index, bp->index,
 			CLIB_CACHE_LINE_BYTES);
 
-  if (rte_mempool_get_bulk (rmp, (void *) d->mbuf_alloc_list, n_alloc) < 0)
-    return 0;
+  /* normal mempool */
+  name = format (name, "vpp pool %u%c", bp->index, 0);
+  mp = rte_mempool_create_empty ((char *) name, vec_len (bp->buffers),
+				 elt_size, 512, sizeof (priv),
+				 bp->numa_node, 0);
+  vec_reset_length (name);
 
-  clib_memset (&bt, 0, sizeof (vlib_buffer_t));
-  bt.buffer_pool_index = privp->buffer_pool_index;
+  /* non-cached mempool */
+  name = format (name, "vpp pool %u (no cache)%c", bp->index, 0);
+  nmp = rte_mempool_create_empty ((char *) name, vec_len (bp->buffers),
+				  elt_size, 0, sizeof (priv),
+				  bp->numa_node, 0);
+  vec_free (name);
 
-  _vec_len (d->mbuf_alloc_list) = n_alloc;
+  dpdk_mempool_by_buffer_pool_index[bp->index] = mp;
+  dpdk_no_cache_mempool_by_buffer_pool_index[bp->index] = nmp;
 
-  first = vec_len (fl->buffers);
-  vec_resize_aligned (fl->buffers, n_alloc, CLIB_CACHE_LINE_BYTES);
+  rte_mempool_set_ops_byname (mp, "vpp", NULL);
+  rte_mempool_set_ops_byname (nmp, "vpp-no-cache", NULL);
 
-  n_left = n_alloc;
-  mb = d->mbuf_alloc_list;
-  bi = fl->buffers + first;
+  /* 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;
+  rte_pktmbuf_pool_init (mp, &priv);
+  rte_pktmbuf_pool_init (nmp, &priv);
 
-  ASSERT (n_left % 8 == 0);
+  iova_mode = rte_eal_iova_mode ();
 
-  while (n_left >= 8)
+  /* populate mempool object buffer header */
+  vec_foreach (bi, bp->buffers)
+  {
+    struct rte_mempool_objhdr *hdr;
+    vlib_buffer_t *b = vlib_get_buffer (vm, *bi);
+    struct rte_mbuf *mb = rte_mbuf_from_vlib_buffer (b);
+    hdr = (struct rte_mempool_objhdr *) RTE_PTR_SUB (mb, sizeof (*hdr));
+    hdr->mp = mp;
+    hdr->iova = (iova_mode == RTE_IOVA_VA) ?
+      pointer_to_uword (mb) : vlib_physmem_get_pa (vm, mb);
+    STAILQ_INSERT_TAIL (&mp->elt_list, hdr, next);
+    STAILQ_INSERT_TAIL (&nmp->elt_list, hdr, next);
+    mp->populated_size++;
+    nmp->populated_size++;
+  }
+
+  /* call the object initializers */
+  rte_mempool_obj_iter (mp, rte_pktmbuf_init, 0);
+
+  /* map DMA pages if at least one physical device exists */
+  if (rte_eth_dev_count_avail ())
     {
-      if (PREDICT_FALSE (n_left < 24))
-	goto no_prefetch;
-
-      vlib_prefetch_buffer_header (vlib_buffer_from_rte_mbuf (mb[16]), STORE);
-      vlib_prefetch_buffer_header (vlib_buffer_from_rte_mbuf (mb[17]), STORE);
-      vlib_prefetch_buffer_header (vlib_buffer_from_rte_mbuf (mb[18]), STORE);
-      vlib_prefetch_buffer_header (vlib_buffer_from_rte_mbuf (mb[19]), STORE);
-      vlib_prefetch_buffer_header (vlib_buffer_from_rte_mbuf (mb[20]), STORE);
-      vlib_prefetch_buffer_header (vlib_buffer_from_rte_mbuf (mb[21]), STORE);
-      vlib_prefetch_buffer_header (vlib_buffer_from_rte_mbuf (mb[22]), STORE);
-      vlib_prefetch_buffer_header (vlib_buffer_from_rte_mbuf (mb[23]), STORE);
-
-    no_prefetch:
-      vlib_get_buffer_indices_with_offset (vm, (void **) mb, bi, 8,
-					   sizeof (struct rte_mbuf));
+      uword i;
+      size_t page_sz;
+      vlib_physmem_map_t *pm;
 
-      vlib_buffer_copy_template (vlib_buffer_from_rte_mbuf (mb[0]), &bt);
-      vlib_buffer_copy_template (vlib_buffer_from_rte_mbuf (mb[1]), &bt);
-      vlib_buffer_copy_template (vlib_buffer_from_rte_mbuf (mb[2]), &bt);
-      vlib_buffer_copy_template (vlib_buffer_from_rte_mbuf (mb[3]), &bt);
-      vlib_buffer_copy_template (vlib_buffer_from_rte_mbuf (mb[4]), &bt);
-      vlib_buffer_copy_template (vlib_buffer_from_rte_mbuf (mb[5]), &bt);
-      vlib_buffer_copy_template (vlib_buffer_from_rte_mbuf (mb[6]), &bt);
-      vlib_buffer_copy_template (vlib_buffer_from_rte_mbuf (mb[7]), &bt);
-
-      n_left -= 8;
-      mb += 8;
-      bi += 8;
-    }
+      pm = vlib_physmem_get_map (vm, bp->physmem_map_index);
+      page_sz = 1ULL << pm->log2_page_size;
 
-  if (fl->buffer_init_function)
-    fl->buffer_init_function (vm, fl, fl->buffers + first, n_alloc);
+      for (i = 0; i < pm->n_pages; i++)
+	{
+	  char *va = ((char *) pm->base) + i * page_sz;
+	  uword pa = (iova_mode == RTE_IOVA_VA) ?
+	    pointer_to_uword (va) : pm->page_table[i];
 
-  fl->n_alloc += n_alloc;
+	  if (rte_vfio_dma_map (pointer_to_uword (va), pa, page_sz))
+	    break;
+	}
+    }
 
-  return n_alloc;
+  return 0;
 }
 
-static_always_inline void
-dpdk_prefetch_buffer (vlib_buffer_t * b)
+static int
+dpdk_ops_vpp_alloc (struct rte_mempool *mp)
 {
-  struct rte_mbuf *mb;
-  mb = rte_mbuf_from_vlib_buffer (b);
-  CLIB_PREFETCH (mb, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-  CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
+  clib_warning ("");
+  return 0;
 }
 
-static_always_inline void
-recycle_or_free (vlib_main_t * vm, vlib_buffer_main_t * bm, u32 bi,
-		 vlib_buffer_t * b)
+static void
+dpdk_ops_vpp_free (struct rte_mempool *mp)
 {
-  u32 thread_index = vlib_get_thread_index ();
-
-  dpdk_rte_pktmbuf_free (vm, thread_index, b, 1);
+  clib_warning ("");
 }
 
+#endif
+
 static_always_inline void
-vlib_buffer_free_inline (vlib_main_t * vm,
-			 u32 * buffers, u32 n_buffers, u32 follow_buffer_next)
+dpdk_ops_vpp_enqueue_one (vlib_buffer_t * bt, void *obj)
 {
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_t *bufp[n_buffers], **b = bufp;
-  u32 thread_index = vm->thread_index;
-  int i = 0;
-  u32 simple_mask = VLIB_BUFFER_NEXT_PRESENT;
-  u32 n_left, *bi;
-  u32 (*cb) (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
-	     u32 follow_buffer_next);
-
-  cb = bm->buffer_free_callback;
+  /* Only non-replicated packets (b->ref_count == 1) expected */
 
-  if (PREDICT_FALSE (cb != 0))
-    n_buffers = (*cb) (vm, buffers, n_buffers, follow_buffer_next);
+  struct rte_mbuf *mb = obj;
+  vlib_buffer_t *b = vlib_buffer_from_rte_mbuf (mb);
+  ASSERT (b->ref_count == 1);
+  ASSERT (b->buffer_pool_index == bt->buffer_pool_index);
+  vlib_buffer_copy_template (b, bt);
+}
 
-  if (!n_buffers)
-    return;
+int
+CLIB_MULTIARCH_FN (dpdk_ops_vpp_enqueue) (struct rte_mempool * mp,
+					  void *const *obj_table, unsigned n)
+{
+  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;
+  vlib_buffer_pool_t *bp = vlib_get_buffer_pool (vm, buffer_pool_index);
+  u32 bufs[batch_size];
+  u32 n_left = n;
+  void *const *obj = obj_table;
 
-  n_left = n_buffers;
-  bi = buffers;
-  b = bufp;
-  vlib_get_buffers (vm, bi, b, n_buffers);
+  vlib_buffer_copy_template (&bt, &bp->buffer_template);
 
   while (n_left >= 4)
     {
-      u32 or_flags;
-      vlib_buffer_t **p;
-
-      if (n_left < 16)
-	goto no_prefetch;
-
-      p = b + 12;
-      dpdk_prefetch_buffer (p[0]);
-      dpdk_prefetch_buffer (p[1]);
-      dpdk_prefetch_buffer (p[2]);
-      dpdk_prefetch_buffer (p[3]);
-    no_prefetch:
-
-      for (i = 0; i < 4; i++)
-	VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[i]);
-
-      or_flags = b[0]->flags | b[1]->flags | b[2]->flags | b[3]->flags;
-
-      if (or_flags & simple_mask)
-	{
-	  recycle_or_free (vm, bm, bi[0], b[0]);
-	  recycle_or_free (vm, bm, bi[1], b[1]);
-	  recycle_or_free (vm, bm, bi[2], b[2]);
-	  recycle_or_free (vm, bm, bi[3], b[3]);
-	}
-      else
-	{
-	  dpdk_rte_pktmbuf_free (vm, thread_index, b[0], 0);
-	  dpdk_rte_pktmbuf_free (vm, thread_index, b[1], 0);
-	  dpdk_rte_pktmbuf_free (vm, thread_index, b[2], 0);
-	  dpdk_rte_pktmbuf_free (vm, thread_index, b[3], 0);
-	}
-      bi += 4;
-      b += 4;
+      dpdk_ops_vpp_enqueue_one (&bt, obj[0]);
+      dpdk_ops_vpp_enqueue_one (&bt, obj[1]);
+      dpdk_ops_vpp_enqueue_one (&bt, obj[2]);
+      dpdk_ops_vpp_enqueue_one (&bt, obj[3]);
+      obj += 4;
       n_left -= 4;
     }
+
   while (n_left)
     {
-      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]);
-      recycle_or_free (vm, bm, bi[0], b[0]);
-      bi += 1;
-      b += 1;
+      dpdk_ops_vpp_enqueue_one (&bt, obj[0]);
+      obj += 1;
       n_left -= 1;
     }
-}
-
-void
-CLIB_MULTIARCH_FN (dpdk_buffer_free) (vlib_main_t * vm, u32 * buffers,
-				      u32 n_buffers)
-{
-  vlib_buffer_free_inline (vm, buffers, n_buffers,	/* follow_buffer_next */
-			   1);
-}
-
-void
-CLIB_MULTIARCH_FN (dpdk_buffer_free_no_next) (vlib_main_t * vm, u32 * buffers,
-					      u32 n_buffers)
-{
-  vlib_buffer_free_inline (vm, buffers, n_buffers,	/* follow_buffer_next */
-			   0);
-}
 
-#ifndef CLIB_MARCH_VARIANT
-clib_error_t *
-dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size,
-		  u32 num_elts, u32 pool_priv_size, u16 cache_size, u8 numa,
-		  struct rte_mempool **_mp, u32 * map_index)
-{
-  struct rte_mempool *mp;
-  enum rte_iova_mode iova_mode;
-  dpdk_mempool_private_t priv;
-  vlib_physmem_map_t *pm;
-  clib_error_t *error = 0;
-  size_t min_chunk_size, align;
-  int map_dma = 1;
-  u32 size;
-  i32 ret;
-  uword i;
-
-  mp = rte_mempool_create_empty ((char *) pool_name, num_elts, elt_size,
-				 512, pool_priv_size, numa, 0);
-  if (!mp)
-    return clib_error_return (0, "failed to create %s", pool_name);
-
-  rte_mempool_set_ops_byname (mp, RTE_MBUF_DEFAULT_MEMPOOL_OPS, NULL);
-
-  size = rte_mempool_op_calc_mem_size_default (mp, num_elts, 21,
-					       &min_chunk_size, &align);
-
-  if ((error = vlib_physmem_shared_map_create (vm, (char *) pool_name, size,
-					       0, numa, map_index)))
+  while (n >= batch_size)
     {
-      rte_mempool_free (mp);
-      return error;
+      vlib_get_buffer_indices_with_offset (vm, (void **) obj_table, bufs,
+					   batch_size,
+					   sizeof (struct rte_mbuf));
+      vlib_buffer_pool_put (vm, buffer_pool_index, bufs, batch_size);
+      n -= batch_size;
+      obj_table += batch_size;
     }
-  pm = vlib_physmem_get_map (vm, *map_index);
-
-  /* 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;
-  rte_pktmbuf_pool_init (mp, &priv);
 
-  if (rte_eth_dev_count_avail () == 0)
-    map_dma = 0;
-
-  iova_mode = rte_eal_iova_mode ();
-  for (i = 0; i < pm->n_pages; i++)
+  if (n)
     {
-      size_t page_sz = 1ULL << pm->log2_page_size;
-      char *va = ((char *) pm->base) + i * page_sz;
-      uword pa = iova_mode == RTE_IOVA_VA ?
-	pointer_to_uword (va) : pm->page_table[i];
-      ret = rte_mempool_populate_iova (mp, va, pa, page_sz, 0, 0);
-      if (ret < 0)
-	{
-	  rte_mempool_free (mp);
-	  return clib_error_return (0, "failed to populate %s", pool_name);
-	}
-      /* -1 likely means there is no PCI devices assigned to vfio
-         container or noiommu mode is used  so we stop trying */
-      if (map_dma && rte_vfio_dma_map (pointer_to_uword (va), pa, page_sz))
-	map_dma = 0;
+      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);
     }
 
-  _mp[0] = mp;
-
   return 0;
 }
 
-clib_error_t *
-dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
-			 unsigned socket_id)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  struct rte_mempool *rmp;
-  clib_error_t *error = 0;
-  u8 *pool_name;
-  u32 elt_size, i;
-  u32 map_index;
+CLIB_MARCH_FN_REGISTRATION (dpdk_ops_vpp_enqueue);
 
-  vec_validate_aligned (dm->pktmbuf_pools, socket_id, CLIB_CACHE_LINE_BYTES);
-
-  /* pool already exists, nothing to do */
-  if (dm->pktmbuf_pools[socket_id])
-    return 0;
-
-  pool_name = format (0, "dpdk_mbuf_pool_socket%u%c", socket_id, 0);
-
-  elt_size = sizeof (struct rte_mbuf) +
-    VLIB_BUFFER_HDR_SIZE /* priv size */  +
-    VLIB_BUFFER_PRE_DATA_SIZE + VLIB_BUFFER_DATA_SIZE;	/*data room size */
-
-  error = dpdk_pool_create (vm, pool_name, elt_size, num_mbufs,
-			    sizeof (dpdk_mempool_private_t), 512, socket_id,
-			    &rmp, &map_index);
-
-  vec_free (pool_name);
+static_always_inline void
+dpdk_ops_vpp_enqueue_no_cache_one (vlib_main_t * vm, struct rte_mempool *old,
+				   struct rte_mempool *new, void *obj,
+				   vlib_buffer_t * bt)
+{
+  struct rte_mbuf *mb = obj;
+  vlib_buffer_t *b = vlib_buffer_from_rte_mbuf (mb);
 
-  if (!error)
+  if (clib_atomic_sub_fetch (&b->ref_count, 1) == 0)
     {
-      /* call the object initializers */
-      rte_mempool_obj_iter (rmp, rte_pktmbuf_init, 0);
-
-      dpdk_mempool_private_t *privp = rte_mempool_get_priv (rmp);
-      privp->buffer_pool_index =
-	vlib_buffer_register_physmem_map (vm, map_index);
+      u32 bi = vlib_get_buffer_index (vm, b);
+      mb->pool = new;
+      vlib_buffer_copy_template (b, bt);
+      vlib_buffer_pool_put (vm, bt->buffer_pool_index, &bi, 1);
+      return;
+    }
+}
 
-      dm->pktmbuf_pools[socket_id] = rmp;
+int
+CLIB_MULTIARCH_FN (dpdk_ops_vpp_enqueue_no_cache) (struct rte_mempool * cmp,
+						   void *const *obj_table,
+						   unsigned n)
+{
+  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;
+  vlib_buffer_pool_t *bp = vlib_get_buffer_pool (vm, buffer_pool_index);
+  vlib_buffer_copy_template (&bt, &bp->buffer_template);
 
-      return 0;
+  while (n >= 4)
+    {
+      dpdk_ops_vpp_enqueue_no_cache_one (vm, cmp, mp, obj_table[0], &bt);
+      dpdk_ops_vpp_enqueue_no_cache_one (vm, cmp, mp, obj_table[1], &bt);
+      dpdk_ops_vpp_enqueue_no_cache_one (vm, cmp, mp, obj_table[2], &bt);
+      dpdk_ops_vpp_enqueue_no_cache_one (vm, cmp, mp, obj_table[3], &bt);
+      obj_table += 4;
+      n -= 4;
     }
 
-  clib_error_report (error);
-
-  /* no usable pool for this socket, try to use pool from another one */
-  for (i = 0; i < vec_len (dm->pktmbuf_pools); i++)
+  while (n)
     {
-      if (dm->pktmbuf_pools[i])
-	{
-	  clib_warning ("WARNING: Failed to allocate mempool for CPU socket "
-			"%u. Threads running on socket %u will use socket %u "
-			"mempool.", socket_id, socket_id, i);
-	  dm->pktmbuf_pools[socket_id] = dm->pktmbuf_pools[i];
-	  return 0;
-	}
+      dpdk_ops_vpp_enqueue_no_cache_one (vm, cmp, mp, obj_table[0], &bt);
+      obj_table += 1;
+      n -= 1;
     }
 
-  return clib_error_return (0, "failed to allocate mempool on socket %u",
-			    socket_id);
+  return 0;
 }
 
-#if CLIB_DEBUG > 0
+CLIB_MARCH_FN_REGISTRATION (dpdk_ops_vpp_enqueue_no_cache);
 
-u32 *vlib_buffer_state_validation_lock;
-uword *vlib_buffer_state_validation_hash;
-void *vlib_buffer_state_heap;
-
-static clib_error_t *
-buffer_state_validation_init (vlib_main_t * vm)
+int
+CLIB_MULTIARCH_FN (dpdk_ops_vpp_dequeue) (struct rte_mempool * mp,
+					  void **obj_table, unsigned n)
 {
-  void *oldheap;
-
-  vlib_buffer_state_heap =
-    mheap_alloc_with_lock (0, 10 << 20, 0 /* locked */ );
-  oldheap = clib_mem_set_heap (vlib_buffer_state_heap);
+  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;
+  void **obj = obj_table;
+
+  while (n >= batch_size)
+    {
+      n_alloc = vlib_buffer_alloc_from_pool (vm, bufs, batch_size,
+					     buffer_pool_index);
+      if (n_alloc != batch_size)
+	goto alloc_fail;
+
+      vlib_get_buffers_with_offset (vm, bufs, obj, batch_size,
+				    -(i32) sizeof (struct rte_mbuf));
+      total += batch_size;
+      obj += batch_size;
+      n -= batch_size;
+    }
 
-  vlib_buffer_state_validation_hash = hash_create (0, sizeof (uword));
-  vec_validate_aligned (vlib_buffer_state_validation_lock, 0,
-			CLIB_CACHE_LINE_BYTES);
-  clib_mem_set_heap (oldheap);
-  return 0;
-}
+  if (n)
+    {
+      n_alloc = vlib_buffer_alloc_from_pool (vm, bufs, n, buffer_pool_index);
 
-VLIB_INIT_FUNCTION (buffer_state_validation_init);
-#endif
+      if (n_alloc != n)
+	goto alloc_fail;
 
-#if CLI_DEBUG
-struct dpdk_validate_buf_result
-{
-  u32 invalid;
-  u32 uninitialized;
-};
+      vlib_get_buffers_with_offset (vm, bufs, obj, n,
+				    -(i32) sizeof (struct rte_mbuf));
+    }
 
-#define DPDK_TRAJECTORY_POISON 31
+  return 0;
 
-static void
-dpdk_buffer_validate_trajectory (struct rte_mempool *mp, void *opaque,
-				 void *obj, unsigned obj_idx)
-{
-  vlib_buffer_t *b;
-  struct dpdk_validate_buf_result *counter = opaque;
-  b = vlib_buffer_from_rte_mbuf ((struct rte_mbuf *) obj);
-  if (b->pre_data[0] != 0)
+alloc_fail:
+  /* dpdk doesn't support partial alloc, so we need to return what we
+     already got */
+  if (n_alloc)
+    vlib_buffer_pool_put (vm, buffer_pool_index, bufs, n_alloc);
+  obj = obj_table;
+  while (total)
     {
-      if (b->pre_data[0] == DPDK_TRAJECTORY_POISON)
-	counter->uninitialized++;
-      else
-	counter->invalid++;
+      vlib_get_buffer_indices_with_offset (vm, obj, bufs, batch_size,
+					   sizeof (struct rte_mbuf));
+      vlib_buffer_pool_put (vm, buffer_pool_index, bufs, batch_size);
+
+      obj += batch_size;
+      total -= batch_size;
     }
+  return -ENOENT;
 }
 
-int
-dpdk_buffer_validate_trajectory_all (u32 * uninitialized)
+CLIB_MARCH_FN_REGISTRATION (dpdk_ops_vpp_dequeue);
+
+#ifndef CLIB_MARCH_VARIANT
+
+static int
+dpdk_ops_vpp_dequeue_no_cache (struct rte_mempool *mp, void **obj_table,
+			       unsigned n)
 {
-  dpdk_main_t *dm = &dpdk_main;
-  struct dpdk_validate_buf_result counter = { 0 };
-  int i;
-
-  for (i = 0; i < vec_len (dm->pktmbuf_pools); i++)
-    rte_mempool_obj_iter (dm->pktmbuf_pools[i],
-			  dpdk_buffer_validate_trajectory, &counter);
-  if (uninitialized)
-    *uninitialized = counter.uninitialized;
-  return counter.invalid;
+  clib_error ("bug");
+  return 0;
 }
 
-static void
-dpdk_buffer_poison_trajectory (struct rte_mempool *mp, void *opaque,
-			       void *obj, unsigned obj_idx)
+static unsigned
+dpdk_ops_vpp_get_count (const struct rte_mempool *mp)
 {
-  vlib_buffer_t *b;
-  b = vlib_buffer_from_rte_mbuf ((struct rte_mbuf *) obj);
-  b->pre_data[0] = DPDK_TRAJECTORY_POISON;
+  clib_warning ("");
+  return 0;
 }
 
-void
-dpdk_buffer_poison_trajectory_all (void)
+static unsigned
+dpdk_ops_vpp_get_count_no_cache (const struct rte_mempool *mp)
 {
-  dpdk_main_t *dm = &dpdk_main;
-  int i;
-
-  for (i = 0; i < vec_len (dm->pktmbuf_pools); i++)
-    rte_mempool_obj_iter (dm->pktmbuf_pools[i], dpdk_buffer_poison_trajectory,
-			  0);
+  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];
+  return dpdk_ops_vpp_get_count (cmp);
 }
-#endif
 
-static clib_error_t *
-dpdk_buffer_init (vlib_main_t * vm)
+clib_error_t *
+dpdk_buffer_pools_create (vlib_main_t * vm)
 {
-  dpdk_buffer_main_t *dbm = &dpdk_buffer_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  vec_validate_aligned (dbm->ptd, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  dbm->vfio_container_fd = -1;
-
+  clib_error_t *err;
+  vlib_buffer_pool_t *bp;
+
+  struct rte_mempool_ops ops = { };
+
+  strncpy (ops.name, "vpp", 4);
+  ops.alloc = dpdk_ops_vpp_alloc;
+  ops.free = dpdk_ops_vpp_free;
+  ops.get_count = dpdk_ops_vpp_get_count;
+  ops.enqueue = CLIB_MARCH_FN_POINTER (dpdk_ops_vpp_enqueue);
+  ops.dequeue = CLIB_MARCH_FN_POINTER (dpdk_ops_vpp_dequeue);
+  rte_mempool_register_ops (&ops);
+
+  strncpy (ops.name, "vpp-no-cache", 13);
+  ops.get_count = dpdk_ops_vpp_get_count_no_cache;
+  ops.enqueue = CLIB_MARCH_FN_POINTER (dpdk_ops_vpp_enqueue_no_cache);
+  ops.dequeue = dpdk_ops_vpp_dequeue_no_cache;
+  rte_mempool_register_ops (&ops);
+
+  /* *INDENT-OFF* */
+  vec_foreach (bp, vm->buffer_main->buffer_pools)
+    if (bp->start && (err = dpdk_buffer_pool_init (vm, bp)))
+      return err;
+  /* *INDENT-ON* */
   return 0;
 }
 
-VLIB_INIT_FUNCTION (dpdk_buffer_init);
-
-/* *INDENT-OFF* */
-VLIB_BUFFER_REGISTER_CALLBACKS (dpdk, static) = {
-  .vlib_buffer_fill_free_list_cb = &dpdk_buffer_fill_free_list,
-  .vlib_buffer_free_cb = &dpdk_buffer_free,
-  .vlib_buffer_free_no_next_cb = &dpdk_buffer_free_no_next,
-};
-/* *INDENT-ON* */
-
-#if __x86_64__
-vlib_buffer_fill_free_list_cb_t __clib_weak dpdk_buffer_fill_free_list_avx512;
-vlib_buffer_fill_free_list_cb_t __clib_weak dpdk_buffer_fill_free_list_avx2;
-vlib_buffer_free_cb_t __clib_weak dpdk_buffer_free_avx512;
-vlib_buffer_free_cb_t __clib_weak dpdk_buffer_free_avx2;
-vlib_buffer_free_no_next_cb_t __clib_weak dpdk_buffer_free_no_next_avx512;
-vlib_buffer_free_no_next_cb_t __clib_weak dpdk_buffer_free_no_next_avx2;
-
-static void __clib_constructor
-dpdk_input_multiarch_select (void)
-{
-  vlib_buffer_callbacks_t *cb = &__dpdk_buffer_callbacks;
-  if (dpdk_buffer_fill_free_list_avx512 && clib_cpu_supports_avx512f ())
-    {
-      cb->vlib_buffer_fill_free_list_cb = dpdk_buffer_fill_free_list_avx512;
-      cb->vlib_buffer_free_cb = dpdk_buffer_free_avx512;
-      cb->vlib_buffer_free_no_next_cb = dpdk_buffer_free_no_next_avx512;
-    }
-  else if (dpdk_buffer_fill_free_list_avx2 && clib_cpu_supports_avx2 ())
-    {
-      cb->vlib_buffer_fill_free_list_cb = dpdk_buffer_fill_free_list_avx2;
-      cb->vlib_buffer_free_cb = dpdk_buffer_free_avx2;
-      cb->vlib_buffer_free_no_next_cb = dpdk_buffer_free_no_next_avx2;
-    }
-}
-#endif
+VLIB_BUFFER_SET_EXT_HDR_SIZE (sizeof (struct rte_mempool_objhdr) +
+			      sizeof (struct rte_mbuf));
+
 #endif
 
 /** @endcond */
diff --git a/src/plugins/dpdk/buffer.h b/src/plugins/dpdk/buffer.h
index 56bf4fff3e6..2c2579e9803 100644
--- a/src/plugins/dpdk/buffer.h
+++ b/src/plugins/dpdk/buffer.h
@@ -19,8 +19,10 @@
 #define rte_mbuf_from_vlib_buffer(x) (((struct rte_mbuf *)x) - 1)
 #define vlib_buffer_from_rte_mbuf(x) ((vlib_buffer_t *)(x+1))
 
-clib_error_t *dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
-				       unsigned socket_id);
+extern struct rte_mempool **dpdk_mempool_by_buffer_pool_index;
+extern struct rte_mempool **dpdk_no_cache_mempool_by_buffer_pool_index;
+
+clib_error_t *dpdk_buffer_pools_create (vlib_main_t * vm);
 
 #endif /* include_dpdk_buffer_h */
 
diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c
index bbe367f7ec5..209f4ed51ed 100644
--- a/src/plugins/dpdk/device/cli.c
+++ b/src/plugins/dpdk/device/cli.c
@@ -382,27 +382,27 @@ static clib_error_t *
 show_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input,
 		  vlib_cli_command_t * cmd)
 {
-  struct rte_mempool *rmp;
-  int i;
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_pool_t *bp;
 
-  for (i = 0; i < vec_len (dpdk_main.pktmbuf_pools); i++)
-    {
-      rmp = dpdk_main.pktmbuf_pools[i];
-      if (rmp)
-	{
-	  unsigned count = rte_mempool_avail_count (rmp);
-	  unsigned free_count = rte_mempool_in_use_count (rmp);
+  vec_foreach (bp, bm->buffer_pools)
+  {
+    struct rte_mempool *rmp = dpdk_mempool_by_buffer_pool_index[bp->index];
+    if (rmp)
+      {
+	unsigned count = rte_mempool_avail_count (rmp);
+	unsigned free_count = rte_mempool_in_use_count (rmp);
 
-	  vlib_cli_output (vm,
-			   "name=\"%s\"  available = %7d allocated = %7d total = %7d\n",
-			   rmp->name, (u32) count, (u32) free_count,
-			   (u32) (count + free_count));
-	}
-      else
-	{
-	  vlib_cli_output (vm, "rte_mempool is NULL (!)\n");
-	}
-    }
+	vlib_cli_output (vm,
+			 "name=\"%s\"  available = %7d allocated = %7d total = %7d\n",
+			 rmp->name, (u32) count, (u32) free_count,
+			 (u32) (count + free_count));
+      }
+    else
+      {
+	vlib_cli_output (vm, "rte_mempool is NULL (!)\n");
+      }
+  }
   return 0;
 }
 
@@ -2018,59 +2018,6 @@ VLIB_CLI_COMMAND (show_vpe_version_command, static) = {
 };
 /* *INDENT-ON* */
 
-#if CLI_DEBUG
-
-static clib_error_t *
-dpdk_validate_buffers_fn (vlib_main_t * vm, unformat_input_t * input,
-			  vlib_cli_command_t * cmd_arg)
-{
-  u32 n_invalid_bufs = 0, uninitialized = 0;
-  u32 is_poison = 0, is_test = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "poison"))
-	is_poison = 1;
-      else if (unformat (input, "trajectory"))
-	is_test = 1;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  if (VLIB_BUFFER_TRACE_TRAJECTORY == 0)
-    {
-      vlib_cli_output (vm, "Trajectory not enabled. Recompile with "
-		       "VLIB_BUFFER_TRACE_TRAJECTORY 1");
-      return 0;
-    }
-  if (is_poison)
-    {
-      dpdk_buffer_poison_trajectory_all ();
-    }
-  if (is_test)
-    {
-      n_invalid_bufs = dpdk_buffer_validate_trajectory_all (&uninitialized);
-      if (!n_invalid_bufs)
-	vlib_cli_output (vm, "All buffers are valid %d uninitialized",
-			 uninitialized);
-      else
-	vlib_cli_output (vm, "Found %d invalid buffers and %d uninitialized",
-			 n_invalid_bufs, uninitialized);
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_dpdk_buffers_command, static) =
-{
-  .path = "test dpdk buffers",
-  .short_help = "test dpdk buffers [poison] [trajectory]",
-  .function = dpdk_validate_buffers_fn,
-};
-/* *INDENT-ON* */
-
-#endif
-
 clib_error_t *
 dpdk_cli_init (vlib_main_t * vm)
 {
diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c
index 25d5802899f..b239616b7d9 100644
--- a/src/plugins/dpdk/device/common.c
+++ b/src/plugins/dpdk/device/common.c
@@ -40,6 +40,7 @@ void
 dpdk_device_setup (dpdk_device_t * xd)
 {
   dpdk_main_t *dm = &dpdk_main;
+  vlib_main_t *vm = vlib_get_main ();
   vnet_main_t *vnm = vnet_get_main ();
   vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index);
   vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, xd->hw_if_index);
@@ -116,26 +117,23 @@ dpdk_device_setup (dpdk_device_t * xd)
 			CLIB_CACHE_LINE_BYTES);
   for (j = 0; j < xd->rx_q_used; j++)
     {
-      dpdk_mempool_private_t *privp;
       uword tidx = vnet_get_device_input_thread_index (dm->vnet_main,
 						       xd->hw_if_index, j);
       unsigned lcore = vlib_worker_threads[tidx].cpu_id;
       u16 socket_id = rte_lcore_to_socket_id (lcore);
+      u8 bpidx = vlib_buffer_pool_get_default_for_numa (vm, socket_id);
+      vlib_buffer_pool_t *bp = vlib_get_buffer_pool (vm, bpidx);
+      struct rte_mempool *mp = dpdk_mempool_by_buffer_pool_index[bpidx];
 
-      rv =
-	rte_eth_rx_queue_setup (xd->port_id, j, xd->nb_rx_desc,
-				xd->cpu_socket, 0,
-				dm->pktmbuf_pools[socket_id]);
+      rv = rte_eth_rx_queue_setup (xd->port_id, j, xd->nb_rx_desc,
+				   xd->cpu_socket, 0, mp);
 
       /* retry with any other CPU socket */
       if (rv < 0)
-	rv =
-	  rte_eth_rx_queue_setup (xd->port_id, j,
-				  xd->nb_rx_desc, SOCKET_ID_ANY, 0,
-				  dm->pktmbuf_pools[socket_id]);
+	rv = rte_eth_rx_queue_setup (xd->port_id, j, xd->nb_rx_desc,
+				     SOCKET_ID_ANY, 0, mp);
 
-      privp = rte_mempool_get_priv (dm->pktmbuf_pools[socket_id]);
-      xd->buffer_pool_for_queue[j] = privp->buffer_pool_index;
+      xd->buffer_pool_for_queue[j] = bp->index;
 
       if (rv < 0)
 	dpdk_device_error (xd, "rte_eth_rx_queue_setup", rv);
diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c
index 86b9a50f41b..e3520fc720e 100644
--- a/src/plugins/dpdk/device/device.c
+++ b/src/plugins/dpdk/device/device.c
@@ -127,11 +127,9 @@ dpdk_validate_rte_mbuf (vlib_main_t * vm, vlib_buffer_t * b,
       mb->pkt_len = b->current_length;
       mb->data_off = VLIB_BUFFER_PRE_DATA_SIZE + b->current_data;
       first_mb->nb_segs++;
-      if (PREDICT_FALSE (b->n_add_refs))
-	{
-	  rte_mbuf_refcnt_update (mb, b->n_add_refs);
-	  b->n_add_refs = 0;
-	}
+      if (PREDICT_FALSE (b->ref_count > 1))
+	mb->pool =
+	  dpdk_no_cache_mempool_by_buffer_pool_index[b->buffer_pool_index];
     }
 }
 
diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h
index 425cf265873..14630967ea5 100644
--- a/src/plugins/dpdk/device/dpdk.h
+++ b/src/plugins/dpdk/device/dpdk.h
@@ -56,8 +56,6 @@
 #include <vlib/pci/pci.h>
 #include <vnet/flow/flow.h>
 
-#define NB_MBUF   (16<<10)
-
 extern vnet_device_class_t dpdk_device_class;
 extern vlib_node_registration_t dpdk_input_node;
 extern vlib_node_registration_t admin_up_down_process_node;
@@ -364,7 +362,7 @@ typedef struct
   u8 nchannels_set_manually;
   u32 coremask;
   u32 nchannels;
-  u32 num_mbufs;
+  u32 num_crypto_mbufs;
 
   /*
    * format interface names ala xxxEthernet%d/%d/%d instead of
@@ -443,9 +441,6 @@ typedef struct
   vnet_main_t *vnet_main;
   dpdk_config_main_t *conf;
 
-  /* mempool */
-  struct rte_mempool **pktmbuf_pools;
-
   /* API message ID base */
   u16 msg_id_base;
 
diff --git a/src/plugins/dpdk/device/dpdk_priv.h b/src/plugins/dpdk/device/dpdk_priv.h
index 1956cca19c3..e0e06826935 100644
--- a/src/plugins/dpdk/device/dpdk_priv.h
+++ b/src/plugins/dpdk/device/dpdk_priv.h
@@ -49,14 +49,6 @@ _(file-prefix)                                  \
 _(vdev)                                         \
 _(log-level)
 
-typedef struct
-{
-  /* must be first */
-  struct rte_pktmbuf_pool_private mbp_priv;
-  u8 buffer_pool_index;
-} dpdk_mempool_private_t;
-
-
 static inline void
 dpdk_get_xstats (dpdk_device_t * xd)
 {
diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index dcff0e52293..fa3b691fca4 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -151,60 +151,6 @@ dpdk_device_lock_init (dpdk_device_t * xd)
     }
 }
 
-static struct rte_mempool_ops *
-get_ops_by_name (char *ops_name)
-{
-  u32 i;
-
-  for (i = 0; i < rte_mempool_ops_table.num_ops; i++)
-    {
-      if (!strcmp (ops_name, rte_mempool_ops_table.ops[i].name))
-	return &rte_mempool_ops_table.ops[i];
-    }
-
-  return 0;
-}
-
-static int
-dpdk_ring_alloc (struct rte_mempool *mp)
-{
-  u32 rg_flags = 0, count;
-  i32 ret;
-  char rg_name[RTE_RING_NAMESIZE];
-  struct rte_ring *r;
-
-  ret = snprintf (rg_name, sizeof (rg_name), RTE_MEMPOOL_MZ_FORMAT, mp->name);
-  if (ret < 0 || ret >= (i32) sizeof (rg_name))
-    return -ENAMETOOLONG;
-
-  /* ring flags */
-  if (mp->flags & MEMPOOL_F_SP_PUT)
-    rg_flags |= RING_F_SP_ENQ;
-  if (mp->flags & MEMPOOL_F_SC_GET)
-    rg_flags |= RING_F_SC_DEQ;
-
-  count = rte_align32pow2 (mp->size + 1);
-  /*
-   * Allocate the ring that will be used to store objects.
-   * Ring functions will return appropriate errors if we are
-   * running as a secondary process etc., so no checks made
-   * in this function for that condition.
-   */
-  /* XXX can we get memory from the right socket? */
-  r = clib_mem_alloc_aligned (rte_ring_get_memsize (count),
-			      CLIB_CACHE_LINE_BYTES);
-
-  /* XXX rte_ring_lookup will not work */
-
-  ret = rte_ring_init (r, rg_name, count, rg_flags);
-  if (ret)
-    return ret;
-
-  mp->pool_data = r;
-
-  return 0;
-}
-
 static int
 dpdk_port_crc_strip_enabled (dpdk_device_t * xd)
 {
@@ -220,7 +166,6 @@ dpdk_lib_init (dpdk_main_t * dm)
 {
   u32 nports;
   u32 mtu, max_rx_frame;
-  u32 nb_desc = 0;
   int i;
   clib_error_t *error;
   vlib_main_t *vm = vlib_get_main ();
@@ -631,9 +576,6 @@ dpdk_lib_init (dpdk_main_t * dm)
 	  dq->queue_id = 0;
 	}
 
-      /* count the number of descriptors used for this device */
-      nb_desc += xd->nb_rx_desc + xd->nb_tx_desc * xd->tx_q_used;
-
       error = ethernet_register_interface
 	(dm->vnet_main, dpdk_device_class.index, xd->device_index,
 	 /* ethernet address */ addr,
@@ -811,10 +753,6 @@ dpdk_lib_init (dpdk_main_t * dm)
     }
   /* *INDENT-ON* */
 
-  if (nb_desc > dm->conf->num_mbufs)
-    dpdk_log_err ("%d mbufs allocated but total rx/tx ring size is %d\n",
-		  dm->conf->num_mbufs, nb_desc);
-
   return 0;
 }
 
@@ -1209,7 +1147,8 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
 	}
       else if (unformat (input, "num-mem-channels %d", &conf->nchannels))
 	conf->nchannels_set_manually = 0;
-      else if (unformat (input, "num-mbufs %d", &conf->num_mbufs))
+      else if (unformat (input, "num-crypto-mbufs %d",
+			 &conf->num_crypto_mbufs))
 	;
       else if (unformat (input, "uio-driver %s", &conf->uio_driver_name))
 	;
@@ -1452,36 +1391,10 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
   if (ret < 0)
     return clib_error_return (0, "rte_eal_init returned %d", ret);
 
-  /* set custom ring memory allocator */
-  {
-    struct rte_mempool_ops *ops = NULL;
-
-    ops = get_ops_by_name ("ring_sp_sc");
-    ops->alloc = dpdk_ring_alloc;
-
-    ops = get_ops_by_name ("ring_mp_sc");
-    ops->alloc = dpdk_ring_alloc;
-
-    ops = get_ops_by_name ("ring_sp_mc");
-    ops->alloc = dpdk_ring_alloc;
-
-    ops = get_ops_by_name ("ring_mp_mc");
-    ops->alloc = dpdk_ring_alloc;
-  }
-
   /* main thread 1st */
-  error = dpdk_buffer_pool_create (vm, conf->num_mbufs, rte_socket_id ());
-  if (error)
+  if ((error = dpdk_buffer_pools_create (vm)))
     return error;
 
-  for (i = 0; i < RTE_MAX_LCORE; i++)
-    {
-      error = dpdk_buffer_pool_create (vm, conf->num_mbufs,
-				       rte_lcore_to_socket_id (i));
-      if (error)
-	return error;
-    }
-
 done:
   return error;
 }
@@ -1768,7 +1681,6 @@ dpdk_init (vlib_main_t * vm)
   dm->conf = &dpdk_config_main;
 
   dm->conf->nchannels = 4;
-  dm->conf->num_mbufs = dm->conf->num_mbufs ? dm->conf->num_mbufs : NB_MBUF;
   vec_add1 (dm->conf->eal_init_args, (u8 *) "vnet");
   vec_add1 (dm->conf->eal_init_args, (u8 *) "--in-memory");
 
diff --git a/src/plugins/dpdk/ipsec/ipsec.c b/src/plugins/dpdk/ipsec/ipsec.c
index ade454f22cc..dd64f6db568 100644
--- a/src/plugins/dpdk/ipsec/ipsec.c
+++ b/src/plugins/dpdk/ipsec/ipsec.c
@@ -24,6 +24,7 @@
 dpdk_crypto_main_t dpdk_crypto_main;
 
 #define EMPTY_STRUCT {0}
+#define NUM_CRYPTO_MBUFS 16384
 
 static void
 algos_init (u32 n_mains)
@@ -835,11 +836,12 @@ crypto_create_crypto_op_pool (vlib_main_t * vm, u8 numa)
 
   pool_name = format (0, "crypto_pool_numa%u%c", numa, 0);
 
-  mp =
-    rte_mempool_create ((char *) pool_name,
-			conf->num_mbufs,
-			crypto_op_len (), 512, pool_priv_size, NULL, NULL,
-			crypto_op_init, NULL, numa, 0);
+  if (conf->num_crypto_mbufs == 0)
+    conf->num_crypto_mbufs = NUM_CRYPTO_MBUFS;
+
+  mp = rte_mempool_create ((char *) pool_name, conf->num_crypto_mbufs,
+			   crypto_op_len (), 512, pool_priv_size, NULL, NULL,
+			   crypto_op_init, NULL, numa, 0);
 
   vec_free (pool_name);
 
diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c
index 6e45b573f2c..7f29f4d7f87 100644
--- a/src/plugins/memif/memif.c
+++ b/src/plugins/memif/memif.c
@@ -185,6 +185,7 @@ memif_int_fd_read_ready (clib_file_t * uf)
 clib_error_t *
 memif_connect (memif_if_t * mif)
 {
+  vlib_main_t *vm = vlib_get_main ();
   vnet_main_t *vnm = vnet_get_main ();
   clib_file_t template = { 0 };
   memif_region_t *mr;
@@ -235,6 +236,7 @@ memif_connect (memif_if_t * mif)
   vec_foreach_index (i, mif->rx_queues)
     {
       memif_queue_t *mq = vec_elt_at_index (mif->rx_queues, i);
+      u32 ti;
       int rv;
 
       mq->ring = mif->regions[mq->region].shm + mq->offset;
@@ -254,6 +256,9 @@ memif_connect (memif_if_t * mif)
 	  memif_file_add (&mq->int_clib_file_index, &template);
 	}
       vnet_hw_interface_assign_rx_thread (vnm, mif->hw_if_index, i, ~0);
+      ti = vnet_get_device_input_thread_index (vnm, mif->hw_if_index, i);
+      mq->buffer_pool_index =
+	vlib_buffer_pool_get_default_for_numa (vm, vlib_mains[ti]->numa_node);
       rv = vnet_hw_interface_set_rx_mode (vnm, mif->hw_if_index, i,
 					  VNET_HW_INTERFACE_RX_MODE_DEFAULT);
       if (rv)
diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c
index 490c60356db..347112892be 100644
--- a/src/plugins/memif/node.c
+++ b/src/plugins/memif/node.c
@@ -280,7 +280,8 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
   /* allocate free buffers */
   vec_validate_aligned (ptd->buffers, n_buffers - 1, CLIB_CACHE_LINE_BYTES);
-  n_alloc = vlib_buffer_alloc (vm, ptd->buffers, n_buffers);
+  n_alloc = vlib_buffer_alloc_from_pool (vm, ptd->buffers, n_buffers,
+					 mq->buffer_pool_index);
   if (PREDICT_FALSE (n_alloc != n_buffers))
     {
       if (n_alloc)
@@ -343,6 +344,7 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   vnet_buffer (&ptd->buffer_template)->feature_arc_index = 0;
   ptd->buffer_template.current_data = start_offset;
   ptd->buffer_template.current_config_index = 0;
+  ptd->buffer_template.buffer_pool_index = mq->buffer_pool_index;
 
   if (mode == MEMIF_INTERFACE_MODE_ETHERNET)
     {
@@ -783,8 +785,9 @@ refill:
   clib_memset (dt, 0, sizeof (memif_desc_t));
   dt->length = buffer_length;
 
-  n_alloc = vlib_buffer_alloc_to_ring (vm, mq->buffers, head & mask,
-				       ring_size, n_slots);
+  n_alloc = vlib_buffer_alloc_to_ring_from_pool (vm, mq->buffers, head & mask,
+						 ring_size, n_slots,
+						 mq->buffer_pool_index);
 
   if (PREDICT_FALSE (n_alloc != n_slots))
     {
diff --git a/src/plugins/memif/private.h b/src/plugins/memif/private.h
index a938b85e7da..2aa1f5a0cdc 100644
--- a/src/plugins/memif/private.h
+++ b/src/plugins/memif/private.h
@@ -123,6 +123,7 @@ typedef struct
   u16 last_head;
   u16 last_tail;
   u32 *buffers;
+  u8 buffer_pool_index;
 
   /* interrupts */
   int int_fd;