[dpdk-dev] [PATCH v2 1/4] virtio-user: use virtual address in cq

[Yuanhan Liu]

On Mon, Jun 13, 2016 at 06:43:40AM +, Jianfeng Tan wrote:
> Change to use virtio_net_hdr_mem instead of physical addr of memzone
> when sending contrl queue commands. The virtio_net_hdr_mem has been
> initialized to use virtual address under the case of virtio-user.

I'd suggest to squash this patch to "[PATCH v8 2/6] virtio: enable use
virtual address to fill desc". There is really no good reason to make 2
patches to do same/similar thing.

--yliu

[dpdk-dev] [PATCH v2 1/4] virtio-user: use virtual address in cq

[Jianfeng Tan]

Change to use virtio_net_hdr_mem instead of physical addr of memzone
when sending contrl queue commands. The virtio_net_hdr_mem has been
initialized to use virtual address under the case of virtio-user.

Signed-off-by: Jianfeng Tan 
---
 drivers/net/virtio/virtio_ethdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index 4523ceb..86ea07a 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -187,14 +187,14 @@ virtio_send_command(struct virtnet_ctl *cvq, struct 
virtio_pmd_ctrl *ctrl,
 * One RX packet for ACK.
 */
vq->vq_ring.desc[head].flags = VRING_DESC_F_NEXT;
-   vq->vq_ring.desc[head].addr = cvq->virtio_net_hdr_mz->phys_addr;
+   vq->vq_ring.desc[head].addr = cvq->virtio_net_hdr_mem;
vq->vq_ring.desc[head].len = sizeof(struct virtio_net_ctrl_hdr);
vq->vq_free_cnt--;
i = vq->vq_ring.desc[head].next;

for (k = 0; k < pkt_num; k++) {
vq->vq_ring.desc[i].flags = VRING_DESC_F_NEXT;
-   vq->vq_ring.desc[i].addr = cvq->virtio_net_hdr_mz->phys_addr
+   vq->vq_ring.desc[i].addr = cvq->virtio_net_hdr_mem
+ sizeof(struct virtio_net_ctrl_hdr)
+ sizeof(ctrl->status) + sizeof(uint8_t)*sum;
vq->vq_ring.desc[i].len = dlen[k];
@@ -204,7 +204,7 @@ virtio_send_command(struct virtnet_ctl *cvq, struct 
virtio_pmd_ctrl *ctrl,
}

vq->vq_ring.desc[i].flags = VRING_DESC_F_WRITE;
-   vq->vq_ring.desc[i].addr = cvq->virtio_net_hdr_mz->phys_addr
+   vq->vq_ring.desc[i].addr = cvq->virtio_net_hdr_mem
+ sizeof(struct virtio_net_ctrl_hdr);
vq->vq_ring.desc[i].len = sizeof(ctrl->status);
vq->vq_free_cnt--;
-- 
2.1.4