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 EDA32457A1 for ; Mon, 12 Aug 2024 15:05:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8ED14065A; Mon, 12 Aug 2024 15:05:22 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2079.outbound.protection.outlook.com [40.107.243.79]) by mails.dpdk.org (Postfix) with ESMTP id 4691D402C3 for ; Mon, 12 Aug 2024 15:05:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JdBZRyX9XZasUaL2oicmzvcobFLjiwl7OMRjg9sEniQk+zPvqTX/yNaJLaVd1MTzP8P8JS9FHZwasfJajiLLzuMQjcr3b/SDS2iRCG5swG7YtotgqEYzXxX7ckG4JaJgmbPj2J6MCCUq9lm751lKPqQL5TbqcSpcGP5lX2IZmn8SbSG08HcRE/R4RNlvVQi1caZnOnJaSIWOsS3GBONvODK4+zjgWYppYSrkHzzvWW/rlvlZhYvIAivNL78jlnq8UOHsaxrAnGI+ILmLX3tHU6objOD2v3r58VzaKyuxmg2xQ+rhFUZ6J/oi+jBzbNiYRfbJb9f8FudyCqFO/M1qEQ== 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=bYyc1/Lj57J7k5j7LqBpjjEvgU4aoTzbtL3/2Iw8waw=; b=D7e9737pvIDVvKWTiOIpoHWRXj7sbIF35JKjn22NSZpjXnwrcBuJyPqxd4qTte3KYStPDDIRqmF7XWLwBiHRmSSWcHJyJ07TEkwEKZ0WVpegRoX5KDOSGuQVd/Cmn+XXjYLn2zc8tmyaeOjM9q7gbDaLP7hNElAjFPsyPJ2hffc6mjWjiY+XQqC5WQOXmbrSXt9wq0QdgA8xFvv1kGUsxV10mvdCmkBN5urTlIYCKTZtkJlyNY2N3feoTvmXHHmj1aRNPE6mEWt9ids/Oagpc/AEY3ScTNIuK2iB6kYYWiPU5cui4r5M4Vspag90mthTD9vOz9cnqJHphH9Of3QMKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=baidu.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=bYyc1/Lj57J7k5j7LqBpjjEvgU4aoTzbtL3/2Iw8waw=; b=QRuJj7mKRHfpSgvEHaiycT0/Mk89VFyWYeBZwttD0O3waKBuhMAn5J+IFPhsnKsI06O7qK+8U5Prb6AZbKFNrrMcsW90U697YP/YVkdQphIX/B7Xc6gK3zBEz4gbwYJPkzDc/ee2iqac1ncRlYTZmYZMrAqUxyo/GWuxB/fjQuo6iDQ1MmOntoukpx+azAsLm7Bd0mtLYQRo5zSJdC1LAFS2wwdYsj5/Aqly9gWC0ih0f5AUDut29f/sqGddO3uNz2sEiax2dI3XmEowbmbMfcGT8ZWI3mw+KCJ7dayWgA6XPSNO2yLJHqRAx6qRnXgq4PVcrxZDVr9bh8x9RvkSHw== Received: from SA9PR13CA0108.namprd13.prod.outlook.com (2603:10b6:806:24::23) by SJ2PR12MB8718.namprd12.prod.outlook.com (2603:10b6:a03:540::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.30; Mon, 12 Aug 2024 13:05:18 +0000 Received: from SN1PEPF0002636D.namprd02.prod.outlook.com (2603:10b6:806:24:cafe::df) by SA9PR13CA0108.outlook.office365.com (2603:10b6:806:24::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 13:05:18 +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 SN1PEPF0002636D.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:05:16 +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; Mon, 12 Aug 2024 06:05:03 -0700 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.1544.4; Mon, 12 Aug 2024 06:05:01 -0700 From: Xueming Li To: Yingming Mao CC: , Shuo Li , dpdk stable Subject: patch 'doc: fix mbuf flags' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:29 +0800 Message-ID: <20240812125035.389667-153-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: SN1PEPF0002636D:EE_|SJ2PR12MB8718:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c199183-4f46-44e9-da44-08dcbacf690d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UNuMahoggodwWUO4seViOacHcjlID9MALaNkM341fW+izb/Z1aWtzmnFpinS?= =?us-ascii?Q?JeKXJYC9Uqkq6nCnjIho5I4+gkyaQu3p1/7HpUGHKQ/+sPz8V2ZsnVzSxzn5?= =?us-ascii?Q?pGqIPYvltfjFNc+YnE8m4xv3UXigbKCkznGvc9W33nyg9d7uZOqaH5uhgUUX?= =?us-ascii?Q?z+yLASe345vWK6staMGDtHQTv+S145OEwaCIaPtjlIXJ6FIO4mcdtyD+ygX1?= =?us-ascii?Q?33V+sqRyL45b0JlUnEty1UB7XOfRAuJe0a6DCkPN2DQQrRztauuHa4zSGgqm?= =?us-ascii?Q?tF2m58J2kaX24ohbxZ4lpZNL3ExCwTmnSm9NfvXolP73i5ZBNTgx9D20Ytvw?= =?us-ascii?Q?1l/J6k/9uo3cONumhOJRYdDl0VtM/dqYAhSyUou9B6hJdA6aexcUnxfJXOpW?= =?us-ascii?Q?/cZBCqopRKrp5BXexprnGwbBwIgDBrmEH+RWCSaxhMONG8UA+rom8fcGzJuS?= =?us-ascii?Q?RJwtU3Iutu+3e6saoaubeqLu7zgr3LGbXKjpT2OFPxxoUU6Ey87sK26xufp/?= =?us-ascii?Q?CGU6n62IuQkIR879cvDYv9oz0Xv6FM8c0GgKHRMu1ST7RYo6Q5riUzVAt//6?= =?us-ascii?Q?ffzEKil8gHBOs9KJvVdWbSFp8vN1nFDfSP3xvRe4JumlxShKwtlza23ayQLY?= =?us-ascii?Q?ZXb04OyU70N6eFJpk2uh7UheOXt3/iTfkqlefzvCHAY2gnUUxeqU725wGELe?= =?us-ascii?Q?DGAcTUG0W7l6ecPIvOttk9xxdx7zSXttH+RBXPguMKL+CAUJSFJwmo3FvNTg?= =?us-ascii?Q?qBhSbchmxSI/59XIwqb0wbje2UOVSYSkq8a3eGIFPNieBA0bAEEjVnSv8f9j?= =?us-ascii?Q?ylsmUrB7c7Evpg6KwgKUHtp0tsROAIjwqCmYno0Sc05Tk65POEtTgg67nvgQ?= =?us-ascii?Q?LQIzPBNzYtpuRRy5ullRE1jiKd1fCx2EQPUeY2JxZTdYVzKsAI4glRvqNuk7?= =?us-ascii?Q?xiNQOfR/Wtjg/Stl7NjJTDwrsmlP57nYD4NZ7M/+T4m93VAaLCixgbly8aI4?= =?us-ascii?Q?A5dxeRRLVZv8NE83Bw9Mrg8DA/DkzTXV/DSHC5PWUuDydk2JmgIH6s8pw29Z?= =?us-ascii?Q?r4NuavLb/m+G5Hg6Fx+TD9bCW88h+DmfQ7pMroyofMOUWn949zwAWgR1h+bM?= =?us-ascii?Q?F4cwJf38CRyY8bazbq2llKYnocHA1O128D3RTAGP12k8QOW2u2+/1DY5SgPr?= =?us-ascii?Q?2jya5XH1lh0glLupC4KIixLpBFxCXIaa054HBdll4N/kU8GuRZiDGtq9et6a?= =?us-ascii?Q?MT+hsgA0sMSPWlFiGbEAMeVfodI5MgINqev0SMModlVGyckWJ5tINxe7OUQE?= =?us-ascii?Q?gZ1i/kvohYYF3lG9fwgRNX84T5GBrf/FNJkziBwoVjrqW8rFpCN0m7+ci7Lx?= =?us-ascii?Q?SNymhjevb1EO2Irk4so7v0nSYZdMk64XqKD8UQV+BspPtmZ4TSW4719V5JUA?= =?us-ascii?Q?CzHmL6kMhIPVg3kUhi8YPhTgiS587U4r?= 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)(1800799024)(82310400026)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:05:16.2029 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c199183-4f46-44e9-da44-08dcbacf690d 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: SN1PEPF0002636D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8718 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.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 08/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=09ccd86606e789f163f6106078e6129250f8da86 Thanks. Xueming Li --- >From 09ccd86606e789f163f6106078e6129250f8da86 Mon Sep 17 00:00:00 2001 From: Yingming Mao Date: Thu, 18 Apr 2024 14:20:25 +0800 Subject: [PATCH] doc: fix mbuf flags Cc: Xueming Li [ upstream commit 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 ] Fixes: 2542ad53d867 ("doc: add description of the offload API") Fixes: ae2c2cb60635 ("net/cnxk: avoid command copy from Tx queue") Signed-off-by: Yingming Mao Reviewed-by: Shuo Li --- .mailmap | 3 ++- doc/guides/prog_guide/mbuf_lib.rst | 8 ++++---- drivers/net/cnxk/cn10k_tx.h | 2 +- drivers/net/cnxk/cn9k_tx.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index bea129355d..f2883144f3 100644 --- a/.mailmap +++ b/.mailmap @@ -868,7 +868,6 @@ Manish Chopra Manish Kurup Manish Tomar Mao Jiang -Mao YingMing Marcel Apfelbaum Marcel Cornu Marcelo Ricardo Leitner @@ -1330,6 +1329,7 @@ Shuki Katzenelson Shun Hao Shu Shen Shujing Dong +Shuo Li Shweta Choudaha Shyam Kumar Shrivastav Shy Shyman @@ -1635,6 +1635,7 @@ Yi Lu Yilun Xu Yinan Wang Ying A Wang +Yingming Mao Yingya Han Yinjun Zhang Yipeng Wang diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst index 049357c755..749f9c97a8 100644 --- a/doc/guides/prog_guide/mbuf_lib.rst +++ b/doc/guides/prog_guide/mbuf_lib.rst @@ -134,7 +134,7 @@ a vxlan-encapsulated tcp packet: mb->l2_len = len(out_eth) mb->l3_len = len(out_ip) - mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM + mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM set out_ip checksum to 0 in the packet This is supported on hardware advertising RTE_ETH_TX_OFFLOAD_IPV4_CKSUM. @@ -143,7 +143,7 @@ a vxlan-encapsulated tcp packet: mb->l2_len = len(out_eth) mb->l3_len = len(out_ip) - mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM | RTE_MBUF_F_TX_UDP_CKSUM + mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_UDP_CKSUM set out_ip checksum to 0 in the packet set out_udp checksum to pseudo header using rte_ipv4_phdr_cksum() @@ -154,7 +154,7 @@ a vxlan-encapsulated tcp packet: mb->l2_len = len(out_eth + out_ip + out_udp + vxlan + in_eth) mb->l3_len = len(in_ip) - mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM + mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM set in_ip checksum to 0 in the packet This is similar to case 1), but l2_len is different. It is supported @@ -165,7 +165,7 @@ a vxlan-encapsulated tcp packet: mb->l2_len = len(out_eth + out_ip + out_udp + vxlan + in_eth) mb->l3_len = len(in_ip) - mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM | RTE_MBUF_F_TX_TCP_CKSUM + mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_TCP_CKSUM set in_ip checksum to 0 in the packet set in_tcp checksum to pseudo header using rte_ipv4_phdr_cksum() diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h index 0a2ad08f1f..c84154ee84 100644 --- a/drivers/net/cnxk/cn10k_tx.h +++ b/drivers/net/cnxk/cn10k_tx.h @@ -1293,7 +1293,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr, struct nix_send_mem_s *send_mem; send_mem = (struct nix_send_mem_s *)(lmt + off); - /* Packets for which PKT_TX_IEEE1588_TMST is not set, tx tstamp + /* Packets for which RTE_MBUF_F_TX_IEEE1588_TMST is not set, Tx tstamp * should not be recorded, hence changing the alg type to * NIX_SENDMEMALG_SUB and also changing send mem addr field to * next 8 bytes as it corrupts the actual Tx tstamp registered diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h index 636eb1f765..4715bf8a65 100644 --- a/drivers/net/cnxk/cn9k_tx.h +++ b/drivers/net/cnxk/cn9k_tx.h @@ -560,7 +560,7 @@ cn9k_nix_xmit_prepare_tstamp(struct cn9k_eth_txq *txq, uint64_t *cmd, send_mem = (struct nix_send_mem_s *)(cmd + off); - /* Packets for which PKT_TX_IEEE1588_TMST is not set, tx tstamp + /* Packets for which RTE_MBUF_F_TX_IEEE1588_TMST is not set, Tx tstamp * should not be recorded, hence changing the alg type to * NIX_SENDMEMALG_SUB and also changing send mem addr field to * next 8 bytes as it corrupts the actual Tx tstamp registered -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:07.285982420 +0800 +++ 0152-doc-fix-mbuf-flags.patch 2024-08-12 20:44:02.595069393 +0800 @@ -1 +1 @@ -From 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 Mon Sep 17 00:00:00 2001 +From 09ccd86606e789f163f6106078e6129250f8da86 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 ] @@ -8 +10,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 8aef1c59a4..4a508bafad 100644 +index bea129355d..f2883144f3 100644 @@ -23 +25 @@ -@@ -893,7 +893,6 @@ Manish Chopra +@@ -868,7 +868,6 @@ Manish Chopra @@ -31 +33 @@ -@@ -1371,6 +1370,7 @@ Shuki Katzenelson +@@ -1330,6 +1329,7 @@ Shuki Katzenelson @@ -39 +41 @@ -@@ -1684,6 +1684,7 @@ Yi Lu +@@ -1635,6 +1635,7 @@ Yi Lu @@ -88 +90 @@ -index 84b08403c0..7d9b259a5f 100644 +index 0a2ad08f1f..c84154ee84 100644 @@ -91 +93 @@ -@@ -1242,7 +1242,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr, +@@ -1293,7 +1293,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr, @@ -101 +103 @@ -index b56881c561..9370985864 100644 +index 636eb1f765..4715bf8a65 100644