DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ferruh Yigit <ferruh.yigit@xilinx.com>
To: Jiri Slaby <jslaby@suse.cz>
Cc: <stable@dpdk.org>, <dev@dpdk.org>
Subject: Re: [PATCH v2] kni: fix build with Linux 5.18
Date: Tue, 31 May 2022 17:25:48 +0100	[thread overview]
Message-ID: <9440b754-b523-2ebe-e02d-a6aaccb0ad4c@xilinx.com> (raw)
In-Reply-To: <20220525102641.20982-1-jslaby@suse.cz>

On 5/25/2022 11:26 AM, 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.
> 

I think there is another commit that makes 'netif_rx()' usable in place 
of 'netif_rx_ni()', can you please document that commit too for reference.

> Cc: stable@dpdk.org
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
> [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

Can you please switch sides in the comparison [1] to be compatible with 
rest of the file and to prevent checkpatch warning [2]?

Rest looks good to me.

[1]
#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE

[2]
WARNING:CONSTANT_COMPARISON: Comparisons should place the constant on 
the right side of the test
#97: FILE: kernel/linux/kni/compat.h:145:
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)

> diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
> index 29e5b9e21f9e..41805fcabf7b 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;


  reply	other threads:[~2022-05-31 16:25 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 [this message]
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
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=9440b754-b523-2ebe-e02d-a6aaccb0ad4c@xilinx.com \
    --to=ferruh.yigit@xilinx.com \
    --cc=dev@dpdk.org \
    --cc=jslaby@suse.cz \
    --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).