[dpdk-stable] patch 'service: fix core mapping reset' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/20. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/369c28238f9bd69e530f527217cb502e3fd11916

Thanks.

Kevin.

---
>From 369c28238f9bd69e530f527217cb502e3fd11916 Mon Sep 17 00:00:00 2001
From: Lukasz Wojciechowski <l.wojciechow at partner.samsung.com>
Date: Wed, 8 Jul 2020 15:37:33 +0200
Subject: [PATCH] service: fix core mapping reset

[ upstream commit 048db4b6dcccaee9277ce5b4fbb2fe684b212e22 ]

The rte_service_lcore_reset_all function stops execution of services
on all lcores and switches them back from ROLE_SERVICE to ROLE_RTE.
However the thread loop for slave lcores (eal_thread_loop) distincts these
roles to set lcore state after processing delegated function.
It sets WAIT state for ROLE_SERVICE, but FINISHED for ROLE_RTE.
So changing the role to RTE before stopping work in slave lcores
causes lcores to end in FINISHED state. That is why the rte_eal_lcore_wait
must be run after rte_service_lcore_reset_all to bring back lcores to
launchable (WAIT) state.
This has been fixed in test app and clarified in API documentation.

Setting the state to WAIT in rte_service_runner_func is premature
as the rte_service_runner_func function is still a part of the lcore
function delegated to slave lcore. The state is overwritten anyway in
slave lcore thread loop. This premature setting state to WAIT might
however cause rte_eal_lcore_wait, that was called by the application,
to return before slave lcore thread set the FINISHED state. That's
why it is removed from librte_eal rte_service_runner_func function.

Bugzilla ID: 464
Fixes: 21698354c832 ("service: introduce service cores concept")
Fixes: f038a81e1c56 ("service: add unit tests")

Reported-by: Sarosh Arif <sarosh.arif at emumba.com>
Signed-off-by: Lukasz Wojciechowski <l.wojciechow at partner.samsung.com>
Acked-by: Harry van Haaren <harry.van.haaren at intel.com>
---
 lib/librte_eal/common/include/rte_service.h | 4 ++++
 lib/librte_eal/common/rte_service.c         | 2 --
 test/test/test_service_cores.c              | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h
index 21002209bc..200e028778 100644
--- a/lib/librte_eal/common/include/rte_service.h
+++ b/lib/librte_eal/common/include/rte_service.h
@@ -308,4 +308,8 @@ int32_t rte_service_lcore_count(void);
  * The runstate of services is not modified.
  *
+ * The cores that are stopped with this call, are in FINISHED state and
+ * the application must take care of bringing them back to a launchable state:
+ * e.g. call *rte_eal_lcore_wait* on the lcore_id.
+ *
  * @retval 0 Success
  */
diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
index 607f9a0407..af1733eb09 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -447,6 +447,4 @@ service_runner_func(void *arg)
 	}
 
-	lcore_config[lcore].state = WAIT;
-
 	return 0;
 }
diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c
index aa2174a332..c5150b6378 100644
--- a/test/test/test_service_cores.c
+++ b/test/test/test_service_cores.c
@@ -115,4 +115,5 @@ unregister_all(void)
 
 	rte_service_lcore_reset_all();
+	rte_eal_mp_wait_lcore();
 
 	return TEST_SUCCESS;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.264728042 +0100
+++ 0010-service-fix-core-mapping-reset.patch	2020-08-20 16:26:15.778323907 +0100
@@ -1 +1 @@
-From 048db4b6dcccaee9277ce5b4fbb2fe684b212e22 Mon Sep 17 00:00:00 2001
+From 369c28238f9bd69e530f527217cb502e3fd11916 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 048db4b6dcccaee9277ce5b4fbb2fe684b212e22 ]
+
@@ -28 +29,0 @@
-Cc: stable at dpdk.org
@@ -34,3 +35,3 @@
- app/test/test_service_cores.c        | 1 +
- lib/librte_eal/common/rte_service.c  | 2 --
- lib/librte_eal/include/rte_service.h | 4 ++++
+ lib/librte_eal/common/include/rte_service.h | 4 ++++
+ lib/librte_eal/common/rte_service.c         | 2 --
+ test/test/test_service_cores.c              | 1 +
@@ -39,10 +40,13 @@
-diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c
-index 4f003ed1af..ef1d8fcb9b 100644
---- a/app/test/test_service_cores.c
-+++ b/app/test/test_service_cores.c
-@@ -115,4 +115,5 @@ unregister_all(void)
- 
- 	rte_service_lcore_reset_all();
-+	rte_eal_mp_wait_lcore();
- 
- 	return TEST_SUCCESS;
+diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h
+index 21002209bc..200e028778 100644
+--- a/lib/librte_eal/common/include/rte_service.h
++++ b/lib/librte_eal/common/include/rte_service.h
+@@ -308,4 +308,8 @@ int32_t rte_service_lcore_count(void);
+  * The runstate of services is not modified.
+  *
++ * The cores that are stopped with this call, are in FINISHED state and
++ * the application must take care of bringing them back to a launchable state:
++ * e.g. call *rte_eal_lcore_wait* on the lcore_id.
++ *
+  * @retval 0 Success
+  */
@@ -50 +54 @@
-index e2795f857e..6a0e0ff65d 100644
+index 607f9a0407..af1733eb09 100644
@@ -53 +57 @@
-@@ -476,6 +476,4 @@ service_runner_func(void *arg)
+@@ -447,6 +447,4 @@ service_runner_func(void *arg)
@@ -60,13 +64,10 @@
-diff --git a/lib/librte_eal/include/rte_service.h b/lib/librte_eal/include/rte_service.h
-index 3a1c735c58..e2d0a6dd32 100644
---- a/lib/librte_eal/include/rte_service.h
-+++ b/lib/librte_eal/include/rte_service.h
-@@ -305,4 +305,8 @@ int32_t rte_service_lcore_count(void);
-  * The runstate of services is not modified.
-  *
-+ * The cores that are stopped with this call, are in FINISHED state and
-+ * the application must take care of bringing them back to a launchable state:
-+ * e.g. call *rte_eal_lcore_wait* on the lcore_id.
-+ *
-  * @retval 0 Success
-  */
+diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c
+index aa2174a332..c5150b6378 100644
+--- a/test/test/test_service_cores.c
++++ b/test/test/test_service_cores.c
+@@ -115,4 +115,5 @@ unregister_all(void)
+ 
+ 	rte_service_lcore_reset_all();
++	rte_eal_mp_wait_lcore();
+ 
+ 	return TEST_SUCCESS;