[dpdk-stable] patch 'test/service: fix wait for service core' has been queued to LTS release 17.11.10

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Dec 19 15:34:46 CET 2019


Hi,

FYI, your patch has been queued to LTS release 17.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 12/21/19. 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.

Thanks.

Luca Boccassi

---
>From f8ca5223b48f46f9647574df08d84cb065482298 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harry.van.haaren at intel.com>
Date: Wed, 27 Nov 2019 13:20:27 +0000
Subject: [PATCH] test/service: fix wait for service core

[ upstream commit 505a2b0c64a7f1e087f5a8aaa6940da78c11c81b ]

This commit fixes a sporadic failure of the service_autotest
unit test, as seen in the DPDK CI. The failure occurs as the main test
thread did not wait on the service-thread to return, and allowing it
to read a flag before the service was able to write to it.

The fix changes the wait API call to specific the service-core ID,
and this waits for cores with both ROLE_RTE and ROLE_SERVICE.

The rte_eal_mp_wait_lcore() call does not (and should not) wait
for service cores, so must not be used to wait on service-cores.

Fixes: f038a81e1c56 ("service: add unit tests")

Reported-by: Aaron Conole <aconole at redhat.com>
Signed-off-by: Harry van Haaren <harry.van.haaren at intel.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 test/test/test_service_cores.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c
index ebff8b0a95..09360919a4 100644
--- a/test/test/test_service_cores.c
+++ b/test/test/test_service_cores.c
@@ -352,7 +352,7 @@ service_lcore_en_dis_able(void)
 	int ret = rte_eal_remote_launch(service_remote_launch_func, NULL,
 					slcore_id);
 	TEST_ASSERT_EQUAL(0, ret, "Ex-service core remote launch failed.");
-	rte_eal_mp_wait_lcore();
+	rte_eal_wait_lcore(slcore_id);
 	TEST_ASSERT_EQUAL(1, service_remote_launch_flag,
 			"Ex-service core function call had no effect.");
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:31.848360579 +0000
+++ 0139-test-service-fix-wait-for-service-core.patch	2019-12-19 14:32:26.365302981 +0000
@@ -1,8 +1,10 @@
-From 505a2b0c64a7f1e087f5a8aaa6940da78c11c81b Mon Sep 17 00:00:00 2001
+From f8ca5223b48f46f9647574df08d84cb065482298 Mon Sep 17 00:00:00 2001
 From: Harry van Haaren <harry.van.haaren at intel.com>
 Date: Wed, 27 Nov 2019 13:20:27 +0000
 Subject: [PATCH] test/service: fix wait for service core
 
+[ upstream commit 505a2b0c64a7f1e087f5a8aaa6940da78c11c81b ]
+
 This commit fixes a sporadic failure of the service_autotest
 unit test, as seen in the DPDK CI. The failure occurs as the main test
 thread did not wait on the service-thread to return, and allowing it
@@ -15,20 +17,19 @@
 for service cores, so must not be used to wait on service-cores.
 
 Fixes: f038a81e1c56 ("service: add unit tests")
-Cc: stable at dpdk.org
 
 Reported-by: Aaron Conole <aconole at redhat.com>
 Signed-off-by: Harry van Haaren <harry.van.haaren at intel.com>
 Acked-by: David Marchand <david.marchand at redhat.com>
 ---
- app/test/test_service_cores.c | 2 +-
+ test/test/test_service_cores.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c
-index 9fe38f5e08..a922c7ddcc 100644
---- a/app/test/test_service_cores.c
-+++ b/app/test/test_service_cores.c
-@@ -483,7 +483,7 @@ service_lcore_en_dis_able(void)
+diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c
+index ebff8b0a95..09360919a4 100644
+--- a/test/test/test_service_cores.c
++++ b/test/test/test_service_cores.c
+@@ -352,7 +352,7 @@ service_lcore_en_dis_able(void)
  	int ret = rte_eal_remote_launch(service_remote_launch_func, NULL,
  					slcore_id);
  	TEST_ASSERT_EQUAL(0, ret, "Ex-service core remote launch failed.");


More information about the stable mailing list