DPDK patches and discussions
 help / color / mirror / Atom feed
From: Jiri Slaby <jslaby@suse.cz>
To: dev@dpdk.org
Cc: Jiri Slaby <jslaby@suse.cz>, stable@dpdk.org
Subject: [PATCH v3] kni: fix build with Linux 5.18
Date: Wed,  1 Jun 2022 08:51:49 +0200	[thread overview]
Message-ID: <20220601065149.8031-1-jslaby@suse.cz> (raw)
In-Reply-To: <20220525102641.20982-1-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.

There were other attempts to fix this:
https://patches.dpdk.org/project/dpdk/patch/20220521070642.35413-1-humin29@huawei.com/
https://patches.dpdk.org/project/dpdk/patch/20220511112334.3233433-1-mingli.yu@windriver.com/

But neither of them ensures netif_rx_ni() is used on older kernel. This
might lead to deadlocks or other problems there.

Cc: stable@dpdk.org
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
[v3]
- reference other patches
- switch the #if test expressions to conform to the checker
[v2]
- forgot to amend the #else/#endif typo fix

 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);
+#else
 
 		/* Update statistics */
 		dev->stats.rx_bytes += len;
-- 
2.36.1


  parent reply	other threads:[~2022-06-05  7:51 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-25 10:12 [PATCH] " Jiri Slaby
2022-05-25 10:26 ` [PATCH v2] " Jiri Slaby
2022-05-31 16:25   ` Ferruh Yigit
2022-06-01  6:51   ` Jiri Slaby [this message]
2022-06-01  6:53     ` [PATCH v4] " Jiri Slaby
2022-06-05  8:22       ` Andrew Rybchenko
2022-06-06  5:59         ` Jiri Slaby
2022-06-06 16:20           ` Andrew Rybchenko
2022-06-06 10:46         ` [PATCH] kni: fix build Thomas Monjalon
2022-06-05  7:54 ` [PATCH v3] kni: fix build with Linux 5.18 Andrew Rybchenko
2022-06-05  8:20   ` Andrew Rybchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220601065149.8031-1-jslaby@suse.cz \
    --to=jslaby@suse.cz \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).