DPDK patches and discussions
 help / color / mirror / Atom feed
From: Jiri Slaby <jslaby@suse.cz>
To: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>, dev@dpdk.org
Cc: stable@dpdk.org, Stephen Hemminger <stephen@networkplumber.org>,
	Ferruh Yigit <ferruh.yigit@intel.com>,
	mingli.yu@windriver.com, "Min Hu (Connor)" <humin29@huawei.com>
Subject: Re: [PATCH v4] kni: fix build with Linux 5.18
Date: Mon, 6 Jun 2022 07:59:54 +0200	[thread overview]
Message-ID: <23927135-c5d0-be83-4447-32e3fce0617d@suse.cz> (raw)
In-Reply-To: <88cd54ca-9318-d240-4ce9-2be8b13d19ad@oktetlabs.ru>

On 05. 06. 22, 10:22, Andrew Rybchenko wrote:
> On 6/1/22 09:53, Jiri Slaby wrote:
>> 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>
>> ---
>> [v4]
>> - really switch the #if test
>> [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..0db29a4a6f61 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 KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE
>> +#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;
> 
> Applied to dpdk-next-net/main with minor fixes in the description, thanks.

Sorry, it appears I sent the old version again. The latter #else should 
have been #endif. Do you want me to send a followup patch?

thanks,
-- 
js
suse labs

  reply	other threads:[~2022-06-07  8:14 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   ` [PATCH v3] " Jiri Slaby
2022-06-01  6:53     ` [PATCH v4] " Jiri Slaby
2022-06-05  8:22       ` Andrew Rybchenko
2022-06-06  5:59         ` Jiri Slaby [this message]
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=23927135-c5d0-be83-4447-32e3fce0617d@suse.cz \
    --to=jslaby@suse.cz \
    --cc=andrew.rybchenko@oktetlabs.ru \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=humin29@huawei.com \
    --cc=mingli.yu@windriver.com \
    --cc=stable@dpdk.org \
    --cc=stephen@networkplumber.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).