kni_net.c: use netif_rx() instead of netif_rx_ni()

Message ID 20220511112334.3233433-1-mingli.yu@windriver.com (mailing list archive)
State Superseded, archived
Delegated to: Andrew Rybchenko
Headers
Series kni_net.c: use netif_rx() instead of netif_rx_ni() |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation warning apply issues
ci/github-robot: build success github build: passed
ci/iol-testing warning apply patch failure

Commit Message

mingli.yu@windriver.com May 11, 2022, 11:23 a.m. UTC
  From: Mingli Yu <mingli.yu@windriver.com>

The netif_rx_ni is removed in below commit after kernel upgraded
to 5.18, so change accordingly to fix the gap.
2655926aea9b net: Remove netif_rx_any_context() and netif_rx_ni().

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 kernel/linux/kni/kni_net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Andrew Rybchenko May 31, 2022, 4:47 p.m. UTC | #1
On 5/11/22 14:23, mingli.yu@windriver.com wrote:
> From: Mingli Yu <mingli.yu@windriver.com>
> 
> The netif_rx_ni is removed in below commit after kernel upgraded
> to 5.18, so change accordingly to fix the gap.
> 2655926aea9b net: Remove netif_rx_any_context() and netif_rx_ni().
> 
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>   kernel/linux/kni/kni_net.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
> index 7fcfa106cb..58e8fe5af6 100644
> --- a/kernel/linux/kni/kni_net.c
> +++ b/kernel/linux/kni/kni_net.c
> @@ -368,7 +368,7 @@ kni_net_rx_normal(struct kni_dev *kni)
>   		skb->ip_summed = CHECKSUM_UNNECESSARY;
>   
>   		/* Call netif interface */
> -		netif_rx_ni(skb);
> +		netif_rx(skb);
>   
>   		/* Update statistics */
>   		kni->stats.rx_bytes += len;

There are two more patches [1] and [2] in the patchwork on the topic and
it looks like the latest is the best one. Do you have any comments on
[2]?

[1] 
https://patches.dpdk.org/project/dpdk/patch/20220521070642.35413-1-humin29@huawei.com/
[2]https://patches.dpdk.org/project/dpdk/patch/20220525102641.20982-1-jslaby@suse.cz/
  

Patch

diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 7fcfa106cb..58e8fe5af6 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -368,7 +368,7 @@  kni_net_rx_normal(struct kni_dev *kni)
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
 
 		/* Call netif interface */
-		netif_rx_ni(skb);
+		netif_rx(skb);
 
 		/* Update statistics */
 		kni->stats.rx_bytes += len;