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 BFC7646BAE for ; Fri, 18 Jul 2025 21:33:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9DD640611; Fri, 18 Jul 2025 21:33:32 +0200 (CEST) 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 06E7C40611 for ; Fri, 18 Jul 2025 21:33:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867210; 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=X4Asp8esjNgUg8IpZbwOeBVj8x6a55Ncy4+tKrcjh1Q=; b=X9ZoVAT+eky4Q5XQnGIAdxpSH3aUqfCSWDwWmrhhvQsrDIc2Xz034vtXN0IFSxeJaz1KMn 9xjB4syzQdnApxGujreErSk0eXs3UA1hcDQQFCU0sQfXaT01vMJXGB7cjJoJGbK+xr+Bv1 CIWF9EqZXKdOsxJZQydVMbh5L8alFoA= 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-651-PN0Y9rIiPwaTD2bQXHXPjQ-1; Fri, 18 Jul 2025 15:33:28 -0400 X-MC-Unique: PN0Y9rIiPwaTD2bQXHXPjQ-1 X-Mimecast-MFC-AGG-ID: PN0Y9rIiPwaTD2bQXHXPjQ_1752867208 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 1E8831800C34 for ; Fri, 18 Jul 2025 19:33:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2C1B6180045B; Fri, 18 Jul 2025 19:33:25 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix wrapping on control virtqueue rings' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:09 +0100 Message-ID: <20250718193247.1008129-15-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: rHOYfXZcd9cLcvd_yoXbafFp44rDz3b_G_ty9qCk31g_1752867208 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/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/3478fefb08e696ca8b4081872f16697c3e25129e Thanks. Kevin --- >From 3478fefb08e696ca8b4081872f16697c3e25129e Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 2 Apr 2025 08:53:58 +0200 Subject: [PATCH] vhost: fix wrapping on control virtqueue rings [ upstream commit 38e640038798da92d1b7daf953f06fcd116cb952 ] The idx field of a virtqueue available ring is increased by the driver regardless of the ring size. It is for the device to mask this index modulo the ring size (2.7.6 of the virtio 1.3 specification). The same applies to the used ring. Failing to mask triggers: - crashes when popping message received on the cvq, - system lockups (in the case of VDUSE) when the virtio-net driver waits infinitely, Fixes: 474f4d7840ad ("vhost: add control virtqueue") Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin Tested-by: Maxime Coquelin --- lib/vhost/virtio_net_ctrl.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/vhost/virtio_net_ctrl.c b/lib/vhost/virtio_net_ctrl.c index b8ee94018e..5d411fc248 100644 --- a/lib/vhost/virtio_net_ctrl.c +++ b/lib/vhost/virtio_net_ctrl.c @@ -41,5 +41,5 @@ virtio_net_ctrl_pop(struct virtio_net *dev, struct vhost_virtqueue *cvq, } - desc_idx = cvq->avail->ring[cvq->last_avail_idx]; + desc_idx = cvq->avail->ring[cvq->last_avail_idx & (cvq->size - 1)]; if (desc_idx >= cvq->size) { VHOST_CONFIG_LOG(dev->ifname, ERR, "Out of range desc index, dropping"); @@ -168,6 +168,4 @@ virtio_net_ctrl_pop(struct virtio_net *dev, struct vhost_virtqueue *cvq, cvq->last_avail_idx++; - if (cvq->last_avail_idx >= cvq->size) - cvq->last_avail_idx -= cvq->size; vhost_virtqueue_reconnect_log_split(cvq); @@ -181,6 +179,4 @@ free_err: err: cvq->last_avail_idx++; - if (cvq->last_avail_idx >= cvq->size) - cvq->last_avail_idx -= cvq->size; vhost_virtqueue_reconnect_log_split(cvq); @@ -232,11 +228,9 @@ virtio_net_ctrl_push(struct virtio_net *dev, struct virtio_net_ctrl_elem *ctrl_e struct vring_used_elem *used_elem; - used_elem = &cvq->used->ring[cvq->last_used_idx]; + used_elem = &cvq->used->ring[cvq->last_used_idx & (cvq->size - 1)]; used_elem->id = ctrl_elem->head_idx; used_elem->len = ctrl_elem->n_descs; cvq->last_used_idx++; - if (cvq->last_used_idx >= cvq->size) - cvq->last_used_idx -= cvq->size; rte_atomic_store_explicit((unsigned short __rte_atomic *)&cvq->used->idx, -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:11.644603097 +0100 +++ 0015-vhost-fix-wrapping-on-control-virtqueue-rings.patch 2025-07-18 20:29:10.819906991 +0100 @@ -1 +1 @@ -From 38e640038798da92d1b7daf953f06fcd116cb952 Mon Sep 17 00:00:00 2001 +From 3478fefb08e696ca8b4081872f16697c3e25129e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 38e640038798da92d1b7daf953f06fcd116cb952 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 999e84db7c..63c0a06b4f 100644 +index b8ee94018e..5d411fc248 100644