From patchwork Thu Feb 29 13:29:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srujana Challa X-Patchwork-Id: 137496 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 62C2B43C1D; Thu, 29 Feb 2024 14:29:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE98942DC5; Thu, 29 Feb 2024 14:29:35 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id B261E42D72 for ; Thu, 29 Feb 2024 14:29:34 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41T83J1Y022467; Thu, 29 Feb 2024 05:29:34 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= pfpt0220; bh=IcpGbQMyx5R+I92zPB0tcZ4NqMugV86u0ncTHVjfbOM=; b=VdM Qri21scSd0SuKW02AckM3KLHsa9vwQ7+KHA1/8HYcd/I1IocLz/YtokgUe42U4SV ox0/qVY1HSK0rt2sltqKc/5+yP8m4g1/00ZtayW8WABYa9hKObdoDXJNWobtoSKc Qcz1jwVz8N8Zjn/jEgyoWzooqTYwIbF4NnwuoqQwtlh1pRHnfF2/xLGzYNiRfHb0 3CZ+zlIOtTTFBcyCYpI+zm+hCE84XkEhSeVxIsiYaP0hEYos6m92N0NxPmwZuZKN fJJNQcrGZJWFakPRC5p3TrV63ihLx2gMI5J2fpjT8HqE0tvnECEVTtvJAN7IDQAA 4VPuGT7M5Wf1qVJsKVg== Received: from dc6wp-exch02.marvell.com ([4.21.29.225]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3wjp2y91jw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Feb 2024 05:29:33 -0800 (PST) Received: from DC6WP-EXCH02.marvell.com (10.76.176.209) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 29 Feb 2024 05:29:32 -0800 Received: from maili.marvell.com (10.69.176.80) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 29 Feb 2024 05:29:32 -0800 Received: from localhost.localdomain (unknown [10.28.36.175]) by maili.marvell.com (Postfix) with ESMTP id EB3C23F7252; Thu, 29 Feb 2024 05:29:29 -0800 (PST) From: Srujana Challa To: , , CC: , , , Subject: [PATCH v2 3/3] net/virtio_user: support sharing vq descriptor IOVA to the backend Date: Thu, 29 Feb 2024 18:59:19 +0530 Message-ID: <20240229132919.2186118-4-schalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240229132919.2186118-1-schalla@marvell.com> References: <20240229132919.2186118-1-schalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: JH7jnHffq6LmbGe8K2gjgNM6mYQcUQ47 X-Proofpoint-ORIG-GUID: JH7jnHffq6LmbGe8K2gjgNM6mYQcUQ47 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-29_02,2024-02-29_01,2023-05-22_02 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 Adds support to share descriptor IOVA to the vhost backend. This makes virtio_user driver works in IOVA as PA mode when use_va flag is disabled. This patch also disables use_va flag for VDPA backend. Signed-off-by: Srujana Challa --- .../net/virtio/virtio_user/virtio_user_dev.c | 26 ++++++++++++------- drivers/net/virtio/virtio_user_ethdev.c | 10 ++++++- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index bf3da4340f..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; 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) {