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 D872F433D8 for ; Mon, 11 Dec 2023 11:13:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D28DF410FD; Mon, 11 Dec 2023 11:13:27 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2089.outbound.protection.outlook.com [40.107.237.89]) by mails.dpdk.org (Postfix) with ESMTP id 197F5402E9 for ; Mon, 11 Dec 2023 11:13:26 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l9wu1Pa4TZSTuAxj2hpdII7BUzDNSyjzPNk6Dl3UAppzVlJRcvTQrH6rzNygx9U2ZfAvnGBb91d2iMvXmD0STRMBPYW364EvwyK/2fmz0bRaQqAHC7s+sBpNZB64kTNDvtCFw6IxPKdpTK0XjBRkN5lPIdYqH/DZm18l5DcFzGEoknaukbiWIKC3Z/FbwF4/M/s1zOs0wgFAvgSG5toBHiMgG4ZG2ZdXWjzQtdwAR7osR43VxbE0MOzhGsiBYrUX2dAQCoBeW2bK2u4vNnXiqbvksMFNnQaslLdKc0cm3gPsvoSdZyUuAxvA9tMxvavf3Uh8DvV7lJ83WuIXMiV0vg== 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=5o12boag6zRHW5zCICSavwasv9/pCAW9r6r1sB5TSqo=; b=fJ8kI5VV+8UbBSM47JHdCq68rcLFDoBS9eUzEtmpuRjXPOwQraKMmLf8gLVgEWa8PV2PAdODC/N0Ne1rHQVwEckwOevaQ0hRLpCDHnRddCAYUTR6hHLBtQFHh/DqNNs+Ae9+zfuX+6tu58thZ00TY4BpAjZ7uWXhqrEzCfwjL/HfiwJPE91OFarYOq+W3LHBVcQoZimQLdBJQVBNwYeZ//yIZxuIjPoFqchYkO9DlstBBE3Z9b4aNZ2RlmUbIUfX12qeYaVi8RkMD0pmWntl8MGAg0vxUt0cbPJljop20wRXukMD78hnhPBOAmEg8vPyxKx24Sa4KDnga5E4smO+6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=bytedance.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=5o12boag6zRHW5zCICSavwasv9/pCAW9r6r1sB5TSqo=; b=ZCPUAD9US6MlgMYMjp7EYOlXxqVuL3QZrxLovq9FpTyzv6jGuws54se5Cd47+ncO7UJ1Cv9uT868NTX5VSXIwSGJL3E2qe+1lkRJkg12chx/qSut01Mmo1N4SitQgeGUCHa1g8ehZCKN4sQfm9ZoonSIUnjqhHDNVexEl7WIqCXbN2BzYNKtS0SRR+CPLhhiibBCdAtmxDNhjLhYgaHGgcn676PYSWTTWq3z222MxLHjp+GS89/uVdQqCbB4YyJhV0T0JbAeXI4GyAOF2eGJ0aLpmNrr0OSPmixtkeGqGs7KKSO3ju6dPMSdzwX32h2/UJhB2ExC0ctr/h65RrASFw== Received: from MN2PR16CA0029.namprd16.prod.outlook.com (2603:10b6:208:134::42) by MW6PR12MB8950.namprd12.prod.outlook.com (2603:10b6:303:24a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:13:24 +0000 Received: from MN1PEPF0000ECDB.namprd02.prod.outlook.com (2603:10b6:208:134:cafe::24) by MN2PR16CA0029.outlook.office365.com (2603:10b6:208:134::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:13:23 +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 MN1PEPF0000ECDB.mail.protection.outlook.com (10.167.242.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:13:23 +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.41; Mon, 11 Dec 2023 02:13:07 -0800 Received: from nvidia.com (10.126.231.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.986.41; Mon, 11 Dec 2023 02:13:05 -0800 From: Xueming Li To: Fengjiang Liu CC: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: fix missing next flag in Tx packed ring' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:30 +0800 Message-ID: <20231211101226.2122-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: MN1PEPF0000ECDB:EE_|MW6PR12MB8950:EE_ X-MS-Office365-Filtering-Correlation-Id: f80ac457-a4a3-4ad1-2ae7-08dbfa31cef2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MKuha+STMWtympqpPX/eqqpFMpOb8ce5IFIdrWuEkF6vQSWRfggYboG6LTrqfxfrWDIkc2wLIXnG6j+mFtcR2Ph+yzajJvVHNjKNqp8ThCAy/RbWXoBG9K3KENgXKJQdR9G6LTHPzSwS33ym9KOAYHlbrPnvFlCMFo4u24bYnau5snIZLRLTBVRm5YpGt0kB7OWnDG51gHGcM3uuWYCjLCD9SCuWbXY8xYlbM/ztfz/u7gNFJgSP+XKEFsD4xi+jWW9m6xyGJ8yLZ942pCNJf3c7iu+s5XO1ZWstW3W1OCRvWiKLdccsyNDAc4V89denDiRMAqum2jStzNS5/ClwZj8Vlb30zR//wA4sjhALdOBc2E9v56GFxSCrwN1Dm1zJiamxPUOZa2Hn2TsAllMr3e+ru/BlNEScp2z9UEPOMAgSVErXxyfVqRj5VlJ4PMa8C94uDzK10s5GzI+P0Z69Mt3WCX2xBgY4vxPce5sE0VWWoN/nuBC6NzdVVK1nqfswmCX7qltx9+F1Y032rOVF3jFOWqzcaCgMdhfSbEn/kTihrPv6+Ca2S3SvK+/xeuUuddklthgv4JGXb+jmSUifrBcYk4F6ivM7c4XOkTHkuqHYBzwwvV2jLCZ5Tkz8G4+uTWod5d3xZY7yXN9ZOhjjR3WnztcACrFcLo5kso1hPIFboQ1LPsdecN8S22H47YP7pxA/5pfQ+6Asr6ppcvW90ELU+PgNhpVtX8R3fMHibACJrvugLbCtt/4gJEuJJdndERkT8vppgt2WHGzJMoH0Dz34P0beZbvSEA/JC5U1dKE= 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:(13230031)(4636009)(136003)(346002)(39860400002)(376002)(396003)(230922051799003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(41300700001)(4001150100001)(40460700003)(2906002)(5660300002)(316002)(4326008)(6916009)(8936002)(8676002)(70586007)(54906003)(70206006)(356005)(82740400003)(7636003)(2616005)(86362001)(36756003)(36860700001)(47076005)(966005)(426003)(26005)(478600001)(6666004)(6286002)(336012)(1076003)(16526019)(7696005)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:13:23.3500 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f80ac457-a4a3-4ad1-2ae7-08dbfa31cef2 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: MN1PEPF0000ECDB.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8950 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.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 12/13/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/commit/?h=22.11-staging&id=b485fae237054b241cec32a3b7e13c4204d6ffbf Thanks. Xueming Li --- >From b485fae237054b241cec32a3b7e13c4204d6ffbf Mon Sep 17 00:00:00 2001 From: Fengjiang Liu Date: Tue, 17 Oct 2023 15:26:23 +0800 Subject: [PATCH] net/virtio: fix missing next flag in Tx packed ring Cc: Xueming Li [ upstream commit f923636411c557782f4718de8bee856d60afa74c ] When the packets is sent in packed mode, and the packets data and virtio-header are divided into two desc, set the next flag of virtio-header desc Bugzilla ID: 1295 Fixes: 892dc798fa9c ("net/virtio: implement Tx path for packed queues") Signed-off-by: Fengjiang Liu Reviewed-by: Maxime Coquelin --- .mailmap | 1 + drivers/net/virtio/virtqueue.h | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 83b960753a..a1ff0137a7 100644 --- a/.mailmap +++ b/.mailmap @@ -380,6 +380,7 @@ Farah Smith Fei Chen Feifei Wang Fei Qin +Fengjiang Liu Fengnan Chang Fengtian Guo Ferdinand Thiessen diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index f5d8b40cad..5c9230cfe1 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -771,6 +771,7 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, start_dp[idx].addr = txvq->virtio_net_hdr_mem + RTE_PTR_DIFF(&txr[idx].tx_hdr, txr); start_dp[idx].len = vq->hw->vtnet_hdr_size; + head_flags |= VRING_DESC_F_NEXT; hdr = (struct virtio_net_hdr *)&txr[idx].tx_hdr; idx++; if (idx >= vq->vq_nentries) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.418783700 +0800 +++ 0005-net-virtio-fix-missing-next-flag-in-Tx-packed-ring.patch 2023-12-11 17:56:22.877652300 +0800 @@ -1 +1 @@ -From f923636411c557782f4718de8bee856d60afa74c Mon Sep 17 00:00:00 2001 +From b485fae237054b241cec32a3b7e13c4204d6ffbf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f923636411c557782f4718de8bee856d60afa74c ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 3f5bab26a8..5273df74cb 100644 +index 83b960753a..a1ff0137a7 100644 @@ -25 +27 @@ -@@ -394,6 +394,7 @@ Farah Smith +@@ -380,6 +380,7 @@ Farah Smith @@ -34 +36 @@ -index c1cb941c43..5d0c0399a8 100644 +index f5d8b40cad..5c9230cfe1 100644 @@ -37,4 +39,4 @@ -@@ -682,6 +682,7 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, - */ - start_dp[idx].addr = txvq->hdr_mem + RTE_PTR_DIFF(&txr[idx].tx_hdr, txr); - start_dp[idx].len = vq->hw->vtnet_hdr_size; +@@ -771,6 +771,7 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, + start_dp[idx].addr = txvq->virtio_net_hdr_mem + + RTE_PTR_DIFF(&txr[idx].tx_hdr, txr); + start_dp[idx].len = vq->hw->vtnet_hdr_size;