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 B13C3A0A02 for ; Mon, 17 May 2021 18:13:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB41240041; Mon, 17 May 2021 18:13:53 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 5D90240041 for ; Mon, 17 May 2021 18:13:52 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifsO-0007zX-42; Mon, 17 May 2021 16:13:52 +0000 From: Christian Ehrhardt To: Stanislaw Kardach Cc: Michal Krawczyk , dpdk stable Date: Mon, 17 May 2021 18:08:30 +0200 Message-Id: <20210517161039.3132619-81-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test: proceed if timer subsystem already initialized' 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 05/19/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/b24becd81cf89fe29d286ef6a4e50caab495be7e Thanks. Christian Ehrhardt --- >From b24becd81cf89fe29d286ef6a4e50caab495be7e Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Fri, 26 Mar 2021 11:47:59 +0100 Subject: [PATCH] test: proceed if timer subsystem already initialized [ upstream commit 3dd7d693ff73dac58999ed7ea6b27d0adc8dc6bc ] rte_timer_subsystem_init() may return -EALREADY if the timer subsystem was already initialized. This can happen i.e. in PMD code (see eth_ena_dev_init). This is not an error, rather a notification as the initialization function simply returns without any action taken. Fixes: 50247fe03fe0 ("test/timer: exercise new APIs in secondary process") Signed-off-by: Stanislaw Kardach Reviewed-by: Michal Krawczyk --- app/test/test.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/test/test.c b/app/test/test.c index 4736a17ff3..3e063af333 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -134,8 +134,13 @@ main(int argc, char **argv) goto out; } + argv += ret; + + prgname = argv[0]; + #ifdef RTE_LIBRTE_TIMER - if (rte_timer_subsystem_init() < 0) { + ret = rte_timer_subsystem_init(); + if (ret < 0 && ret != -EALREADY) { ret = -1; goto out; } @@ -146,10 +151,6 @@ main(int argc, char **argv) goto out; } - argv += ret; - - prgname = argv[0]; - recursive_call = getenv(RECURSIVE_ENV_VAR); if (recursive_call != NULL) { ret = do_recursive_call(); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.664849340 +0200 +++ 0081-test-proceed-if-timer-subsystem-already-initialized.patch 2021-05-17 17:40:29.247810073 +0200 @@ -1 +1 @@ -From 3dd7d693ff73dac58999ed7ea6b27d0adc8dc6bc Mon Sep 17 00:00:00 2001 +From b24becd81cf89fe29d286ef6a4e50caab495be7e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3dd7d693ff73dac58999ed7ea6b27d0adc8dc6bc ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 624dd48042..864523ed61 100644 +index 4736a17ff3..3e063af333 100644 @@ -32 +33 @@ - #ifdef RTE_LIB_TIMER + #ifdef RTE_LIBRTE_TIMER