From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D0EB1A0C45 for ; Thu, 10 Jun 2021 14:07:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA041410FB; Thu, 10 Jun 2021 14:07:02 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id E267D4069B for ; Thu, 10 Jun 2021 14:07:01 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJSc-0008PG-Fw; Thu, 10 Jun 2021 12:06:58 +0000 From: Christian Ehrhardt To: "Min Hu (Connor)" Cc: Erik Gabriel Carrillo , dpdk stable Date: Thu, 10 Jun 2021 14:05:55 +0200 Message-Id: <20210610120641.885862-7-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/timer: check memzone allocation' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/5f49a5b80a2a1d8f7e65af66d477979c711df8cd Thanks. Christian Ehrhardt --- >From 5f49a5b80a2a1d8f7e65af66d477979c711df8cd Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Tue, 4 May 2021 09:07:49 +0800 Subject: [PATCH] test/timer: check memzone allocation [ upstream commit fb9b862e7c0ddee29df36feb8dd0cbcd2762db25 ] Segmentation fault may occur without checking if memzone reserves succeed or not. Fixes: 50247fe03fe0 ("test/timer: exercise new APIs in secondary process") Signed-off-by: Min Hu (Connor) Acked-by: Erik Gabriel Carrillo --- app/test/test_timer_secondary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/test/test_timer_secondary.c b/app/test/test_timer_secondary.c index 790f180521..a4033b6a5d 100644 --- a/app/test/test_timer_secondary.c +++ b/app/test/test_timer_secondary.c @@ -126,9 +126,9 @@ test_timer_secondary(void) mz = rte_memzone_reserve(TEST_INFO_MZ_NAME, sizeof(*test_info), SOCKET_ID_ANY, 0); - test_info = mz->addr; - TEST_ASSERT_NOT_NULL(test_info, "Couldn't allocate memory for " + TEST_ASSERT_NOT_NULL(mz, "Couldn't allocate memory for " "test data"); + test_info = mz->addr; test_info->tim_mempool = rte_mempool_create("test_timer_mp", NUM_TIMERS, sizeof(struct rte_timer), 0, 0, @@ -172,9 +172,9 @@ test_timer_secondary(void) int i; mz = rte_memzone_lookup(TEST_INFO_MZ_NAME); - test_info = mz->addr; - TEST_ASSERT_NOT_NULL(test_info, "Couldn't lookup memzone for " + TEST_ASSERT_NOT_NULL(mz, "Couldn't lookup memzone for " "test info"); + test_info = mz->addr; for (i = 0; i < NUM_TIMERS; i++) { rte_mempool_get(test_info->tim_mempool, (void **)&tim); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:58.426015296 +0200 +++ 0007-test-timer-check-memzone-allocation.patch 2021-06-10 14:04:58.010024228 +0200 @@ -1 +1 @@ -From fb9b862e7c0ddee29df36feb8dd0cbcd2762db25 Mon Sep 17 00:00:00 2001 +From 5f49a5b80a2a1d8f7e65af66d477979c711df8cd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fb9b862e7c0ddee29df36feb8dd0cbcd2762db25 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 1e8f1d4549..16a9f1878b 100644 +index 790f180521..a4033b6a5d 100644 @@ -22 +23 @@ -@@ -125,9 +125,9 @@ test_timer_secondary(void) +@@ -126,9 +126,9 @@ test_timer_secondary(void) @@ -34 +35 @@ -@@ -171,9 +171,9 @@ test_timer_secondary(void) +@@ -172,9 +172,9 @@ test_timer_secondary(void)