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 9CA6E428F8 for ; Sun, 9 Apr 2023 17:27:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93BA840A80; Sun, 9 Apr 2023 17:27:16 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2055.outbound.protection.outlook.com [40.107.92.55]) by mails.dpdk.org (Postfix) with ESMTP id E291C40141 for ; Sun, 9 Apr 2023 17:27:14 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TDr2AZqAw/2TNXPQmlIvxMCqGp9nmtX9bqgMbC54Xg0g76ccWXljFvqNq7Nds8ubn+NBzuOlXNr5jMDyMf160FohzE2vJWNWvIkO48lLWjNB9xdlCYDOEzYLX3A4r5YLbDTglqLLW4GVh3qpgBSzxpKoqNEEZPzYo7R7COSEQIgh5MuqsyJZuvmJSfVJjBu67eFN9SwC28BsH7rLf0hr3AfKRSvqyQWfrVHlhRV4Q9cosfWOHejeOcG+R41TtXqAvcQh7LjwHUk8RsiNIuXN2kxCw8qRv2pma4YpFOq7rdkVO1DtIm02W27iKzbLfNbmNSYEVINIPaeZeEYkg8EEhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=JW2VMtGGei9GYcVYGRUjJVXi7mVRAChV2p3Wz3XcSWU=; b=dCbSKJVvn2Q2drQ3n/nAlduBkpUWVd1FyIE9aZFoFJgz8+loD9EpDGnUU7q2CWh7mcn9XcgG7c4+J4Ax6Ecb+TYV8v9/BS5hJ2/QnhGzmuA1fvUQ2c0masopWxX/wfwPGDkl9/UI6k3LvrX3/KTBc2u/XSeupaE3nDlz1w07zQo66v97U3SJzOtrIuQuh9chhuIbueGoBNIeWE8ExS1BADnWhhUB2vMGyWu3CQK7bxjjIGUjgCL3DECHgLDBKoUQc6WHrw8dzczgIEDZJSWp/1uxXWF/mmj+dKmIsi11dPM7mtl6rHn7p8Fq9gSY33G9NxUnyz0IbtbJCbNUkkrHmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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 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=JW2VMtGGei9GYcVYGRUjJVXi7mVRAChV2p3Wz3XcSWU=; b=bAGxR+O0edMN5j9rXjRG66VzTEkG15arHKKK6O/c2y9C2s75fDQIf9nRStjufrb+C9UtwBvPV9BXFVU/evwQmUOVVCbMXD+xL4y6it98KYdFi5bPLYhAmb6C0mjMNkoOLkSDbxumYHznMqXwvnHXSUvI4IaQm9Rs8CLkhXEy+BgApt+/kqnjlF7gr5ie0pnT6jZ5j0D1bEq24OmJI/ac8at4S/22eNOajHjrIz3awEcyKCzcyv8182sDukyivD6LJZm2A9W9C3CItztejhCueTAax1vj8v64Vsf4WUpoYwqQB04pTfNdgqOmuettPVmEMrwLo/QydO7asIXlnCsACg== Received: from BN0PR02CA0053.namprd02.prod.outlook.com (2603:10b6:408:e5::28) by BN9PR12MB5067.namprd12.prod.outlook.com (2603:10b6:408:134::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:27:11 +0000 Received: from BN8NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::13) by BN0PR02CA0053.outlook.office365.com (2603:10b6:408:e5::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34 via Frontend Transport; Sun, 9 Apr 2023 15:27:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT006.mail.protection.outlook.com (10.13.177.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.21 via Frontend Transport; Sun, 9 Apr 2023 15:27:10 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:27:04 -0700 Received: from nvidia.com (10.126.230.37) 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.986.37; Sun, 9 Apr 2023 08:27:02 -0700 From: Xueming Li To: Cheng Jiang CC: Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix slot index in async split virtqueue Tx' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:24 +0800 Message-ID: <20230409152529.5308-17-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT006:EE_|BN9PR12MB5067:EE_ X-MS-Office365-Filtering-Correlation-Id: 05b5216e-0b69-4a84-3113-08db390ee310 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3phCHd77SDmSC/ubYKX+WPyfWEMG0Ip8lpbAO7fH8BAixYJpSfXfal42yrhAHRQwIitAb2N5W1mAj4Yyt+C1NuwZtlWVxtcguEepvkMBT70W4cVvu0FpIIR0vQNs+jxivaQxECvgfZaKNGCzhcbBTBPo5bqgx/nUPsOuy9yu2PXAn+d1iLkPtJWVIVKKvtDwrF9e32WWY5u3hlkS+1Xi+m/NX+ZBZL5n5zLm6PKEgBlTAQ4qWviQ9+PRTOoxl3ywynTBW6UyGmY1r04Hl8KMw/GRK+7tvh2/qF0B85Z0ZiwqPn1frgV/xAtAenSARlTsit7XPjHnDnAX8N+q8+yfROl4domi/fSpanIIBDLSk30LpsrLuhNWzIqymtuw4OiZSQKwJxvxzXtmWhZL1+fWTK3ps6qzWrbGcRPG653IAEmXBWP8X2JuXdAWklau4eeExbqgDY2wLrrJQABwisyA6s7rf5xJQ5VI/9AE2z4BfUKDLUn1B/bJxV6ycOYfO/LRgQH+bGoUR2y2VBdTQSIxL9OvblzTNq7uUJZqIS1JjASrmt/Wy3xijAKS8uZ4Bzg8H3FWDt41J4p9UIn+OZE7lpdo9EoZNqtvBT9cb/LTiRdILzE1a9rVsgYGbG6PJxfn/wJNT/ZmH2o5LJC2Q2HhXEA9zdwtB6sB8nHUkhN9fMMvqig9nEC8f7h6ThNem9L3/Cl62+JygEgtxyqTBhCDeF/s3ek/VfHVpB9UPaT8PhuQCVZq0UV+EDsPZmKKuHYLSpOhrAC4Fep2TQhsmniMRpedu7LuLwQSmQKI1KBGpfrNv4qFYPuUS+kOLtNNfR3XbSWomeZqjRCx2M4cfk4mLw== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(39860400002)(376002)(451199021)(46966006)(36840700001)(40470700004)(478600001)(7696005)(54906003)(316002)(53546011)(1076003)(26005)(16526019)(6286002)(186003)(966005)(6666004)(2906002)(4326008)(70586007)(70206006)(8676002)(6916009)(41300700001)(8936002)(5660300002)(82310400005)(7636003)(356005)(82740400003)(86362001)(55016003)(40480700001)(36756003)(40460700003)(47076005)(2616005)(426003)(336012)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:27:10.2839 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 05b5216e-0b69-4a84-3113-08db390ee310 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5067 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 22.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 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/a6d0c8f6aa03e6d60e416bd2301cc877fb976860 Thanks. Xueming Li --- >From a6d0c8f6aa03e6d60e416bd2301cc877fb976860 Mon Sep 17 00:00:00 2001 From: Cheng Jiang Date: Thu, 23 Feb 2023 02:30:32 +0000 Subject: [PATCH] vhost: fix slot index in async split virtqueue Tx Cc: Xueming Li [ upstream commit baac7d2c41823060b06b8ceddb76f5cfbd17aa51 ] The slot_idx in the asynchronous Vhost split virtqueue dequeue data path is supposed to be decreased by 1 when desc_to_mbuf() fails. Fixes: 84d5204310d7 ("vhost: support async dequeue for split ring") Signed-off-by: Cheng Jiang Reviewed-by: Maxime Coquelin --- lib/vhost/virtio_net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index a3dbf8cb10..26f184f8b2 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -3476,6 +3476,7 @@ virtio_dev_tx_async_split(struct virtio_net *dev, struct vhost_virtqueue *vq, allocerr_warned = true; } dropped = true; + slot_idx--; break; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.247944400 +0800 +++ 0016-vhost-fix-slot-index-in-async-split-virtqueue-Tx.patch 2023-04-09 21:45:38.599042200 +0800 @@ -1 +1 @@ -From baac7d2c41823060b06b8ceddb76f5cfbd17aa51 Mon Sep 17 00:00:00 2001 +From a6d0c8f6aa03e6d60e416bd2301cc877fb976860 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit baac7d2c41823060b06b8ceddb76f5cfbd17aa51 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 51dc3c96d3..be28ea5151 100644 +index a3dbf8cb10..26f184f8b2 100644 @@ -22 +24 @@ -@@ -3783,6 +3783,7 @@ virtio_dev_tx_async_split(struct virtio_net *dev, struct vhost_virtqueue *vq, +@@ -3476,6 +3476,7 @@ virtio_dev_tx_async_split(struct virtio_net *dev, struct vhost_virtqueue *vq,