patch 'interrupt: fix request notifier interrupt processing' has been queued to stable release 19.11.11

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Tue Nov 30 17:35:30 CET 2021


Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/ced22e5b524795bc8e8e70814f93e330f3f6cbda

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From ced22e5b524795bc8e8e70814f93e330f3f6cbda Mon Sep 17 00:00:00 2001
From: Maciej Szwed <maciej.szwed at intel.com>
Date: Tue, 19 Oct 2021 12:06:57 +0200
Subject: [PATCH] interrupt: fix request notifier interrupt processing

[ upstream commit aeed570a211fe31c976f9f4de07039cb7c8a125e ]

We should call read() on RTE_INTR_HANDLE_VFIO_REQ event
to confirm that event.

Fixes: 0eb8a1c4c786 ("vfio: add request notifier interrupt")

Signed-off-by: Maciej Szwed <maciej.szwed at intel.com>
---
 lib/librte_eal/linux/eal/eal_interrupts.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c b/lib/librte_eal/linux/eal/eal_interrupts.c
index e570c0684e..348aef2ece 100644
--- a/lib/librte_eal/linux/eal/eal_interrupts.c
+++ b/lib/librte_eal/linux/eal/eal_interrupts.c
@@ -877,17 +877,14 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
 			bytes_read = sizeof(buf.timerfd_num);
 			break;
 #ifdef VFIO_PRESENT
+#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
+		case RTE_INTR_HANDLE_VFIO_REQ:
+#endif
 		case RTE_INTR_HANDLE_VFIO_MSIX:
 		case RTE_INTR_HANDLE_VFIO_MSI:
 		case RTE_INTR_HANDLE_VFIO_LEGACY:
 			bytes_read = sizeof(buf.vfio_intr_count);
 			break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
-		case RTE_INTR_HANDLE_VFIO_REQ:
-			bytes_read = 0;
-			call = true;
-			break;
-#endif
 #endif
 		case RTE_INTR_HANDLE_VDEV:
 		case RTE_INTR_HANDLE_EXT:
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:13.295555014 +0100
+++ 0126-interrupt-fix-request-notifier-interrupt-processing.patch	2021-11-30 16:50:05.958874763 +0100
@@ -1 +1 @@
-From aeed570a211fe31c976f9f4de07039cb7c8a125e Mon Sep 17 00:00:00 2001
+From ced22e5b524795bc8e8e70814f93e330f3f6cbda Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aeed570a211fe31c976f9f4de07039cb7c8a125e ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -14 +15 @@
- lib/eal/linux/eal_interrupts.c | 9 +++------
+ lib/librte_eal/linux/eal/eal_interrupts.c | 9 +++------
@@ -17,5 +18,5 @@
-diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
-index 15a27a2abf..6e3925efd4 100644
---- a/lib/eal/linux/eal_interrupts.c
-+++ b/lib/eal/linux/eal_interrupts.c
-@@ -947,17 +947,14 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
+diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c b/lib/librte_eal/linux/eal/eal_interrupts.c
+index e570c0684e..348aef2ece 100644
+--- a/lib/librte_eal/linux/eal/eal_interrupts.c
++++ b/lib/librte_eal/linux/eal/eal_interrupts.c
+@@ -877,17 +877,14 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)


More information about the stable mailing list