[dpdk-stable] patch 'test: proceed if timer subsystem already initialized' has been queued to stable release 19.11.9

[Christian Ehrhardt]

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 <christian.ehrhardt at canonical.com>

---
>From b24becd81cf89fe29d286ef6a4e50caab495be7e Mon Sep 17 00:00:00 2001
From: Stanislaw Kardach <kda at semihalf.com>
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 <kda at semihalf.com>
Reviewed-by: Michal Krawczyk <mk at semihalf.com>
---
 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 at dpdk.org
@@ -21 +22 @@
-index 624dd48042..864523ed61 100644
+index 4736a17ff3..3e063af333 100644
@@ -32 +33 @@
- #ifdef RTE_LIB_TIMER
+ #ifdef RTE_LIBRTE_TIMER