Skip to content

Commit

Permalink
kni: fix build with Linux 5.18
Browse files Browse the repository at this point in the history
[ upstream commit c98600d4bed6d15599e448990f2ba117ca938a2d ]

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.

netif_rx_ni() must be used on older kernel since netif_rx() might
might lead to deadlocks or other problems there.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
  • Loading branch information
Jiri Slaby authored and cpaelzer committed Jul 7, 2022
1 parent ac09974 commit 104eeda
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions kernel/linux/kni/compat.h
Expand Up @@ -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
4 changes: 4 additions & 0 deletions kernel/linux/kni/kni_net.c
Expand Up @@ -411,7 +411,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);
#else
/* Update statistics */
dev->stats.rx_bytes += len;
Expand Down

0 comments on commit 104eeda

Please sign in to comment.