summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-11-09 18:02:54 +0100
committerFlorin Coras <florin.coras@gmail.com>2017-11-11 01:16:42 +0000
commitc84a82c328c2ab357cd745311134d263b570b149 (patch)
treea3d480ca3eb4e95232602e08421903c499bf505e
parentba3c77364cc8b7dfb136e955458177e1a9a14c98 (diff)
dpdk: optimize buffer alloc/free
This reverts commit 45a588fa3efaaf52360986360ab1f6827bae3164. Change-Id: I7e541545791f7743ee827bdec8b6fc46cbb0938f Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/plugins/dpdk/buffer.c167
1 files changed, 118 insertions, 49 deletions
diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index b3dca95227c..555b1109c19 100644
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -79,6 +79,8 @@
STATIC_ASSERT (VLIB_BUFFER_PRE_DATA_SIZE == RTE_PKTMBUF_HEADROOM,
"VLIB_BUFFER_PRE_DATA_SIZE must be equal to RTE_PKTMBUF_HEADROOM");
+static struct rte_mbuf ***mbuf_pending_free_list = 0;
+
static_always_inline void
dpdk_rte_pktmbuf_free (vlib_main_t * vm, vlib_buffer_t * b)
{
@@ -86,6 +88,8 @@ dpdk_rte_pktmbuf_free (vlib_main_t * vm, vlib_buffer_t * b)
struct rte_mbuf *mb;
u32 next, flags;
mb = rte_mbuf_from_vlib_buffer (hb);
+ static struct rte_mempool *last_pool = 0;
+ static u8 last_buffer_pool_index;
next:
flags = b->flags;
@@ -98,7 +102,20 @@ next:
b->n_add_refs = 0;
}
- rte_pktmbuf_free_seg (mb);
+ mb = rte_pktmbuf_prefree_seg (mb);
+ if (mb)
+ {
+ if (mb->pool != last_pool)
+ {
+ last_pool = mb->pool;
+ dpdk_mempool_private_t *privp = rte_mempool_get_priv (last_pool);
+ last_buffer_pool_index = privp->buffer_pool_index;
+ vec_validate_aligned (mbuf_pending_free_list,
+ last_buffer_pool_index,
+ CLIB_CACHE_LINE_BYTES);
+ }
+ vec_add1 (mbuf_pending_free_list[last_buffer_pool_index], mb);
+ }
if (flags & VLIB_BUFFER_NEXT_PRESENT)
{
@@ -171,7 +188,9 @@ fill_free_list (vlib_main_t * vm,
u32 bi0, bi1, bi2, bi3;
unsigned socket_id = rte_socket_id ();
struct rte_mempool *rmp = dm->pktmbuf_pools[socket_id];
+ dpdk_mempool_private_t *privp = rte_mempool_get_priv (rmp);
struct rte_mbuf *mb0, *mb1, *mb2, *mb3;
+ vlib_buffer_t bt;
/* Too early? */
if (PREDICT_FALSE (rmp == 0))
@@ -193,11 +212,15 @@ fill_free_list (vlib_main_t * vm,
if (rte_mempool_get_bulk (rmp, vm->mbuf_alloc_list, n) < 0)
return 0;
- dpdk_mempool_private_t *privp = rte_mempool_get_priv (rmp);
+ memset (&bt, 0, sizeof (vlib_buffer_t));
+ vlib_buffer_init_for_free_list (&bt, fl);
+ bt.buffer_pool_index = privp->buffer_pool_index;
_vec_len (vm->mbuf_alloc_list) = n;
i = 0;
+ int f = vec_len (fl->buffers);
+ vec_resize_aligned (fl->buffers, n, CLIB_CACHE_LINE_BYTES);
while (i < (n - 7))
{
@@ -225,20 +248,15 @@ fill_free_list (vlib_main_t * vm,
bi2 = vlib_get_buffer_index (vm, b2);
bi3 = vlib_get_buffer_index (vm, b3);
- vec_add1_aligned (fl->buffers, bi0, CLIB_CACHE_LINE_BYTES);
- vec_add1_aligned (fl->buffers, bi1, CLIB_CACHE_LINE_BYTES);
- vec_add1_aligned (fl->buffers, bi2, CLIB_CACHE_LINE_BYTES);
- vec_add1_aligned (fl->buffers, bi3, CLIB_CACHE_LINE_BYTES);
-
- vlib_buffer_init_for_free_list (b0, fl);
- vlib_buffer_init_for_free_list (b1, fl);
- vlib_buffer_init_for_free_list (b2, fl);
- vlib_buffer_init_for_free_list (b3, fl);
+ fl->buffers[f++] = bi0;
+ fl->buffers[f++] = bi1;
+ fl->buffers[f++] = bi2;
+ fl->buffers[f++] = bi3;
- b0->buffer_pool_index = privp->buffer_pool_index;
- b1->buffer_pool_index = privp->buffer_pool_index;
- b2->buffer_pool_index = privp->buffer_pool_index;
- b3->buffer_pool_index = privp->buffer_pool_index;
+ clib_memcpy (b0, &bt, sizeof (vlib_buffer_t));
+ clib_memcpy (b1, &bt, sizeof (vlib_buffer_t));
+ clib_memcpy (b2, &bt, sizeof (vlib_buffer_t));
+ clib_memcpy (b3, &bt, sizeof (vlib_buffer_t));
if (fl->buffer_init_function)
{
@@ -257,10 +275,8 @@ fill_free_list (vlib_main_t * vm,
b0 = vlib_buffer_from_rte_mbuf (mb0);
bi0 = vlib_get_buffer_index (vm, b0);
- vec_add1_aligned (fl->buffers, bi0, CLIB_CACHE_LINE_BYTES);
-
- vlib_buffer_init_for_free_list (b0, fl);
- b0->buffer_pool_index = privp->buffer_pool_index;
+ fl->buffers[f++] = bi0;
+ clib_memcpy (b0, &bt, sizeof (vlib_buffer_t));
if (fl->buffer_init_function)
fl->buffer_init_function (vm, fl, &bi0, 1);
@@ -325,13 +341,55 @@ dpdk_buffer_alloc_from_free_list (vlib_main_t * vm,
}
static_always_inline void
+dpdk_prefetch_buffer_by_index (vlib_main_t * vm, u32 bi)
+{
+ vlib_buffer_t *b;
+ struct rte_mbuf *mb;
+ b = vlib_get_buffer (vm, bi);
+ mb = rte_mbuf_from_vlib_buffer (b);
+ CLIB_PREFETCH (mb, CLIB_CACHE_LINE_BYTES, STORE);
+ CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
+}
+
+static_always_inline void
+recycle_or_free (vlib_main_t * vm, vlib_buffer_main_t * bm, u32 bi,
+ vlib_buffer_t * b)
+{
+ vlib_buffer_free_list_t *fl;
+ u32 fi;
+ fl = vlib_buffer_get_buffer_free_list (vm, b, &fi);
+
+ /* The only current use of this callback: multicast recycle */
+ if (PREDICT_FALSE (fl->buffers_added_to_freelist_function != 0))
+ {
+ int j;
+
+ vlib_buffer_add_to_free_list (vm, fl, bi,
+ (b->flags & VLIB_BUFFER_RECYCLE) == 0);
+
+ for (j = 0; j < vec_len (bm->announce_list); j++)
+ {
+ if (fl == bm->announce_list[j])
+ goto already_announced;
+ }
+ vec_add1 (bm->announce_list, fl);
+ already_announced:
+ ;
+ }
+ else
+ {
+ if (PREDICT_TRUE ((b->flags & VLIB_BUFFER_RECYCLE) == 0))
+ dpdk_rte_pktmbuf_free (vm, b);
+ }
+}
+
+static_always_inline void
vlib_buffer_free_inline (vlib_main_t * vm,
u32 * buffers, u32 n_buffers, u32 follow_buffer_next)
{
vlib_buffer_main_t *bm = vm->buffer_main;
- vlib_buffer_free_list_t *fl;
- u32 fi;
- int i;
+ vlib_buffer_t *b0, *b1, *b2, *b3;
+ int i = 0;
u32 (*cb) (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
u32 follow_buffer_next);
@@ -343,36 +401,36 @@ vlib_buffer_free_inline (vlib_main_t * vm,
if (!n_buffers)
return;
- for (i = 0; i < n_buffers; i++)
+ while (i + 7 < n_buffers)
{
- vlib_buffer_t *b;
+ dpdk_prefetch_buffer_by_index (vm, buffers[i + 4]);
+ dpdk_prefetch_buffer_by_index (vm, buffers[i + 5]);
+ dpdk_prefetch_buffer_by_index (vm, buffers[i + 6]);
+ dpdk_prefetch_buffer_by_index (vm, buffers[i + 7]);
+
+ b0 = vlib_get_buffer (vm, buffers[i]);
+ b1 = vlib_get_buffer (vm, buffers[i + 1]);
+ b2 = vlib_get_buffer (vm, buffers[i + 2]);
+ b3 = vlib_get_buffer (vm, buffers[i + 3]);
+
+ VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+ VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1);
+ VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b2);
+ VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b3);
+
+ recycle_or_free (vm, bm, buffers[i], b0);
+ recycle_or_free (vm, bm, buffers[i + 1], b1);
+ recycle_or_free (vm, bm, buffers[i + 2], b2);
+ recycle_or_free (vm, bm, buffers[i + 3], b3);
- b = vlib_get_buffer (vm, buffers[i]);
+ i += 4;
+ }
+ while (i < n_buffers)
+ {
+ b0 = vlib_get_buffer (vm, buffers[i]);
VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b);
- fl = vlib_buffer_get_buffer_free_list (vm, b, &fi);
-
- /* The only current use of this callback: multicast recycle */
- if (PREDICT_FALSE (fl->buffers_added_to_freelist_function != 0))
- {
- int j;
-
- vlib_buffer_add_to_free_list
- (vm, fl, buffers[i], (b->flags & VLIB_BUFFER_RECYCLE) == 0);
-
- for (j = 0; j < vec_len (bm->announce_list); j++)
- {
- if (fl == bm->announce_list[j])
- goto already_announced;
- }
- vec_add1 (bm->announce_list, fl);
- already_announced:
- ;
- }
- else
- {
- if (PREDICT_TRUE ((b->flags & VLIB_BUFFER_RECYCLE) == 0))
- dpdk_rte_pktmbuf_free (vm, b);
- }
+ recycle_or_free (vm, bm, buffers[i], b0);
+ i++;
}
if (vec_len (bm->announce_list))
{
@@ -384,6 +442,17 @@ vlib_buffer_free_inline (vlib_main_t * vm,
}
_vec_len (bm->announce_list) = 0;
}
+
+ vec_foreach_index (i, mbuf_pending_free_list)
+ {
+ int len = vec_len (mbuf_pending_free_list[i]);
+ if (len)
+ {
+ rte_mempool_put_bulk (mbuf_pending_free_list[i][len - 1]->pool,
+ (void *) mbuf_pending_free_list[i], len);
+ vec_reset_length (mbuf_pending_free_list[i]);
+ }
+ }
}
static void