From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id A016B1E2F; Thu, 3 May 2018 17:57:56 +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 orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2018 08:57:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,359,1520924400"; d="scan'208";a="46515230" Received: from dhunt5-mobl2.ger.corp.intel.com (HELO [10.237.221.55]) ([10.237.221.55]) by FMSMGA003.fm.intel.com with ESMTP; 03 May 2018 08:57:54 -0700 To: "Pattan, Reshma" , "dev@dpdk.org" Cc: "stable@dpdk.org" References: <1525362123-22326-1-git-send-email-reshma.pattan@intel.com> <3AEA2BF9852C6F48A459DA490692831F2A2EAC12@irsmsx110.ger.corp.intel.com> From: "Hunt, David" Message-ID: Date: Thu, 3 May 2018 16:58:54 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <3AEA2BF9852C6F48A459DA490692831F2A2EAC12@irsmsx110.ger.corp.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [dpdk-stable] [PATCH] app/test: fix reorder test failure X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 May 2018 15:57:58 -0000 On 3/5/2018 4:53 PM, Pattan, Reshma wrote: > Hi, > >> -----Original Message----- >> From: Hunt, David >> Sent: Thursday, May 3, 2018 4:50 PM >> To: Pattan, Reshma ; dev@dpdk.org >> Cc: stable@dpdk.org >> Subject: Re: [PATCH] app/test: fix reorder test failure >> >> Hi Reshma, >> >> On 3/5/2018 4:42 PM, Reshma Pattan wrote: >>> Inside test_reorder_insert() >>> rte_mempool_get_bulk() and rte_mempool_put_bulk() are used to allocate >>> and free the mbufs and then rte_reorder_free() is called which again >>> freeing the mbufs using rte_pktmbuf_free(). >>> >>> The mixed use of rte_mempool_put_bulk() and rte_pktmbuf_free() causing >>> duplicate mbufs to be created when rte_mempool_get_bulk() is called >>> next in test_reorder_drain(). >>> >>> Since reorder library is taking care of freeing the mbufs using >>> rte_pktmbuf_free() change UT to allocate mbufs using >>> rte_pktmbuf_alloc(). >>> >>> Do not mix and match the bulk get/put APIs with alloc/free APIs which >>> can cause undefined behavior. >>> >>> Fixes: d0c9b58d71 ("app/test: new reorder unit test") >>> Cc: stable@dpdk.org >>> Cc: david.hunt@intel.com >>> Signed-off-by: Reshma Pattan >>> --- >>> test/test/test_reorder.c | 18 ++++++++---------- >>> 1 file changed, 8 insertions(+), 10 deletions(-) >>> >>> diff --git a/test/test/test_reorder.c b/test/test/test_reorder.c index >>> 65e4f38b2..b79b00961 100644 >>> --- a/test/test/test_reorder.c >>> +++ b/test/test/test_reorder.c >>> @@ -146,11 +146,11 @@ test_reorder_insert(void) >>> b = rte_reorder_create("test_insert", rte_socket_id(), size); >>> TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer"); >>> >>> - ret = rte_mempool_get_bulk(p, (void *)bufs, num_bufs); >>> - TEST_ASSERT_SUCCESS(ret, "Error getting mbuf from pool"); >>> - >>> - for (i = 0; i < num_bufs; i++) >>> + for (i = 0; i < num_bufs; i++) { >>> + bufs[i] = rte_pktmbuf_alloc(p); >>> + TEST_ASSERT_NOT_NULL(bufs[i], "Packet allocation >> failed\n"); >>> bufs[i]->seqn = i; >>> + } >>> >>> /* This should fill up order buffer: >>> * reorder_seq = 0 >>> @@ -202,7 +202,6 @@ test_reorder_insert(void) >>> >>> ret = 0; >>> exit: >>> - rte_mempool_put_bulk(p, (void *)bufs, num_bufs); >>> rte_reorder_free(b); >>> return ret; >>> } >>> @@ -227,9 +226,6 @@ test_reorder_drain(void) >>> b = rte_reorder_create("test_drain", rte_socket_id(), size); >>> TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer"); >>> >>> - ret = rte_mempool_get_bulk(p, (void *)bufs, num_bufs); >>> - TEST_ASSERT_SUCCESS(ret, "Error getting mbuf from pool"); >>> - >>> /* Check no drained packets if reorder is empty */ >>> cnt = rte_reorder_drain(b, robufs, 1); >>> if (cnt != 0) { >>> @@ -239,8 +235,11 @@ test_reorder_drain(void) >>> goto exit; >>> } >>> >>> - for (i = 0; i < num_bufs; i++) >>> + for (i = 0; i < num_bufs; i++) { >>> + bufs[i] = rte_pktmbuf_alloc(p); >>> + TEST_ASSERT_NOT_NULL(bufs[i], "Packet allocation >> failed\n"); >>> bufs[i]->seqn = i; >>> + } >>> >>> /* Insert packet with seqn 1: >>> * reorder_seq = 0 >>> @@ -298,7 +297,6 @@ test_reorder_drain(void) >>> } >>> ret = 0; >>> exit: >>> - rte_mempool_put_bulk(p, (void *)bufs, num_bufs); >>> rte_reorder_free(b); >>> return ret; >>> } >> I have one question. While the rte_reorder_free() takes care of freeing up any >> mbufs that were inserted into the reorder buffer, should there be >> rte_pktmbuf_free() calls for any remaining unused mbufs left in the bufs[] >> array? >> > > Hmm, test teardown has rte_mempool_free() will that not be sufficient to free the pool and hence the mbufs? > That may happen to work today, but it's not very clean, and may cause problems in the future if management of underlying mbuf allocation/free changes. I think would be better to explicitly call free for each mbuf before tearing down the mempool. Rgds, Dave.