Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dpdk for openSUSE:Factory checked in at 2022-05-30 12:42:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpdk (Old) and /work/SRC/openSUSE:Factory/.dpdk.new.2254 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpdk" Mon May 30 12:42:16 2022 rev:53 rq:979716 version:21.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dpdk/dpdk.changes 2022-05-04 15:10:56.720156878 +0200 +++ /work/SRC/openSUSE:Factory/.dpdk.new.2254/dpdk.changes 2022-05-30 12:42:31.416276597 +0200 @@ -1,0 +2,6 @@ +Wed May 25 10:13:44 UTC 2022 - Jiri Slaby <[email protected]> + +- add kni-fix-build-with-Linux-5.18.patch to fix build with kernel + 5.18 + +------------------------------------------------------------------- New: ---- kni-fix-build-with-Linux-5.18.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpdk.spec ++++++ --- /var/tmp/diff_new_pack.gDLBFN/_old 2022-05-30 12:42:32.372277870 +0200 +++ /var/tmp/diff_new_pack.gDLBFN/_new 2022-05-30 12:42:32.380277880 +0200 @@ -59,6 +59,7 @@ # PATCH-FIX-OPENSUSE PATCH-FEATURE-UPSTREAM Patch0: 0001-build-try-to-get-kernel-version-from-kernel-source.patch Patch1: 0002-SLE15-SP3-compatibility-patch-for-kni.patch +Patch2: kni-fix-build-with-Linux-5.18.patch BuildRequires: binutils BuildRequires: doxygen BuildRequires: fdupes ++++++ kni-fix-build-with-Linux-5.18.patch ++++++ From: Jiri Slaby <[email protected]> Date: Wed, 25 May 2022 12:04:10 +0200 Subject: kni: fix build with Linux 5.18 Patch-mainline: Submitted 2022/05/25, [email protected] References: kernel 5.18 Since commit 2655926aea9b (net: Remove netif_rx_any_context() and netif_rx_ni().) in 5.18, netif_rx_ni() no longer exists as netif_rx() can be called from any context. So define HAVE_NETIF_RX_NI for older releases and call the appropriate function in kni_net. Cc: [email protected] Signed-off-by: Jiri Slaby <[email protected]> --- kernel/linux/kni/compat.h | 4 ++++ kernel/linux/kni/kni_net.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 664785674ff1..a81846a8a895 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -141,3 +141,7 @@ #if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE #define HAVE_TSK_IN_GUP #endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0) +#define HAVE_NETIF_RX_NI +#endif diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index 29e5b9e21f9e..a8b092b7567d 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -441,7 +441,11 @@ kni_net_rx_normal(struct kni_dev *kni) skb->ip_summed = CHECKSUM_UNNECESSARY; /* Call netif interface */ +#ifdef HAVE_NETIF_RX_NI netif_rx_ni(skb); +#else + netif_rx(skb); +#endif /* Update statistics */ dev->stats.rx_bytes += len; -- 2.36.1
