From patchwork Tue Sep 10 13:25:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Poornima, PallantlaX" X-Patchwork-Id: 59099 X-Patchwork-Delegate: david.marchand@redhat.com 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 E15721EBB6; Tue, 10 Sep 2019 15:26:34 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 64CF51E2B for ; Tue, 10 Sep 2019 15:26:33 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Sep 2019 06:26:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,489,1559545200"; d="scan'208";a="191813920" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by FMSMGA003.fm.intel.com with ESMTP; 10 Sep 2019 06:26:30 -0700 Received: from wgcvswdev001.ir.intel.com (wgcvswdev001.ir.intel.com [10.102.246.100]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x8ADQUuh003102; Tue, 10 Sep 2019 14:26:30 +0100 Received: from wgcvswdev001.ir.intel.com (localhost [127.0.0.1]) by wgcvswdev001.ir.intel.com with ESMTP id x8ADPqgu031477; Tue, 10 Sep 2019 14:25:52 +0100 Received: (from ppoornix@localhost) by wgcvswdev001.ir.intel.com with ? id x8ADPqrs031472; Tue, 10 Sep 2019 14:25:52 +0100 From: Pallantla Poornima To: dev@dpdk.org Cc: reshma.pattan@intel.com, olivier.matz@6wind.com, bruce.richardson@intel.com, david.hunt@intel.com, jananeex.m.parthasarathy@intel.com, Pallantla Poornima Date: Tue, 10 Sep 2019 14:25:27 +0100 Message-Id: <1568121927-31317-1-git-send-email-pallantlax.poornima@intel.com> X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] app/test: add unit test cases to mempool library 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" Added UT in mempool.c to cover below functions: rte_mempool_populate_anon() rte_mempool_memchunk_anon_free() get_anon_size() rte_mempool_mem_iter() Signed-off-by: Pallantla Poornima Acked-by: Olivier Matz --- app/test/test_mempool.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c index 7738c73db..8b20886c8 100644 --- a/app/test/test_mempool.c +++ b/app/test/test_mempool.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "test.h" @@ -453,14 +454,41 @@ walk_cb(struct rte_mempool *mp, void *userdata __rte_unused) printf("\t%s\n", mp->name); } +struct mp_data { + int16_t ret; +}; + +static void +test_mp_mem_init(struct rte_mempool *mp, + __rte_unused void *opaque, + __rte_unused struct rte_mempool_memhdr *memhdr, + __rte_unused unsigned int mem_idx) +{ + struct mp_data *data = opaque; + + if (mp == NULL) { + data->ret = -1; + return; + } + /* nothing to be implemented here*/ + data->ret = 0; +} + static int test_mempool(void) { int ret = -1; + uint32_t nb_objs = 0; + uint32_t nb_mem_chunks = 0; struct rte_mempool *mp_cache = NULL; struct rte_mempool *mp_nocache = NULL; + struct rte_mempool *mp_stack_anon = NULL; + struct rte_mempool *mp_stack_mempool_iter = NULL; struct rte_mempool *mp_stack = NULL; struct rte_mempool *default_pool = NULL; + struct mp_data cb_arg = { + .ret = -1 + }; const char *default_pool_ops = rte_mbuf_best_mempool_ops(); rte_atomic32_init(&synchro); @@ -490,6 +518,50 @@ test_mempool(void) goto err; } + /* create an empty mempool */ + mp_stack_anon = rte_mempool_create_empty("test_stack_anon", + MEMPOOL_SIZE, + MEMPOOL_ELT_SIZE, + RTE_MEMPOOL_CACHE_MAX_SIZE, 0, + SOCKET_ID_ANY, 0); + + if (mp_stack_anon == NULL) + GOTO_ERR(ret, err); + + /* populate an empty mempool */ + ret = rte_mempool_populate_anon(mp_stack_anon); + printf("%s ret = %d\n", __func__, ret); + if (ret < 0) + GOTO_ERR(ret, err); + + /* Try to populate when already populated */ + ret = rte_mempool_populate_anon(mp_stack_anon); + if (ret != 0) + GOTO_ERR(ret, err); + + /* create a mempool */ + mp_stack_mempool_iter = rte_mempool_create("test_iter_obj", + MEMPOOL_SIZE, + MEMPOOL_ELT_SIZE, + RTE_MEMPOOL_CACHE_MAX_SIZE, 0, + NULL, NULL, + my_obj_init, NULL, + SOCKET_ID_ANY, 0); + + if (mp_stack_mempool_iter == NULL) + GOTO_ERR(ret, err); + + /* test to initialize mempool objects and memory */ + nb_objs = rte_mempool_obj_iter(mp_stack_mempool_iter, rte_pktmbuf_init, + NULL); + if (nb_objs == 0) + GOTO_ERR(ret, err); + + nb_mem_chunks = rte_mempool_mem_iter(mp_stack_mempool_iter, + test_mp_mem_init, &cb_arg); + if (nb_mem_chunks == 0 || cb_arg.ret < 0) + GOTO_ERR(ret, err); + /* create a mempool with an external handler */ mp_stack = rte_mempool_create_empty("test_stack", MEMPOOL_SIZE, @@ -585,6 +657,8 @@ test_mempool(void) err: rte_mempool_free(mp_nocache); rte_mempool_free(mp_cache); + rte_mempool_free(mp_stack_anon); + rte_mempool_free(mp_stack_mempool_iter); rte_mempool_free(mp_stack); rte_mempool_free(default_pool);