patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] net/virtio-user: fix not working on 32-bit system
@ 2017-04-13 14:12 Jianfeng Tan
  2017-04-14  5:32 ` Yuanhan Liu
  2017-04-19  2:30 ` [dpdk-stable] [PATCH v2] " Jianfeng Tan
  0 siblings, 2 replies; 11+ messages in thread
From: Jianfeng Tan @ 2017-04-13 14:12 UTC (permalink / raw)
  To: dev; +Cc: yuanhan.liu, olivier.matz, Jianfeng Tan, stable

virtio-user cannot work on 32-bit system as higher 32-bit of the
addr field (64-bit) in the desc is filled with non-zero value
which should not happen for a 32-bit system.

This is a regression bug. For 32-bit system, the first 4 bytes
is the virtual address, with following 8 bytes pointing to
physical addr. With below wrong definition, both virtual address
and lower 4 bytes of physical addr are obtained.
  #define VIRTIO_MBUF_ADDR(mb, vq) \
	(*(uint64_t *)((uintptr_t)(mb) + (vq)->offset))

Fixes: 25f80d108780 ("net/virtio: fix packet corruption")
Cc: stable@dpdk.org

Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
---
 drivers/net/virtio/virtqueue.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index f9e3736..f43ea70 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -72,7 +72,8 @@ struct rte_mbuf;
  * Return the physical address (or virtual address in case of
  * virtio-user) of mbuf data buffer.
  */
-#define VIRTIO_MBUF_ADDR(mb, vq) (*(uint64_t *)((uintptr_t)(mb) + (vq)->offset))
+#define VIRTIO_MBUF_ADDR(mb, vq) \
+	((uint64_t)((uintptr_t)(*(void **)((uintptr_t)(mb) + (vq)->offset))))
 #else
 #define VIRTIO_MBUF_ADDR(mb, vq) ((mb)->buf_physaddr)
 #endif
-- 
2.7.4

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2017-04-19  6:27 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-13 14:12 [dpdk-stable] [PATCH] net/virtio-user: fix not working on 32-bit system Jianfeng Tan
2017-04-14  5:32 ` Yuanhan Liu
2017-04-14  5:53   ` Tan, Jianfeng
2017-04-14  6:20     ` Yuanhan Liu
2017-04-14  6:56       ` Tan, Jianfeng
2017-04-14  7:01         ` Yuanhan Liu
2017-04-14  7:14           ` Tan, Jianfeng
2017-04-19  2:30 ` [dpdk-stable] [PATCH v2] " Jianfeng Tan
2017-04-19  5:53   ` Yuanhan Liu
2017-04-19  6:21     ` Tan, Jianfeng
2017-04-19  6:24       ` Yuanhan Liu

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).