[dpdk-stable] patch 'interrupt: fix request notifier interrupt processing' has been queued to stable release 20.11.4

Xueming Li xuemingl at nvidia.com
Wed Nov 10 07:32:13 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/12/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/0fcdac4ba11dcf8f0631c41b80db8d64147baa5a

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0fcdac4ba11dcf8f0631c41b80db8d64147baa5a 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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_interrupts.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/librte_eal/linux/eal_interrupts.c b/lib/librte_eal/linux/eal_interrupts.c
index 1dd994bd1f..6fe22589bd 100644
--- a/lib/librte_eal/linux/eal_interrupts.c
+++ b/lib/librte_eal/linux/eal_interrupts.c
@@ -906,17 +906,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.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:12.840215631 +0800
+++ 0249-interrupt-fix-request-notifier-interrupt-processing.patch	2021-11-10 14:17:02.090744291 +0800
@@ -1 +1 @@
-From aeed570a211fe31c976f9f4de07039cb7c8a125e Mon Sep 17 00:00:00 2001
+From 0fcdac4ba11dcf8f0631c41b80db8d64147baa5a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit aeed570a211fe31c976f9f4de07039cb7c8a125e ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -14 +16 @@
- lib/eal/linux/eal_interrupts.c | 9 +++------
+ lib/librte_eal/linux/eal_interrupts.c | 9 +++------
@@ -17,5 +19,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_interrupts.c b/lib/librte_eal/linux/eal_interrupts.c
+index 1dd994bd1f..6fe22589bd 100644
+--- a/lib/librte_eal/linux/eal_interrupts.c
++++ b/lib/librte_eal/linux/eal_interrupts.c
+@@ -906,17 +906,14 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)


More information about the stable mailing list