diff mbox

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

Message ID	1465800223-139122-2-git-send-email-jianfeng.tan@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	Yuanhan Liu
Headers	From: Jianfeng Tan <jianfeng.tan@intel.com> To: dev@dpdk.org Cc: Jianfeng Tan <jianfeng.tan@intel.com>, rich.lane@bigswitch.com, yuanhan.liu@linux.intel.com, mst@redhat.com, nakajima.yoshihiro@lab.ntt.co.jp, p.fedin@samsung.com, ann.zhuangyanying@huawei.com, mukawa@igel.co.jp, nhorman@tuxdriver.com Date: Mon, 13 Jun 2016 06:43:40 +0000 Message-Id: <1465800223-139122-2-git-send-email-jianfeng.tan@intel.com> In-Reply-To: <1465800223-139122-1-git-send-email-jianfeng.tan@intel.com> References: <1462438781-139674-1-git-send-email-jianfeng.tan@intel.com> <1465800223-139122-1-git-send-email-jianfeng.tan@intel.com> Subject: [dpdk-dev] [PATCH v2 1/4] virtio-user: use virtual address in cq Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>

Commit Message

Jianfeng Tan June 13, 2016, 6:43 a.m. UTC

  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 <jianfeng.tan@intel.com>
---
 drivers/net/virtio/virtio_ethdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Yuanhan Liu June 13, 2016, 10:19 a.m. UTC | #1

On Mon, Jun 13, 2016 at 06:43:40AM +0000, 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

diff mbox

Patch

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--;