diff mbox

[dpdk-dev] kni: fix build

Message ID 1415371867-3730-1-git-send-email-thomas.monjalon@6wind.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Thomas Monjalon Nov. 7, 2014, 2:51 p.m. UTC 
  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@6wind.com>
---
 lib/librte_eal/linuxapp/kni/kni_vhost.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Olivier Matz Nov. 7, 2014, 3:07 p.m. UTC | #1 
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@6wind.com>

Acked-by: Olivier Matz <olivier.matz@6wind.com>
Thomas Monjalon Nov. 10, 2014, 9:29 a.m. UTC | #2 
> > 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@6wind.com>
> 
> Acked-by: Olivier Matz <olivier.matz@6wind.com>

Applied
diff mbox

Patch

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;