patch 'kni: fix build on RHEL 9.1' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Thu Feb 23 16:04:52 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.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 02/28/23. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/84d43ac12f871a6ad6056c5069c6ad342463cea9

Thanks.

Kevin

---
>From 84d43ac12f871a6ad6056c5069c6ad342463cea9 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at amd.com>
Date: Fri, 6 Jan 2023 20:13:14 +0000
Subject: [PATCH] kni: fix build on RHEL 9.1

[ upstream commit 8b07816b396f2075f44b4ffa65ecbd0d5a624661 ]

Linux kernel in the RHEL9.1 seems backported Linux commit 2655926aea9b
("net: Remove netif_rx_any_context() and netif_rx_ni().") that drops
netif_rx_ni().

This was fixed in DPDK for vanilla kernel with the commit
c98600d4bed6 ("kni: fix build with Linux 5.18").

Add RHEL9.1 check for the netif_rx_ni() usage to fix build error.

Bugzilla ID: 1076

Signed-off-by: Ferruh Yigit <ferruh.yigit at amd.com>
Tested-by: Daxue Gao <daxuex.gao at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 kernel/linux/kni/compat.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 3a86d12bbc..7aa6cd9fca 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -147,5 +147,7 @@
 #endif
 
-#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE && \
+	(!(defined(RHEL_RELEASE_CODE) && \
+	 RHEL_RELEASE_VERSION(9, 1) <= RHEL_RELEASE_CODE))
 #define HAVE_NETIF_RX_NI
 #endif
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:23.908220993 +0000
+++ 0001-kni-fix-build-on-RHEL-9.1.patch	2023-02-23 14:46:23.694235701 +0000
@@ -1 +1 @@
-From 8b07816b396f2075f44b4ffa65ecbd0d5a624661 Mon Sep 17 00:00:00 2001
+From 84d43ac12f871a6ad6056c5069c6ad342463cea9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8b07816b396f2075f44b4ffa65ecbd0d5a624661 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org



More information about the stable mailing list