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 716BA48A44 for ; Fri, 31 Oct 2025 15:38:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B24D4067B; Fri, 31 Oct 2025 15:38:17 +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 E1F7840150 for ; Fri, 31 Oct 2025 15:38:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921495; 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; bh=O1zuUQMWmVHCxq247sVktvpHFXur5wH4nMfrUtl3Snw=; b=JYJBgOXh1C9OwDh0WXZRC1GKMTI4TfOEX47AKTJjOqJ2D2/228DJ90cO7bnD8nNuWRXFV2 rQq6qC4aR/7wu/rNwxsJb2kZyo+ECyIYy/DgaFX8nanHG8o2PFzaKurmatVbzgnGGlHHr+ 550XzhhGDNhpZuoqATtmO/Nld84H8Jc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-255-KTB24FwPNWShsRqiRFZBHg-1; Fri, 31 Oct 2025 10:38:14 -0400 X-MC-Unique: KTB24FwPNWShsRqiRFZBHg-1 X-Mimecast-MFC-AGG-ID: KTB24FwPNWShsRqiRFZBHg_1761921493 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 676B11800345 for ; Fri, 31 Oct 2025 14:38:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 84FD1180057E; Fri, 31 Oct 2025 14:38:11 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Adrian Moreno , David Marchand , dpdk stable Subject: patch 'net/virtio-user: fix used ring address calculation' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:33:17 +0000 Message-ID: <20251031143421.324432-75-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 2CpcztXHSVHU1F82H8KfrthBEhDRQnBS3rvQOlWEElk_1761921493 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ea4cd024fda598469109db671eb09aa1796cf4c8 Thanks. Kevin --- >From ea4cd024fda598469109db671eb09aa1796cf4c8 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Tue, 7 Oct 2025 16:47:54 +0200 Subject: [PATCH] net/virtio-user: fix used ring address calculation [ upstream commit 7aa71d336c18bac0c942018819043a5420a5b160 ] This patch fixes the used ring address calculation, to avoid Vhost-vDPA backends (such as VDUSE) to fail while trying to translate it. Fixes: 666ef294ddf7 ("net/virtio-user: share descriptor IOVA to backend") Reported-by: Adrian Moreno Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- .../net/virtio/virtio_user/virtio_user_dev.c | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index 2997d2bd26..2642ecf893 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -119,5 +119,5 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel) 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; + uint64_t desc_addr, desc_iova_addr, avail_addr, used_addr; struct vhost_vring_addr addr = { .index = queue_sel, @@ -139,23 +139,19 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel) if (dev->features & (1ULL << VIRTIO_F_RING_PACKED)) { - 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; + desc_iova_addr = pq_vring->desc_iova; + desc_addr = (uint64_t)(uintptr_t)pq_vring->desc; + avail_addr = (uint64_t)(uintptr_t)pq_vring->driver; + used_addr = (uint64_t)(uintptr_t)pq_vring->device; } else { - 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; + desc_iova_addr = vring->desc_iova; + desc_addr = (uint64_t)(uintptr_t)vring->desc; + avail_addr = (uint64_t)(uintptr_t)vring->avail; + used_addr = (uint64_t)(uintptr_t)vring->used; } + addr.desc_user_addr = desc_iova_addr; + addr.avail_user_addr = (desc_iova_addr - desc_addr) + avail_addr; + addr.used_user_addr = (desc_iova_addr - desc_addr) + used_addr; + state.index = queue_sel; state.num = vring->num; -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:54.517566209 +0000 +++ 0075-net-virtio-user-fix-used-ring-address-calculation.patch 2025-10-31 13:53:52.176523805 +0000 @@ -1 +1 @@ -From 7aa71d336c18bac0c942018819043a5420a5b160 Mon Sep 17 00:00:00 2001 +From ea4cd024fda598469109db671eb09aa1796cf4c8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7aa71d336c18bac0c942018819043a5420a5b160 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 187f81b066..f3df73c1f0 100644 +index 2997d2bd26..2642ecf893 100644