[PATCH] kni: fix build

[PATCH] kni: fix build

[Thomas Monjalon]

Since commit 08b563ffb19 ("mbuf: replace data pointer by an offset"),
KNI vhost compilation (CONFIG_RTE_KNI_VHOST=y) was broken.

rte_pktmbuf_mtod() is not used in the kernel context but is replaced
by a simple addition of the base address and the offset.

Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_eal/linuxapp/kni/kni_vhost.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/kni/kni_vhost.c b/lib/librte_eal/linuxapp/kni/kni_vhost.c
index fe512c2..7bcc985 100644
--- a/lib/librte_eal/linuxapp/kni/kni_vhost.c
+++ b/lib/librte_eal/linuxapp/kni/kni_vhost.c
@@ -104,7 +104,8 @@ kni_vhost_net_tx(struct kni_dev *kni, struct iovec *iov,
 		void *data_kva;
 
 		pkt_kva = (void *)pkt_va - kni->mbuf_va + kni->mbuf_kva;
-		data_kva = pkt_kva->data - kni->mbuf_va + kni->mbuf_kva;
+		data_kva = pkt_kva->buf_addr + pkt_kva->data_off
+		           - kni->mbuf_va + kni->mbuf_kva;
 
 		memcpy_fromiovecend(data_kva, iov, offset, len);
 		if (unlikely(len < ETH_ZLEN)) {
@@ -177,7 +178,7 @@ kni_vhost_net_rx(struct kni_dev *kni, struct iovec *iov,
 	KNI_DBG_RX("rx offset=%d, len=%d, pkt_len=%d, iovlen=%d\n",
 		   offset, len, pkt_len, (int)iov->iov_len);
 
-	data_kva = kva->data - kni->mbuf_va + kni->mbuf_kva;
+	data_kva = kva->buf_addr + kva->data_off - kni->mbuf_va + kni->mbuf_kva;
 	if (unlikely(memcpy_toiovecend(iov, data_kva, offset, pkt_len)))
 		goto drop;
 
-- 
2.1.3

Re: [PATCH] kni: fix build

[Olivier MATZ]

Hi Thomas,

On 11/07/2014 03:51 PM, Thomas Monjalon wrote:
> Since commit 08b563ffb19 ("mbuf: replace data pointer by an offset"),
> KNI vhost compilation (CONFIG_RTE_KNI_VHOST=y) was broken.
> 
> rte_pktmbuf_mtod() is not used in the kernel context but is replaced
> by a simple addition of the base address and the offset.
> 
> Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Acked-by: Olivier Matz <olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Re: [PATCH] kni: fix build

[Thomas Monjalon]

> > Since commit 08b563ffb19 ("mbuf: replace data pointer by an offset"),
> > KNI vhost compilation (CONFIG_RTE_KNI_VHOST=y) was broken.
> > 
> > rte_pktmbuf_mtod() is not used in the kernel context but is replaced
> > by a simple addition of the base address and the offset.
> > 
> > Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> 
> Acked-by: Olivier Matz <olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Applied
-- 
Thomas

Re: [PATCH v4] kni: fix build with Linux 5.18

[Andrew Rybchenko]

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.

[PATCH] kni: fix build

[Thomas Monjalon]

A previous fix had #else instead of #endif.
The error message is:
	kernel/linux/kni/kni_net.c: In function ‘kni_net_rx_normal’:
	kernel/linux/kni/kni_net.c:448:2: error: #else after #else

Bugzilla ID: 1025
Fixes: c98600d4bed6 ("kni: fix build with Linux 5.18")
Cc: stable@dpdk.org

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 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 a8b092b756..41805fcabf 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -445,7 +445,7 @@ kni_net_rx_normal(struct kni_dev *kni)
 		netif_rx_ni(skb);
 #else
 		netif_rx(skb);
-#else
+#endif
 
 		/* Update statistics */
 		dev->stats.rx_bytes += len;
-- 
2.36.0