From 00728233606d798151e7ecc1a4c30deb0f24b875 Mon Sep 17 00:00:00 2001 From: paul luse Date: Wed, 21 Aug 2019 16:57:19 -0400 Subject: [PATCH] ut/compress: fix memory leak Present since the refactoring on driver init function. Change-Id: I5b2877f4278b62a9efa53395f6910ef199f2c100 Signed-off-by: paul luse Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465981 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- test/unit/lib/bdev/compress.c/compress_ut.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/test/unit/lib/bdev/compress.c/compress_ut.c b/test/unit/lib/bdev/compress.c/compress_ut.c index 0d60bc801..a7c423f2f 100644 --- a/test/unit/lib/bdev/compress.c/compress_ut.c +++ b/test/unit/lib/bdev/compress.c/compress_ut.c @@ -417,10 +417,6 @@ rte_compressdev_enqueue_burst(uint8_t dev_id, uint16_t qp_id, struct rte_comp_op static int test_setup(void) { - g_mbuf_mp = rte_pktmbuf_pool_create("mbuf_mp", NUM_MBUFS, POOL_CACHE_SIZE, - sizeof(struct rte_mbuf), 0, rte_socket_id()); - assert(g_mbuf_mp != NULL); - g_comp_bdev.backing_dev.unmap = _comp_reduce_unmap; g_comp_bdev.backing_dev.readv = _comp_reduce_readv; g_comp_bdev.backing_dev.writev = _comp_reduce_writev; @@ -489,7 +485,6 @@ test_setup(void) static int test_cleanup(void) { - spdk_mempool_free((struct spdk_mempool *)g_mbuf_mp); free(g_dst_mbufs[0]); free(g_src_mbufs[0]); free(g_dst_mbufs[1]); @@ -735,10 +730,6 @@ static void test_initdrivers(void) { int rc; - static struct rte_mempool *orig_mbuf_mp; - - orig_mbuf_mp = g_mbuf_mp; - g_mbuf_mp = NULL; /* test return values from rte_vdev_init() */ MOCK_SET(rte_eal_get_configuration, g_test_config); @@ -751,6 +742,7 @@ test_initdrivers(void) MOCK_SET(rte_vdev_init, 0); rc = vbdev_init_compress_drivers(); CU_ASSERT(rc == 0); + spdk_mempool_free((struct spdk_mempool *)g_mbuf_mp); /* error */ MOCK_SET(rte_vdev_init, -2); @@ -817,8 +809,6 @@ test_initdrivers(void) ut_rte_compressdev_private_xform_create = 0; rc = vbdev_init_compress_drivers(); CU_ASSERT(rc == 0); - - g_mbuf_mp = orig_mbuf_mp; } static void