[dpdk-stable] patch 'test/interrupt: account for race with callback' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Fri Nov 22 15:41:11 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.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/29/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.

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/a9a4cf75229f132db7280e8441d6293a39de43d7

Thanks.

Kevin.

---
>From a9a4cf75229f132db7280e8441d6293a39de43d7 Mon Sep 17 00:00:00 2001
From: Aaron Conole <aconole at redhat.com>
Date: Thu, 8 Aug 2019 13:38:35 -0400
Subject: [PATCH] test/interrupt: account for race with callback

[ upstream commit 73afc9df00d8ba4ff58d4a7a86691ca10520d462 ]

Because the eal interrupt framework can race when invoking the callback
and a separate unregister call, the test needs to accommodate the chance
that the two collide.  Do this by checking the return value of unregister
against the race-condition flag (EAGAIN).

Fixes: f1a6c22424ce ("app/test: update interrupts test")

Signed-off-by: Aaron Conole <aconole at redhat.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 test/test/test_interrupts.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/test/test_interrupts.c b/test/test/test_interrupts.c
index 4e82e9a22..32ef0a208 100644
--- a/test/test/test_interrupts.c
+++ b/test/test/test_interrupts.c
@@ -371,7 +371,11 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type)
 
 	rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL);
-	if (rte_intr_callback_unregister(&test_intr_handle,
-			test_interrupt_callback, &test_intr_handle) < 0)
-		return -1;
+	while ((count =
+		rte_intr_callback_unregister(&test_intr_handle,
+					     test_interrupt_callback,
+					     &test_intr_handle)) < 0) {
+		if (count != -EAGAIN)
+			return -1;
+	}
 
 	if (flag == 0) {
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-11-22 14:36:56.565927899 +0000
+++ 0025-test-interrupt-account-for-race-with-callback.patch	2019-11-22 14:36:55.193149372 +0000
@@ -1 +1 @@
-From 73afc9df00d8ba4ff58d4a7a86691ca10520d462 Mon Sep 17 00:00:00 2001
+From a9a4cf75229f132db7280e8441d6293a39de43d7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 73afc9df00d8ba4ff58d4a7a86691ca10520d462 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
- app/test/test_interrupts.c | 10 +++++++---
+ test/test/test_interrupts.c | 10 +++++++---
@@ -20,4 +21,4 @@
-diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c
-index d8c2d8124..233b14a70 100644
---- a/app/test/test_interrupts.c
-+++ b/app/test/test_interrupts.c
+diff --git a/test/test/test_interrupts.c b/test/test/test_interrupts.c
+index 4e82e9a22..32ef0a208 100644
+--- a/test/test/test_interrupts.c
++++ b/test/test/test_interrupts.c



More information about the stable mailing list