From 3ed4e9735aea345746ab243d25f8a4897a480a3c Mon Sep 17 00:00:00 2001 From: Vijayakumar Muthuvel Manickam Date: Fri, 18 Jul 2014 03:53:48 -0700 Subject: [PATCH] virtio: fix 32-bit build for 64-bit kernel virtio_net_hdr_mem member within virtqueue structure stores a physical address and is defined as void ptr. When 32bit pmd is used with 64bit kernel this leads to truncation of 64bit physical address and pkt i/o does not work. Changed virtio_net_hdr_mem to phys_addr_t type and removed the typecasts Signed-off-by: Vijayakumar Muthuvel Manickam Acked-by: Thomas Monjalon --- lib/librte_pmd_virtio/virtio_ethdev.c | 6 +++--- lib/librte_pmd_virtio/virtqueue.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c index afc903c6c4..b10bfbbfad 100644 --- a/lib/librte_pmd_virtio/virtio_ethdev.c +++ b/lib/librte_pmd_virtio/virtio_ethdev.c @@ -331,7 +331,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, PMD_INIT_LOG(DEBUG, "vq->vq_ring_mem: 0x%"PRIx64"\n", (uint64_t)mz->phys_addr); PMD_INIT_LOG(DEBUG, "vq->vq_ring_virt_mem: 0x%"PRIx64"\n", (uint64_t)mz->addr); vq->virtio_net_hdr_mz = NULL; - vq->virtio_net_hdr_mem = (void *)NULL; + vq->virtio_net_hdr_mem = 0; if (queue_type == VTNET_TQ) { /* @@ -347,7 +347,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, return -ENOMEM; } vq->virtio_net_hdr_mem = - (void *)(uintptr_t)vq->virtio_net_hdr_mz->phys_addr; + vq->virtio_net_hdr_mz->phys_addr; memset(vq->virtio_net_hdr_mz->addr, 0, vq_size * sizeof(struct virtio_net_hdr)); } else if (queue_type == VTNET_CQ) { @@ -361,7 +361,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, return -ENOMEM; } vq->virtio_net_hdr_mem = - (void *)(uintptr_t)vq->virtio_net_hdr_mz->phys_addr; + vq->virtio_net_hdr_mz->phys_addr; memset(vq->virtio_net_hdr_mz->addr, 0, PAGE_SIZE); } diff --git a/lib/librte_pmd_virtio/virtqueue.h b/lib/librte_pmd_virtio/virtqueue.h index a63723d60b..e244199525 100644 --- a/lib/librte_pmd_virtio/virtqueue.h +++ b/lib/librte_pmd_virtio/virtqueue.h @@ -152,7 +152,7 @@ struct virtqueue { */ uint16_t vq_used_cons_idx; uint16_t vq_avail_idx; - void *virtio_net_hdr_mem; /**< hdr for each xmit packet */ + phys_addr_t virtio_net_hdr_mem; /**< hdr for each xmit packet */ struct vq_desc_extra { void *cookie; @@ -354,7 +354,8 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie) dxp->ndescs = needed; start_dp = txvq->vq_ring.desc; - start_dp[idx].addr = (uint64_t)(uintptr_t)txvq->virtio_net_hdr_mem + idx * sizeof(struct virtio_net_hdr); + start_dp[idx].addr = + txvq->virtio_net_hdr_mem + idx * sizeof(struct virtio_net_hdr); start_dp[idx].len = sizeof(struct virtio_net_hdr); start_dp[idx].flags = VRING_DESC_F_NEXT; idx = start_dp[idx].next; -- 2.20.1