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 B213E4625C for ; Tue, 18 Feb 2025 13:36:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ACA8B402A0; Tue, 18 Feb 2025 13:36:39 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2088.outbound.protection.outlook.com [40.107.101.88]) by mails.dpdk.org (Postfix) with ESMTP id C94DC402A0 for ; Tue, 18 Feb 2025 13:36:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aUSq8couQdTv29QN1J76jRkggHIIiguHkLDsTWS+ZIXy09o1uLJ75wrR4k3m+ekqN56wnTcVHWlxJcfYverUo/2CWN0sMMO1KW62iOxfDmhoJAWeybgv7SX2PsM29viqZWlydCJfU5yJM62+bxyrTbLo+ORYTz1XxJsERzpV1HEWiyAKx3falBgYVDG4FOQErSBwhKayF5pwTfov1D/WbtFXfjPFRVuNajf5mYPrUeQ9w/f8+tyQWEL/Jp5kD2sPDQ59GJuPa0Oxe9Z0E/dLXDIbjVP6aNq9MoRu1qrYYOz2r2lE/mitSoc4Gt7/pC+diZf7GH8P17YFQHk5Qi7ong== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hMkWOw78UQdhc/rgmKB/ir9tyYSn3RU6NiBZa6HKRBA=; b=B8D4HiR79xwV3F+Vg578Tlbb4xZ3so+5D/0ymNHnXk0hA/XdowiTr1s+F+Vlvuv20h8iYqIjEYPcwEKmIWviW/7RjoLf42T6APisAFRNWMmnEZxo7PQL6/UW1teAKY0kNYsMZs1BXyzHZPB8c8C9B9ialflt3Gos8KV6PxIAJju/ZAZkirYM1m+9ubU1t4qsC2fuGvZhIG8GDOet1KAexsgJtSrYAVIAzXshHZocnRU2xzkD/tZtogTtqz357IXAOi5cFj0/Wiyh18SmVyyvdXQBCcVyQknsvIMzfInd4t8yNUeuAL133/Ca0js/UkzrW/+WOAUDD3HPEPQ8fr1ODA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hMkWOw78UQdhc/rgmKB/ir9tyYSn3RU6NiBZa6HKRBA=; b=Ja8Uydwa/+QrfJPYl0ZMm1ADRt3x9yRr2kjXGD5HszoAz59xuzXPlqKJeEN1h0yOby9JHSk6oG81qMdzIyhTFZ6+jvRqYgng9GidL+S/0SGGKJs+1VNgOS4BCO/WtIeMI2uMxKpfnY2acjT+5CQIFEeIrNGV5k7rwXjF8sZJjS1cRmZtNJq4KMqBpc/0Ppsy8ZhUPor6ofl2gU8bCr1YPRh8JEI1ta4qbNStus3pLe6sY2rALtkpRG/TfJTReqsgtyzhDfWo6ot81S1WHMTNxpIL8S9DWugat7WTVUeErTLAwWyrADohdxJiCyx+q5i/a4RrWNEanFqvxumFxzJhcQ== Received: from BY3PR05CA0047.namprd05.prod.outlook.com (2603:10b6:a03:39b::22) by CY8PR12MB7730.namprd12.prod.outlook.com (2603:10b6:930:85::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.20; Tue, 18 Feb 2025 12:36:35 +0000 Received: from MWH0EPF000989EA.namprd02.prod.outlook.com (2603:10b6:a03:39b:cafe::47) by BY3PR05CA0047.outlook.office365.com (2603:10b6:a03:39b::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.12 via Frontend Transport; Tue, 18 Feb 2025 12:36:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by MWH0EPF000989EA.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:36:35 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:36:20 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:36:18 -0800 From: Xueming Li 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 23.11.4 Date: Tue, 18 Feb 2025 20:34:00 +0800 Message-ID: <20250218123523.36836-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EA:EE_|CY8PR12MB7730:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c5061b6-ca37-449a-44e4-08dd5018e1d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|376014|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pfo/D03HdD+M75FVSahhGEvheX/m3cOJymd5JYBEGPV3oKx8os1jge6+f8Gl?= =?us-ascii?Q?/Sz9n+acVd8K0Dut34xh4TemRhignGIPjvJfEK3p13Vi/T1/+8cSdvsDS1QW?= =?us-ascii?Q?7ucDLqsCu+FO3TQiIhDXJnaWioh0zq3prjKRauOozYU4PtUdhM9Rb8dOhgbK?= =?us-ascii?Q?LvvUJ8elsruTxv0GeJxJWAlPoSbpRnIShuayqG6nY7h2cv7YelUrSuy1c54a?= =?us-ascii?Q?OUqHVb1lKRZTIiGo2yvcWGXcgGAQk8vEEnyG4q5GtMuk8YOxX3dqAzRlmM3d?= =?us-ascii?Q?ly78fp802UcarwiEMPdNPhFaVonWyuxfuXA0EellMQnDSOu4j5AqRjOgN+Sn?= =?us-ascii?Q?vknhYDo+IM5ywUcPZw3jvhktXkBwj0MAKL6DM4UQFqe+WrmuJJH+znuDP637?= =?us-ascii?Q?OPFjG/PSpK+N7n4oNUL+nXUS0Pp/7M1Vb08ceDvw3FoiFlCpqSNrEEEtSLh6?= =?us-ascii?Q?Tu9uLW9JkLFAAhhuMzIKtQqqw/D1lKGbkbvuMlQ5hDSgLOx78+luf2yzxZ17?= =?us-ascii?Q?08oYKwtyMAkSeBpyffHMErrgbdHKXjSbhVFiVCeadp+v+ROO/M92xnuFqKJ3?= =?us-ascii?Q?Tj3LOOOYEREuIJCOfSuEVofIA/bZKfFmKNWNI6CBJhVHjSq0kT+LvyXOT/t2?= =?us-ascii?Q?inmhyhLRawZ3VY9TuxPYmU/CKH3X2t8MCx1eGqtqPPXGMR+6CJhf0Ur22a1m?= =?us-ascii?Q?+1usOEOb2RaOVkp8asRwVNOeyFycIbB3RxMHQmujekEK3TYVV3wYhlVmRy8H?= =?us-ascii?Q?I+xdkgZKol3CLsD99oEhKipgAjgPjkPJ7xEvqI/vGwZDTjh2qfDS3DKz+HUV?= =?us-ascii?Q?CkU9xCJmyccXvh5o3msOTF687dO5fSPbFt48t0e8ovgQgQecRKoZ/R2Nekls?= =?us-ascii?Q?/5gQTXc/Gh03ML8jh4bNvtXOOTtstEDfNPtWS7n6DFh7JvrecQfXF8BHW0o+?= =?us-ascii?Q?2NcMq0zzyr+gzpyT10WVLMU7b+xWmI7Vj4oevItHZ+627T6lPQ16GopR/wUg?= =?us-ascii?Q?t92RM+W1GrXC555rBjZ7KycBkyShqzgUfXZFnCOkVo8e2Lz05d/sADLNpEbr?= =?us-ascii?Q?CfAJGbuLD5dIvhDmnYqn2qz8CSminsCJoWpL/ZIKvlowmwHBremvojJB5mgM?= =?us-ascii?Q?ldghal9rJlpIgHo6aLBOsS4ea6Y4Pw2mERMP0VHcy2GWcumCOJRNbwAX4D8b?= =?us-ascii?Q?Y3M5fUlr1MAIUeN2d4ltJGoSO1mMKmbpmM8NR8n0fp4g2UC7y0s0bLcRADv4?= =?us-ascii?Q?P5RsNJAeBNXnFYWSXlbQ42HxsdskRu+jthM8NUwxa13o00xdN9kmKKt2W3OM?= =?us-ascii?Q?sIXv/yb3jexOK2zpV83kCOQJ0/xYMvlVlh+2jy+4/Wv+1ZJ+t5IJg3bmRfTE?= =?us-ascii?Q?x5cEEnB6fITBGsaFVyTsNMvyjWGqb43BCvrI5gxYfh7wVbD/9n58CyQUAwAD?= =?us-ascii?Q?WV/30gmAnNvp9Tyf3JKrLdrJANEocS5ni8SKsXzy+mIldZ6FuC4pUNt09+en?= =?us-ascii?Q?bTNFp6io5K+BcaE=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(376014)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:36:35.3410 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c5061b6-ca37-449a-44e4-08dd5018e1d1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000989EA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7730 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=d1e77f15819cfb99a5e655c0e36db6d3534efb21 Thanks. Xueming Li --- >From d1e77f15819cfb99a5e655c0e36db6d3534efb21 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 Cc: Xueming Li [ 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 25adf94ffa..d81b518462 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -3601,6 +3601,8 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, rte_rwlock_read_unlock(&vq->access_lock); virtio_dev_vring_translate(dev, vq); + + count = 0; goto out_no_unlock; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:00.932503295 +0800 +++ 0005-vhost-reset-packets-count-when-not-ready.patch 2025-02-18 19:39:00.408244086 +0800 @@ -1 +1 @@ -From 8b96508af6021d868052545a76ef2ce5219b7702 Mon Sep 17 00:00:00 2001 +From d1e77f15819cfb99a5e655c0e36db6d3534efb21 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8b96508af6021d868052545a76ef2ce5219b7702 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 2ac5bc29a3..d85c0c9d42 100644 +index 25adf94ffa..d81b518462 100644 @@ -25 +27 @@ -@@ -3632,6 +3632,8 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, +@@ -3601,6 +3601,8 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,