From patchwork Fri Oct 11 12:14:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Morten_Br=C3=B8rup?= X-Patchwork-Id: 60963 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9D3C9235; Fri, 11 Oct 2019 14:15:04 +0200 (CEST) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by dpdk.org (Postfix) with ESMTP id 2E8A71EA6E for ; Fri, 11 Oct 2019 14:15:01 +0200 (CEST) Received: from dkrd2.smartsharesys.local ([192.168.4.12]) by smartserver.smartsharesystems.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 11 Oct 2019 14:15:00 +0200 From: =?utf-8?q?Morten_Br=C3=B8rup?= To: dev@dpdk.org Cc: olivier.matz@6wind.com, stephen@networkplumber.org, harry.van.haaren@intel.com, konstantin.ananyev@intel.com, mattias.ronnblom@ericsson.com, bruce.richardson@intel.com, arybchenko@solarflare.com, =?utf-8?q?Morten_Br=C3=B8rup?= Date: Fri, 11 Oct 2019 12:14:57 +0000 Message-Id: <20191011121458.56388-2-mb@smartsharesystems.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011121458.56388-1-mb@smartsharesystems.com> References: <20191011121458.56388-1-mb@smartsharesystems.com> MIME-Version: 1.0 X-OriginalArrivalTime: 11 Oct 2019 12:15:00.0678 (UTC) FILETIME=[8132EE60:01D5802D] Subject: [dpdk-dev] [PATCH v8 1/2] mbuf: add bulk free function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add function for freeing a bulk of mbufs. Signed-off-by: Morten Brørup Acked-by: Konstantin Ananyev Reviewed-by: Andrew Rybchenko Acked-by: Stephen Hemminger Acked-by: Olivier Matz --- v8: * Add unit test, covering both bulk alloc and bulk free. v7: * Squash multiple modifications into one. v6: * Remove __rte_always_inline from static function. The compiler will inline anyway. v5: * Rename variables from "free" to "pending" for improved readability. * Add prefix __ to rte_pktmbuf_free_seg_via_array(). * Add array size parameter to __rte_pktmbuf_free_seg_via_array(). The compiler will optimize the parameter away anyway. * Add description to __rte_pktmbuf_free_seg_via_array(). * Minor description updates. v4: * Mark as experimental by adding __rte_experimental. * Add function to experimental section of map file. * Fix source code formatting regarding pointer to pointer. * Squash multiple modifications into one. v3: * Bugfix: Handle pakets with multiple segments. * Add inline helper function, mainly for readability. * Fix source code formatting regarding indentation. v2: * Function is not inline. * Optimize to free multible mbufs belonging to the same mempool in bulk. Inspired by ixgbe_tx_free_bufs(), but allowing NULL pointers in the array, just like rte_pktmbuf_free() can take a NULL pointer. * Use unsigned int instead of unsigned. Passes checkpatch, but mismatches the original coding style of the modified files. * Fix a typo in the description headline: mempools is plural. --- lib/librte_mbuf/rte_mbuf.c | 66 ++++++++++++++++++++++++++++ lib/librte_mbuf/rte_mbuf.h | 15 +++++++ lib/librte_mbuf/rte_mbuf_version.map | 1 + 3 files changed, 82 insertions(+) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 37718d49c..854af1104 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -245,6 +245,72 @@ int rte_mbuf_check(const struct rte_mbuf *m, int is_header, return 0; } +/** + * @internal helper function for freeing a bulk of packet mbuf segments + * via an array holding the packet mbuf segments from the same mempool + * pending to be freed. + * + * @param m + * The packet mbuf segment to be freed. + * @param pending + * Pointer to the array of packet mbuf segments pending to be freed. + * @param nb_pending + * Pointer to the number of elements held in the array. + * @param pending_sz + * Number of elements the array can hold. + * Note: The compiler should optimize this parameter away when using a + * constant value, such as RTE_PKTMBUF_FREE_PENDING_SZ. + */ +static void +__rte_pktmbuf_free_seg_via_array(struct rte_mbuf *m, + struct rte_mbuf ** const pending, unsigned int * const nb_pending, + const unsigned int pending_sz) +{ + m = rte_pktmbuf_prefree_seg(m); + if (likely(m != NULL)) { + if (*nb_pending == pending_sz || + (*nb_pending > 0 && m->pool != pending[0]->pool)) { + rte_mempool_put_bulk(pending[0]->pool, + (void **)pending, *nb_pending); + *nb_pending = 0; + } + + pending[(*nb_pending)++] = m; + } +} + +/** + * Size of the array holding mbufs from the same membool pending to be freed + * in bulk. + */ +#define RTE_PKTMBUF_FREE_PENDING_SZ 64 + +/* Free a bulk of packet mbufs back into their original mempools. */ +void rte_pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int count) +{ + struct rte_mbuf *m, *m_next, *pending[RTE_PKTMBUF_FREE_PENDING_SZ]; + unsigned int idx, nb_pending = 0; + + for (idx = 0; idx < count; idx++) { + m = mbufs[idx]; + if (unlikely(m == NULL)) + continue; + + __rte_mbuf_sanity_check(m, 1); + + do { + m_next = m->next; + __rte_pktmbuf_free_seg_via_array(m, + pending, &nb_pending, + RTE_PKTMBUF_FREE_PENDING_SZ); + m = m_next; + } while (m != NULL); + } + + if (nb_pending > 0) + rte_mempool_put_bulk(pending[0]->pool, (void **)pending, nb_pending); +} + /* dump a mbuf on console */ void rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 98225ec80..a02c8b12c 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1907,6 +1907,21 @@ static inline void rte_pktmbuf_free(struct rte_mbuf *m) } } +/** + * Free a bulk of packet mbufs back into their original mempools. + * + * Free a bulk of mbufs, and all their segments in case of chained buffers. + * Each segment is added back into its original mempool. + * + * @param mbufs + * Array of pointers to packet mbufs. + * The array may contain NULL pointers. + * @param count + * Array size. + */ +__rte_experimental +void rte_pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int count); + /** * Creates a "clone" of the given packet mbuf. * diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map index 2662a37bf..cd6154ef2 100644 --- a/lib/librte_mbuf/rte_mbuf_version.map +++ b/lib/librte_mbuf/rte_mbuf_version.map @@ -50,4 +50,5 @@ EXPERIMENTAL { global: rte_mbuf_check; + rte_pktmbuf_free_bulk; } DPDK_18.08; From patchwork Fri Oct 11 12:14:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Morten_Br=C3=B8rup?= X-Patchwork-Id: 60964 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3C7A61EAA2; Fri, 11 Oct 2019 14:15:07 +0200 (CEST) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by dpdk.org (Postfix) with ESMTP id D449D1EA6A for ; Fri, 11 Oct 2019 14:15:01 +0200 (CEST) Received: from dkrd2.smartsharesys.local ([192.168.4.12]) by smartserver.smartsharesystems.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 11 Oct 2019 14:15:01 +0200 From: =?utf-8?q?Morten_Br=C3=B8rup?= To: dev@dpdk.org Cc: olivier.matz@6wind.com, stephen@networkplumber.org, harry.van.haaren@intel.com, konstantin.ananyev@intel.com, mattias.ronnblom@ericsson.com, bruce.richardson@intel.com, arybchenko@solarflare.com, =?utf-8?q?Morten_Br=C3=B8rup?= Date: Fri, 11 Oct 2019 12:14:58 +0000 Message-Id: <20191011121458.56388-3-mb@smartsharesystems.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011121458.56388-1-mb@smartsharesystems.com> References: <20191011121458.56388-1-mb@smartsharesystems.com> MIME-Version: 1.0 X-OriginalArrivalTime: 11 Oct 2019 12:15:01.0522 (UTC) FILETIME=[81B3B720:01D5802D] Subject: [dpdk-dev] [PATCH v8 2/2] mbuf: add unit test for bulk alloc/free functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add unit test for functions for allocating and freeing a bulk of mbufs. Signed-off-by: Morten Brørup --- app/test/test_mbuf.c | 171 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 2a97afe20..fbce0ca7c 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -545,6 +546,170 @@ test_pktmbuf_pool(struct rte_mempool *pktmbuf_pool) return ret; } +/* + * test bulk allocation and bulk free of mbufs + */ +static int +test_pktmbuf_pool_bulk(void) +{ + struct rte_mempool *pool = NULL; + struct rte_mempool *pool2 = NULL; + unsigned int i; + struct rte_mbuf *m; + struct rte_mbuf *mbufs[NB_MBUF]; + int ret = 0; + + /* We cannot use the preallocated mbuf pools because their caches + * prevent us from bulk allocating all objects in them. + * So we create our own mbuf pools without caches. + */ + printf("Create mbuf pools for bulk allocation.\n"); + pool = rte_pktmbuf_pool_create("test_pktmbuf_bulk", + NB_MBUF, 0, 0, MBUF_DATA_SIZE, SOCKET_ID_ANY); + if (pool == NULL) { + printf("rte_pktmbuf_pool_create() failed. rte_errno %d\n", + rte_errno); + goto err; + } + pool2 = rte_pktmbuf_pool_create("test_pktmbuf_bulk2", + NB_MBUF, 0, 0, MBUF_DATA_SIZE, SOCKET_ID_ANY); + if (pool2 == NULL) { + printf("rte_pktmbuf_pool_create() failed. rte_errno %d\n", + rte_errno); + goto err; + } + + /* Preconditions: Mempools must be full. */ + if (!(rte_mempool_full(pool) && rte_mempool_full(pool2))) { + printf("Test precondition failed: mempools not full\n"); + goto err; + } + if (!(rte_mempool_avail_count(pool) == NB_MBUF && + rte_mempool_avail_count(pool2) == NB_MBUF)) { + printf("Test precondition failed: mempools: %u+%u != %u+%u", + rte_mempool_avail_count(pool), + rte_mempool_avail_count(pool2), + NB_MBUF, NB_MBUF); + goto err; + } + + printf("Test single bulk alloc, followed by multiple bulk free.\n"); + + /* Bulk allocate all mbufs in the pool, in one go. */ + ret = rte_pktmbuf_alloc_bulk(pool, mbufs, NB_MBUF); + if (ret != 0) { + printf("rte_pktmbuf_alloc_bulk() failed: %d\n", ret); + goto err; + } + /* Test that they have been removed from the pool. */ + if (!rte_mempool_empty(pool)) { + printf("mempool not empty\n"); + goto err; + } + /* Bulk free all mbufs, in four steps. */ + for (i = 0; i < NB_MBUF; i += NB_MBUF / 4) { + rte_pktmbuf_free_bulk(&mbufs[i], NB_MBUF / 4); + /* Test that they have been returned to the pool. */ + if (rte_mempool_avail_count(pool) != i + NB_MBUF / 4) { + printf("mempool avail count incorrect\n"); + goto err; + } + } + + printf("Test multiple bulk alloc, followed by single bulk free.\n"); + + /* Bulk allocate all mbufs in the pool, in four steps. */ + for (i = 0; i < NB_MBUF; i += NB_MBUF / 4) { + ret = rte_pktmbuf_alloc_bulk(pool, &mbufs[i], NB_MBUF / 4); + if (ret != 0) { + printf("rte_pktmbuf_alloc_bulk() failed: %d\n", ret); + goto err; + } + } + /* Test that they have been removed from the pool. */ + if (!rte_mempool_empty(pool)) { + printf("mempool not empty\n"); + goto err; + } + /* Bulk free all mbufs, in one go. */ + rte_pktmbuf_free_bulk(mbufs, NB_MBUF); + /* Test that they have been returned to the pool. */ + if (!rte_mempool_full(pool)) { + printf("mempool not full\n"); + goto err; + } + + printf("Test bulk free of single long chain.\n"); + + /* Bulk allocate all mbufs in the pool, in one go. */ + ret = rte_pktmbuf_alloc_bulk(pool, mbufs, NB_MBUF); + if (ret != 0) { + printf("rte_pktmbuf_alloc_bulk() failed: %d\n", ret); + goto err; + } + /* Create a long mbuf chain. */ + for (i = 1; i < NB_MBUF; i++) { + ret = rte_pktmbuf_chain(mbufs[0], mbufs[i]); + if (ret != 0) { + printf("rte_pktmbuf_chain() failed: %d\n", ret); + goto err; + } + mbufs[i] = NULL; + } + /* Free the mbuf chain containing all the mbufs. */ + rte_pktmbuf_free_bulk(mbufs, 1); + /* Test that they have been returned to the pool. */ + if (!rte_mempool_full(pool)) { + printf("mempool not full\n"); + goto err; + } + + printf("Test bulk free of multiple chains using multiple pools.\n"); + + /* Create mbuf chains containing mbufs from different pools. */ + for (i = 0; i < NB_MBUF * 2; i++) { + m = rte_pktmbuf_alloc((i & 4) ? pool2 : pool); + if (m == NULL) { + printf("rte_pktmbuf_alloc() failed (%u)\n", i); + goto err; + } + if ((i % 16) == 0) { + mbufs[i / 16] = m; + } else { + rte_pktmbuf_chain(mbufs[i / 16], m); + } + } + /* Test that both pools have been emptied. */ + if (!(rte_mempool_empty(pool) && rte_mempool_empty(pool2))) { + printf("mempools not empty\n"); + goto err; + } + /* Free one mbuf chain. */ + rte_pktmbuf_free_bulk(mbufs, 1); + /* Test that the segments have been returned to the pools. */ + if (!(rte_mempool_avail_count(pool) == 8 && + rte_mempool_avail_count(pool2) == 8)) { + printf("all segments of first mbuf have not been returned\n"); + goto err; + } + /* Free the remaining mbuf chains. */ + rte_pktmbuf_free_bulk(&mbufs[1], NB_MBUF * 2 / 16 - 1); + /* Test that they have been returned to the pools. */ + if (!(rte_mempool_full(pool) && rte_mempool_full(pool2))) { + printf("mempools not full\n"); + goto err; + } + + rte_mempool_free(pool); + rte_mempool_free(pool2); + return 0; + +err: + rte_mempool_free(pool); + rte_mempool_free(pool2); + return -1; +} + /* * test that the pointer to the data on a packet mbuf is set properly */ @@ -1162,6 +1327,12 @@ test_mbuf(void) goto err; } + /* test bulk mbuf alloc and free */ + if (test_pktmbuf_pool_bulk() < 0) { + printf("test_pktmbuf_pool_bulk() failed\n"); + goto err; + } + /* test that the pointer to the data on a packet mbuf is set properly */ if (test_pktmbuf_pool_ptr(pktmbuf_pool) < 0) { printf("test_pktmbuf_pool_ptr() failed\n");