[dpdk-stable] patch 'test/rcu: fix build with low core count' has been queued to stable release 19.11.6
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Mon Nov 9 19:39:58 CET 2020
Hi,
FYI, your patch has been queued to stable release 19.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/11/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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/9d663d0e983b52192354372076b8be2e254f194f
Thanks.
Luca Boccassi
---
>From 9d663d0e983b52192354372076b8be2e254f194f Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Date: Fri, 16 Oct 2020 01:03:48 -0500
Subject: [PATCH] test/rcu: fix build with low core count
[ upstream commit 0ca6007efc3a74f5d4184a7844a40cc7f4ad2c1d ]
When RTE_MAX_LCORE value is small, following compiler errors
are observed.
../app/test/test_rcu_qsbr.c:296:54: error: iteration 2 invokes
undefined behavior [-Werror=aggressive-loop-optimizations]
../app/test/test_rcu_qsbr.c:315:55: error: array subscript is above
array bounds [-Werror=array-bounds]
Fixes: b87089b0bb19 ("test/rcu: add API and functional tests")
Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
Tested-by: Lukasz Wojciechowski <l.wojciechow at partner.samsung.com>
Reviewed-by: Lukasz Wojciechowski <l.wojciechow at partner.samsung.com>
---
app/test/test_rcu_qsbr.c | 56 +++++++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 23 deletions(-)
diff --git a/app/test/test_rcu_qsbr.c b/app/test/test_rcu_qsbr.c
index b60dc5099c..5542b3c175 100644
--- a/app/test/test_rcu_qsbr.c
+++ b/app/test/test_rcu_qsbr.c
@@ -273,13 +273,13 @@ static int
test_rcu_qsbr_start(void)
{
uint64_t token;
- int i;
+ unsigned int i;
printf("\nTest rte_rcu_qsbr_start()\n");
rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE);
- for (i = 0; i < 3; i++)
+ for (i = 0; i < num_cores; i++)
rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[i]);
token = rte_rcu_qsbr_start(t[0]);
@@ -293,14 +293,18 @@ test_rcu_qsbr_check_reader(void *arg)
{
struct rte_rcu_qsbr *temp;
uint8_t read_type = (uint8_t)((uintptr_t)arg);
+ unsigned int i;
temp = t[read_type];
/* Update quiescent state counter */
- rte_rcu_qsbr_quiescent(temp, enabled_core_ids[0]);
- rte_rcu_qsbr_quiescent(temp, enabled_core_ids[1]);
- rte_rcu_qsbr_thread_unregister(temp, enabled_core_ids[2]);
- rte_rcu_qsbr_quiescent(temp, enabled_core_ids[3]);
+ for (i = 0; i < num_cores; i++) {
+ if (i % 2 == 0)
+ rte_rcu_qsbr_quiescent(temp, enabled_core_ids[i]);
+ else
+ rte_rcu_qsbr_thread_unregister(temp,
+ enabled_core_ids[i]);
+ }
return 0;
}
@@ -311,7 +315,8 @@ test_rcu_qsbr_check_reader(void *arg)
static int
test_rcu_qsbr_check(void)
{
- int i, ret;
+ int ret;
+ unsigned int i;
uint64_t token;
printf("\nTest rte_rcu_qsbr_check()\n");
@@ -329,7 +334,7 @@ test_rcu_qsbr_check(void)
ret = rte_rcu_qsbr_check(t[0], token, true);
TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "Blocking QSBR check");
- for (i = 0; i < 3; i++)
+ for (i = 0; i < num_cores; i++)
rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[i]);
ret = rte_rcu_qsbr_check(t[0], token, false);
@@ -344,7 +349,7 @@ test_rcu_qsbr_check(void)
/* Threads are offline, hence this should pass */
TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "Non-blocking QSBR check");
- for (i = 0; i < 3; i++)
+ for (i = 0; i < num_cores; i++)
rte_rcu_qsbr_thread_unregister(t[0], enabled_core_ids[i]);
ret = rte_rcu_qsbr_check(t[0], token, true);
@@ -352,7 +357,7 @@ test_rcu_qsbr_check(void)
rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE);
- for (i = 0; i < 4; i++)
+ for (i = 0; i < num_cores; i++)
rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[i]);
token = rte_rcu_qsbr_start(t[0]);
@@ -591,7 +596,7 @@ test_rcu_qsbr_thread_offline(void)
static int
test_rcu_qsbr_dump(void)
{
- int i;
+ unsigned int i;
printf("\nTest rte_rcu_qsbr_dump()\n");
@@ -608,7 +613,7 @@ test_rcu_qsbr_dump(void)
rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[0]);
- for (i = 1; i < 3; i++)
+ for (i = 1; i < num_cores; i++)
rte_rcu_qsbr_thread_register(t[1], enabled_core_ids[i]);
rte_rcu_qsbr_dump(stdout, t[0]);
@@ -758,7 +763,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
{
uint64_t token[3];
uint32_t c;
- int i;
+ int i, num_readers;
int32_t pos[3];
writer_done = 0;
@@ -781,7 +786,11 @@ test_rcu_qsbr_sw_sv_3qs(void)
thread_info[0].ih = 0;
/* Reader threads are launched */
- for (i = 0; i < 4; i++)
+ /* Keep the number of reader threads low to reduce
+ * the execution time.
+ */
+ num_readers = num_cores < 4 ? num_cores : 4;
+ for (i = 0; i < num_readers; i++)
rte_eal_remote_launch(test_rcu_qsbr_reader, &thread_info[0],
enabled_core_ids[i]);
@@ -814,7 +823,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
/* Check the quiescent state status */
rte_rcu_qsbr_check(t[0], token[0], true);
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < num_readers; i++) {
c = hash_data[0][0][enabled_core_ids[i]];
if (c != COUNTER_VALUE && c != 0) {
printf("Reader lcore %d did not complete #0 = %d\n",
@@ -832,7 +841,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
/* Check the quiescent state status */
rte_rcu_qsbr_check(t[0], token[1], true);
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < num_readers; i++) {
c = hash_data[0][3][enabled_core_ids[i]];
if (c != COUNTER_VALUE && c != 0) {
printf("Reader lcore %d did not complete #3 = %d\n",
@@ -850,7 +859,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
/* Check the quiescent state status */
rte_rcu_qsbr_check(t[0], token[2], true);
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < num_readers; i++) {
c = hash_data[0][6][enabled_core_ids[i]];
if (c != COUNTER_VALUE && c != 0) {
printf("Reader lcore %d did not complete #6 = %d\n",
@@ -869,7 +878,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
writer_done = 1;
/* Wait and check return value from reader threads */
- for (i = 0; i < 4; i++)
+ for (i = 0; i < num_readers; i++)
if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0)
goto error;
rte_hash_free(h[0]);
@@ -899,6 +908,12 @@ test_rcu_qsbr_mw_mv_mqs(void)
unsigned int i, j;
unsigned int test_cores;
+ if (RTE_MAX_LCORE < 5 || num_cores < 4) {
+ printf("Not enough cores for %s, expecting at least 5\n",
+ __func__);
+ return TEST_SKIPPED;
+ }
+
writer_done = 0;
test_cores = num_cores / 4;
test_cores = test_cores * 4;
@@ -984,11 +999,6 @@ test_rcu_qsbr_main(void)
{
uint16_t core_id;
- if (rte_lcore_count() < 5) {
- printf("Not enough cores for rcu_qsbr_autotest, expecting at least 5\n");
- return TEST_SKIPPED;
- }
-
num_cores = 0;
RTE_LCORE_FOREACH_SLAVE(core_id) {
enabled_core_ids[num_cores] = core_id;
--
2.27.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-09 18:40:11.620316516 +0000
+++ 0010-test-rcu-fix-build-with-low-core-count.patch 2020-11-09 18:40:11.075310411 +0000
@@ -1 +1 @@
-From 0ca6007efc3a74f5d4184a7844a40cc7f4ad2c1d Mon Sep 17 00:00:00 2001
+From 9d663d0e983b52192354372076b8be2e254f194f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0ca6007efc3a74f5d4184a7844a40cc7f4ad2c1d ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 7ae66e4dfb..ab37a068cd 100644
+index b60dc5099c..5542b3c175 100644
@@ -30 +31 @@
-@@ -286,13 +286,13 @@ static int
+@@ -273,13 +273,13 @@ static int
@@ -46 +47 @@
-@@ -306,14 +306,18 @@ test_rcu_qsbr_check_reader(void *arg)
+@@ -293,14 +293,18 @@ test_rcu_qsbr_check_reader(void *arg)
@@ -69 +70 @@
-@@ -324,7 +328,8 @@ test_rcu_qsbr_check_reader(void *arg)
+@@ -311,7 +315,8 @@ test_rcu_qsbr_check_reader(void *arg)
@@ -79 +80 @@
-@@ -342,7 +347,7 @@ test_rcu_qsbr_check(void)
+@@ -329,7 +334,7 @@ test_rcu_qsbr_check(void)
@@ -88 +89 @@
-@@ -357,7 +362,7 @@ test_rcu_qsbr_check(void)
+@@ -344,7 +349,7 @@ test_rcu_qsbr_check(void)
@@ -97 +98 @@
-@@ -365,7 +370,7 @@ test_rcu_qsbr_check(void)
+@@ -352,7 +357,7 @@ test_rcu_qsbr_check(void)
@@ -106 +107 @@
-@@ -928,7 +933,7 @@ end:
+@@ -591,7 +596,7 @@ test_rcu_qsbr_thread_offline(void)
@@ -115 +116 @@
-@@ -945,7 +950,7 @@ test_rcu_qsbr_dump(void)
+@@ -608,7 +613,7 @@ test_rcu_qsbr_dump(void)
@@ -124 +125 @@
-@@ -1095,7 +1100,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
+@@ -758,7 +763,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
@@ -133 +134 @@
-@@ -1118,7 +1123,11 @@ test_rcu_qsbr_sw_sv_3qs(void)
+@@ -781,7 +786,11 @@ test_rcu_qsbr_sw_sv_3qs(void)
@@ -146 +147 @@
-@@ -1151,7 +1160,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
+@@ -814,7 +823,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
@@ -155 +156 @@
-@@ -1169,7 +1178,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
+@@ -832,7 +841,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
@@ -164 +165 @@
-@@ -1187,7 +1196,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
+@@ -850,7 +859,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
@@ -173 +174 @@
-@@ -1206,7 +1215,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
+@@ -869,7 +878,7 @@ test_rcu_qsbr_sw_sv_3qs(void)
@@ -182 +183 @@
-@@ -1236,6 +1245,12 @@ test_rcu_qsbr_mw_mv_mqs(void)
+@@ -899,6 +908,12 @@ test_rcu_qsbr_mw_mv_mqs(void)
@@ -195 +196 @@
-@@ -1321,11 +1336,6 @@ test_rcu_qsbr_main(void)
+@@ -984,11 +999,6 @@ test_rcu_qsbr_main(void)
@@ -205 +206 @@
- RTE_LCORE_FOREACH_WORKER(core_id) {
+ RTE_LCORE_FOREACH_SLAVE(core_id) {
More information about the stable
mailing list