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 D80C546211 for ; Thu, 13 Feb 2025 11:00:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D320140287; Thu, 13 Feb 2025 11:00:05 +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 CA99740287 for ; Thu, 13 Feb 2025 11:00:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440804; 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=bIpz3Fom8tj0xr+jG5RMbddix60gsRUGu0QzpYWdWKs=; b=FiPwAfrLZSpPbzjJopFR7sumwmSC0NpTEx7zwQlyWRQOR76ooZ2hsqWleNGxi84DIYx61i R31ajoqf8PENbS7ZxgDxPdGyxB9Fx1SbY7Eon1uD9z5zOfQ44e/9QlhyOTTKR56VGo+4XX dHE3uXCMVJ9Uv/dI9fO6yKKDETxXF5g= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-575-I3kKLx-ANrWJtRzANDjCDQ-1; Thu, 13 Feb 2025 05:00:00 -0500 X-MC-Unique: I3kKLx-ANrWJtRzANDjCDQ-1 X-Mimecast-MFC-AGG-ID: I3kKLx-ANrWJtRzANDjCDQ 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1133718EB2D3; Thu, 13 Feb 2025 10:00:00 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D23231800872; Thu, 13 Feb 2025 09:59:57 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: David Marchand , Chenbo Xia , dpdk stable Subject: patch 'vhost: reset packets count when not ready' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:57:33 +0000 Message-ID: <20250213095933.362078-6-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-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: TJKh3bmGCY9-D2OJM9JVJ6kc1RyWaC-MzXPBUIptvm8_1739440800 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/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/5198bb13959d8cdaafac0a3ef0b9f1ecfbc14792 Thanks. Kevin --- >From 5198bb13959d8cdaafac0a3ef0b9f1ecfbc14792 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 16 Jan 2025 10:54:14 +0100 Subject: [PATCH] vhost: reset packets count when not ready [ upstream commit 8b96508af6021d868052545a76ef2ce5219b7702 ] This patch fixes the rte_vhost_dequeue_burst return value when the virtqueue is not ready. Without it, a discrepancy between the packet array and its size is faced by the caller of this API when the virtqueue is not ready. Fixes: 9fc93a1e2320 ("vhost: fix virtqueue access check in datapath") Signed-off-by: Maxime Coquelin Reviewed-by: David Marchand Reviewed-by: Chenbo Xia --- lib/vhost/virtio_net.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index 2ac5bc29a3..d85c0c9d42 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -3633,4 +3633,6 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, virtio_dev_vring_translate(dev, vq); + + count = 0; goto out_no_unlock; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:35.297422934 +0000 +++ 0006-vhost-reset-packets-count-when-not-ready.patch 2025-02-12 17:29:34.132944629 +0000 @@ -1 +1 @@ -From 8b96508af6021d868052545a76ef2ce5219b7702 Mon Sep 17 00:00:00 2001 +From 5198bb13959d8cdaafac0a3ef0b9f1ecfbc14792 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8b96508af6021d868052545a76ef2ce5219b7702 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org