[v3] kni: fix build with Linux 5.18
Checks
Commit Message
From: Jiri Slaby <jslaby@suse.cz>
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: stable@dpdk.org
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v3:
- swap comparison in compat.h to make checkpatches.sh happy
kernel/linux/kni/compat.h | 4 ++++
kernel/linux/kni/kni_net.c | 4 ++++
2 files changed, 8 insertions(+)
Comments
On 6/5/22 10:54, Andrew Rybchenko wrote:
> From: Jiri Slaby <jslaby@suse.cz>
>
> 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: stable@dpdk.org
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Self NACK. I've found correct patch in patchwork finally.
@@ -141,3 +141,7 @@
#if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE
#define HAVE_TSK_IN_GUP
#endif
+
+#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE
+#define HAVE_NETIF_RX_NI
+#endif
@@ -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;