From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4EBCC43BFF; Tue, 27 Feb 2024 09:56:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 17B9B4027D; Tue, 27 Feb 2024 09:56:30 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 2817B40150 for ; Tue, 27 Feb 2024 09:56:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709024188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=8tCJE2dCiWO6JhE0opf4KqaTJXwu/KrxEAxIUZQwfhk=; b=eGxF6mggGGDGV3phMFFaz1iQlghufQnewcPlDI2rWYjUczuM1BDq0zvkLPe3HGh5vJI/Dx 4rc28P2VbKJPRdcJdJNIwOMxbPdQcqZk/awnF6s3RRSGrAP805fqXFoXhtwbRsJhpc5nGQ Q2pWpT+rlQ7jvcGjVCiV+HMqzPMkmY0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-217-zyydWslNNROFShG4QVKfvw-1; Tue, 27 Feb 2024 03:56:25 -0500 X-MC-Unique: zyydWslNNROFShG4QVKfvw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 807761C05122; Tue, 27 Feb 2024 08:56:24 +0000 (UTC) Received: from [10.39.208.20] (unknown [10.39.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D85A2026D06; Tue, 27 Feb 2024 08:56:22 +0000 (UTC) Message-ID: <572889e4-47c7-4cb1-ad94-810d2cccf831@redhat.com> Date: Tue, 27 Feb 2024 09:56:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] net/virtio-user: support IOVA as PA mode for vDPA backend To: Srujana Challa , dev@dpdk.org, chenbox@nvidia.com Cc: jerinj@marvell.com, ndabilpuram@marvell.com, vattunuru@marvell.com References: <20240227055635.2135782-1-schalla@marvell.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= In-Reply-To: <20240227055635.2135782-1-schalla@marvell.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Hi Srujana, On 2/27/24 06:56, Srujana Challa wrote: > Disable use_va flag for VDPA backend type and fixes the issues > with shadow control command processing, when it is disabled. > This will help to make virtio user driver works in IOVA > as PA mode for vDPA backend. It is too late for v24.03, but a couple of comments: 1. That's the 3rd time this patch is sent, if new versions please specify it in the commit title, and also provide some change logs. 2. I just had a quick look, but it looks like it would deserve several patches. Thanks, Maxime > Signed-off-by: Srujana Challa > --- > drivers/net/virtio/virtio_ring.h | 12 ++- > .../net/virtio/virtio_user/virtio_user_dev.c | 94 ++++++++++--------- > drivers/net/virtio/virtio_user_ethdev.c | 10 +- > drivers/net/virtio/virtqueue.c | 4 +- > 4 files changed, 69 insertions(+), 51 deletions(-) > > diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h > index e848c0b73b..998605dbb5 100644 > --- a/drivers/net/virtio/virtio_ring.h > +++ b/drivers/net/virtio/virtio_ring.h > @@ -83,6 +83,7 @@ struct vring_packed_desc_event { > > struct vring_packed { > unsigned int num; > + rte_iova_t desc_iova; > struct vring_packed_desc *desc; > struct vring_packed_desc_event *driver; > struct vring_packed_desc_event *device; > @@ -90,6 +91,7 @@ struct vring_packed { > > struct vring { > unsigned int num; > + rte_iova_t desc_iova; > struct vring_desc *desc; > struct vring_avail *avail; > struct vring_used *used; > @@ -149,11 +151,12 @@ vring_size(struct virtio_hw *hw, unsigned int num, unsigned long align) > return size; > } > static inline void > -vring_init_split(struct vring *vr, uint8_t *p, unsigned long align, > - unsigned int num) > +vring_init_split(struct vring *vr, uint8_t *p, rte_iova_t iova, > + unsigned long align, unsigned int num) > { > vr->num = num; > vr->desc = (struct vring_desc *) p; > + vr->desc_iova = iova; > vr->avail = (struct vring_avail *) (p + > num * sizeof(struct vring_desc)); > vr->used = (void *) > @@ -161,11 +164,12 @@ vring_init_split(struct vring *vr, uint8_t *p, unsigned long align, > } > > static inline void > -vring_init_packed(struct vring_packed *vr, uint8_t *p, unsigned long align, > - unsigned int num) > +vring_init_packed(struct vring_packed *vr, uint8_t *p, rte_iova_t iova, > + unsigned long align, unsigned int num) > { > vr->num = num; > vr->desc = (struct vring_packed_desc *)p; > + vr->desc_iova = iova; > vr->driver = (struct vring_packed_desc_event *)(p + > vr->num * sizeof(struct vring_packed_desc)); > vr->device = (struct vring_packed_desc_event *) > diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c > index d395fc1676..8ad10e6354 100644 > --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c > +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c > @@ -62,6 +62,7 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel) > struct vhost_vring_state state; > struct vring *vring = &dev->vrings.split[queue_sel]; > struct vring_packed *pq_vring = &dev->vrings.packed[queue_sel]; > + uint64_t desc_addr, avail_addr, used_addr; > struct vhost_vring_addr addr = { > .index = queue_sel, > .log_guest_addr = 0, > @@ -81,16 +82,23 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel) > } > > if (dev->features & (1ULL << VIRTIO_F_RING_PACKED)) { > - addr.desc_user_addr = > - (uint64_t)(uintptr_t)pq_vring->desc; > - addr.avail_user_addr = > - (uint64_t)(uintptr_t)pq_vring->driver; > - addr.used_user_addr = > - (uint64_t)(uintptr_t)pq_vring->device; > + desc_addr = pq_vring->desc_iova; > + avail_addr = desc_addr + pq_vring->num * sizeof(struct vring_packed_desc); > + used_addr = RTE_ALIGN_CEIL(avail_addr + sizeof(struct vring_packed_desc_event), > + VIRTIO_VRING_ALIGN); > + > + addr.desc_user_addr = desc_addr; > + addr.avail_user_addr = avail_addr; > + addr.used_user_addr = used_addr; > } else { > - addr.desc_user_addr = (uint64_t)(uintptr_t)vring->desc; > - addr.avail_user_addr = (uint64_t)(uintptr_t)vring->avail; > - addr.used_user_addr = (uint64_t)(uintptr_t)vring->used; > + desc_addr = vring->desc_iova; > + avail_addr = desc_addr + vring->num * sizeof(struct vring_desc); > + used_addr = RTE_ALIGN_CEIL((uintptr_t)(&vring->avail->ring[vring->num]), > + VIRTIO_VRING_ALIGN); > + > + addr.desc_user_addr = desc_addr; > + addr.avail_user_addr = avail_addr; > + addr.used_user_addr = used_addr; > } > > state.index = queue_sel; > @@ -885,11 +893,11 @@ static uint32_t > virtio_user_handle_ctrl_msg_split(struct virtio_user_dev *dev, struct vring *vring, > uint16_t idx_hdr) > { > - struct virtio_net_ctrl_hdr *hdr; > virtio_net_ctrl_ack status = ~0; > - uint16_t i, idx_data, idx_status; > + uint16_t i, idx_data; > uint32_t n_descs = 0; > int dlen[CVQ_MAX_DATA_DESCS], nb_dlen = 0; > + struct virtio_pmd_ctrl *ctrl; > > /* locate desc for header, data, and status */ > idx_data = vring->desc[idx_hdr].next; > @@ -902,34 +910,33 @@ virtio_user_handle_ctrl_msg_split(struct virtio_user_dev *dev, struct vring *vri > n_descs++; > } > > - /* locate desc for status */ > - idx_status = i; > n_descs++; > > - hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr; > - if (hdr->class == VIRTIO_NET_CTRL_MQ && > - hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) { > - uint16_t queues; > + /* Access control command via VA from CVQ */ > + ctrl = (struct virtio_pmd_ctrl *)dev->hw.cvq->hdr_mz->addr; > + if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ && > + ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) { > + uint16_t *queues; > > - queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr; > - status = virtio_user_handle_mq(dev, queues); > - } else if (hdr->class == VIRTIO_NET_CTRL_MQ && hdr->cmd == VIRTIO_NET_CTRL_MQ_RSS_CONFIG) { > + queues = (uint16_t *)ctrl->data; > + status = virtio_user_handle_mq(dev, *queues); > + } else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ && > + ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_RSS_CONFIG) { > struct virtio_net_ctrl_rss *rss; > > - rss = (struct virtio_net_ctrl_rss *)(uintptr_t)vring->desc[idx_data].addr; > + rss = (struct virtio_net_ctrl_rss *)ctrl->data; > status = virtio_user_handle_mq(dev, rss->max_tx_vq); > - } else if (hdr->class == VIRTIO_NET_CTRL_RX || > - hdr->class == VIRTIO_NET_CTRL_MAC || > - hdr->class == VIRTIO_NET_CTRL_VLAN) { > + } else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX || > + ctrl->hdr.class == VIRTIO_NET_CTRL_MAC || > + ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) { > status = 0; > } > > if (!status && dev->scvq) > - status = virtio_send_command(&dev->scvq->cq, > - (struct virtio_pmd_ctrl *)hdr, dlen, nb_dlen); > + status = virtio_send_command(&dev->scvq->cq, ctrl, dlen, nb_dlen); > > /* Update status */ > - *(virtio_net_ctrl_ack *)(uintptr_t)vring->desc[idx_status].addr = status; > + ctrl->status = status; > > return n_descs; > } > @@ -948,7 +955,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev, > struct vring_packed *vring, > uint16_t idx_hdr) > { > - struct virtio_net_ctrl_hdr *hdr; > + struct virtio_pmd_ctrl *ctrl; > virtio_net_ctrl_ack status = ~0; > uint16_t idx_data, idx_status; > /* initialize to one, header is first */ > @@ -971,32 +978,31 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev, > n_descs++; > } > > - hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr; > - if (hdr->class == VIRTIO_NET_CTRL_MQ && > - hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) { > - uint16_t queues; > + /* Access control command via VA from CVQ */ > + ctrl = (struct virtio_pmd_ctrl *)dev->hw.cvq->hdr_mz->addr; > + if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ && > + ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) { > + uint16_t *queues; > > - queues = *(uint16_t *)(uintptr_t) > - vring->desc[idx_data].addr; > - status = virtio_user_handle_mq(dev, queues); > - } else if (hdr->class == VIRTIO_NET_CTRL_MQ && hdr->cmd == VIRTIO_NET_CTRL_MQ_RSS_CONFIG) { > + queues = (uint16_t *)ctrl->data; > + status = virtio_user_handle_mq(dev, *queues); > + } else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ && > + ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_RSS_CONFIG) { > struct virtio_net_ctrl_rss *rss; > > - rss = (struct virtio_net_ctrl_rss *)(uintptr_t)vring->desc[idx_data].addr; > + rss = (struct virtio_net_ctrl_rss *)ctrl->data; > status = virtio_user_handle_mq(dev, rss->max_tx_vq); > - } else if (hdr->class == VIRTIO_NET_CTRL_RX || > - hdr->class == VIRTIO_NET_CTRL_MAC || > - hdr->class == VIRTIO_NET_CTRL_VLAN) { > + } else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX || > + ctrl->hdr.class == VIRTIO_NET_CTRL_MAC || > + ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) { > status = 0; > } > > if (!status && dev->scvq) > - status = virtio_send_command(&dev->scvq->cq, > - (struct virtio_pmd_ctrl *)hdr, dlen, nb_dlen); > + status = virtio_send_command(&dev->scvq->cq, ctrl, dlen, nb_dlen); > > /* Update status */ > - *(virtio_net_ctrl_ack *)(uintptr_t) > - vring->desc[idx_status].addr = status; > + ctrl->status = status; > > /* Update used descriptor */ > vring->desc[idx_hdr].id = vring->desc[idx_status].id; > diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c > index bf9de36d8f..ae6593ba0b 100644 > --- a/drivers/net/virtio/virtio_user_ethdev.c > +++ b/drivers/net/virtio/virtio_user_ethdev.c > @@ -198,6 +198,7 @@ virtio_user_setup_queue_packed(struct virtqueue *vq, > sizeof(struct vring_packed_desc_event), > VIRTIO_VRING_ALIGN); > vring->num = vq->vq_nentries; > + vring->desc_iova = vq->vq_ring_mem; > vring->desc = (void *)(uintptr_t)desc_addr; > vring->driver = (void *)(uintptr_t)avail_addr; > vring->device = (void *)(uintptr_t)used_addr; > @@ -221,6 +222,7 @@ virtio_user_setup_queue_split(struct virtqueue *vq, struct virtio_user_dev *dev) > VIRTIO_VRING_ALIGN); > > dev->vrings.split[queue_idx].num = vq->vq_nentries; > + dev->vrings.split[queue_idx].desc_iova = vq->vq_ring_mem; > dev->vrings.split[queue_idx].desc = (void *)(uintptr_t)desc_addr; > dev->vrings.split[queue_idx].avail = (void *)(uintptr_t)avail_addr; > dev->vrings.split[queue_idx].used = (void *)(uintptr_t)used_addr; > @@ -689,7 +691,13 @@ virtio_user_pmd_probe(struct rte_vdev_device *vdev) > * Virtio-user requires using virtual addresses for the descriptors > * buffers, whatever other devices require > */ > - hw->use_va = true; > + if (backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA) > + /* VDPA backend requires using iova for the buffers to make it > + * work in IOVA as PA mode also. > + */ > + hw->use_va = false; > + else > + hw->use_va = true; > > /* previously called by pci probing for physical dev */ > if (eth_virtio_dev_init(eth_dev) < 0) { > diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c > index 6f419665f1..cf46abfd06 100644 > --- a/drivers/net/virtio/virtqueue.c > +++ b/drivers/net/virtio/virtqueue.c > @@ -282,13 +282,13 @@ virtio_init_vring(struct virtqueue *vq) > vq->vq_free_cnt = vq->vq_nentries; > memset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries); > if (virtio_with_packed_queue(vq->hw)) { > - vring_init_packed(&vq->vq_packed.ring, ring_mem, > + vring_init_packed(&vq->vq_packed.ring, ring_mem, vq->vq_ring_mem, > VIRTIO_VRING_ALIGN, size); > vring_desc_init_packed(vq, size); > } else { > struct vring *vr = &vq->vq_split.ring; > > - vring_init_split(vr, ring_mem, VIRTIO_VRING_ALIGN, size); > + vring_init_split(vr, ring_mem, vq->vq_ring_mem, VIRTIO_VRING_ALIGN, size); > vring_desc_init_split(vr->desc, size); > } > /*