patch 'event/dlb2: fix delayed pop test in selftest' has been queued to stable release 20.11.4

Xueming Li xuemingl at nvidia.com
Sun Nov 28 15:53:34 CET 2021


Hi,

FYI, your patch has been queued to stable release 20.11.4

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/30/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/985e9324d96246c73fae73a59be83e989fc77354

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 985e9324d96246c73fae73a59be83e989fc77354 Mon Sep 17 00:00:00 2001
From: Rashmi Shetty <rashmi.shetty at intel.com>
Date: Mon, 15 Nov 2021 10:34:44 -0600
Subject: [PATCH] event/dlb2: fix delayed pop test in selftest
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 5fe46ce0558c4e53943aded6c4841235a7196762 ]

Number of events scheduled and available for dequeue
after token pop was set to dequeue_depth-1 instead of
dequeue_depth in test_delayed_pop. The expectation is
that all dequeue_depth number of events can be dequeued
once the last event is released.

Fixes: 07d55c418d47 ("event/dlb2: add delayed token pop logic")

Signed-off-by: Rashmi Shetty <rashmi.shetty at intel.com>
Reviewed-by: Mike Ximing Chen <mike.ximing.chen at intel.com>
---
 drivers/event/dlb2/dlb2_selftest.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/event/dlb2/dlb2_selftest.c b/drivers/event/dlb2/dlb2_selftest.c
index 5cf66c552c..2113bc2c99 100644
--- a/drivers/event/dlb2/dlb2_selftest.c
+++ b/drivers/event/dlb2/dlb2_selftest.c
@@ -1354,7 +1354,7 @@ test_delayed_pop(void)
 	}
 
 	/* Release one more event. This will trigger the token pop, and
-	 * dequeue_depth - 1 more events will be scheduled to the device.
+	 * dequeue_depth more events will be scheduled to the device.
 	 */
 	ev.op = RTE_EVENT_OP_RELEASE;
 
@@ -1366,7 +1366,7 @@ test_delayed_pop(void)
 
 	timeout = 0xFFFFFFFFF;
 
-	for (i = 0; i < port_conf.dequeue_depth - 1; i++) {
+	for (i = 0; i < port_conf.dequeue_depth; i++) {
 		if (rte_event_dequeue_burst(evdev, 0, &ev, 1, timeout) != 1) {
 			printf("%d: event dequeue expected to succeed\n",
 			       __LINE__);
@@ -1374,14 +1374,6 @@ test_delayed_pop(void)
 		}
 	}
 
-	timeout = 0x10000;
-
-	if (rte_event_dequeue_burst(evdev, 0, &ev, 1, timeout) != 0) {
-		printf("%d: event dequeue expected to fail\n",
-		       __LINE__);
-		goto err;
-	}
-
 	cleanup();
 	return 0;
 
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:04.948944015 +0800
+++ 0030-event-dlb2-fix-delayed-pop-test-in-selftest.patch	2021-11-28 22:41:03.243542368 +0800
@@ -1 +1 @@
-From 5fe46ce0558c4e53943aded6c4841235a7196762 Mon Sep 17 00:00:00 2001
+From 985e9324d96246c73fae73a59be83e989fc77354 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 5fe46ce0558c4e53943aded6c4841235a7196762 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list