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 CAF68A034C for ; Wed, 20 Jul 2022 10:27:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C2C3B41101; Wed, 20 Jul 2022 10:27:17 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2062.outbound.protection.outlook.com [40.107.237.62]) by mails.dpdk.org (Postfix) with ESMTP id 40ED640697 for ; Wed, 20 Jul 2022 10:27:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z8ryWSb1hVfVWkheKWXMvMbNPvG2VO6FNrrO7ybbAxmDlOPAO6Jci5JOj8sZbsmm9t6RXohsx0TVR/zcAQGgOhSiNWG36rkj5FBkGeeIvSSmQe2rYH+2yKhhPD58jkD1frrdOmD7bkVulcqPXiHc8HCyTrSfveQvjrGGzesqZv7jTbOuYjAk82pAhN78M3YTiIp7BSBG9kzmcNa78dVhi78x1NrgXZt4At4WjViQK/4N4YNFLxj3MdnvLvuFW/mzD1HKwdu0vsiDqfwnvEFEAAVOHiimxO4VTs22XXAZN/rIrGkmv1qu6/uWVT2u8oqgS8UAxHLHcF8Z9hgWqj9+EA== 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=KFzkGrN0zmFLQ7AEhXPumKnCVxiKJGuM+ju92emw0OQ=; b=l8KNkO8yoxkra11bIjH0xipmEvlMEXTJJmklnVhC6I7XloyFoJGW4DZINN4BScYh17SZZUOqJKnINjGT70OwNVRidip5c8x6wHSBbse4M2XOvEkzZbxRUSoBj0cPRrsXl8f32QzO6uTlWcFtuaF+HbNjVIBqNa5VGZyhq0sP7cohWrTqtQDA9oAF7B00U2AcU1HyoisYyTDLP7+9WddFacxYsjtOjRh3txI5eU72eKfS3rOWLHtzwq5nLcZ7MPd9QnQjt2BvP7trs+RtQbgG5PFin1055yEW0vXrKE0K6ckSx6zaVHw/0fzEWrdEN4ogUyOKqLzd89RJ52rQ2XZM7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=dpdk.org 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=KFzkGrN0zmFLQ7AEhXPumKnCVxiKJGuM+ju92emw0OQ=; b=bS7pRMJeLk0tMe1Mys+8D0CYb89wLzlbUz85KuPErK58aBz5WjMR+snlM8F6W7gAjNg8nVGNtIDdUMISXapUjay2vTd7zsFPbCuAmY0G31Rax4zHpayaGtOYcPM0hcZEoLPdzIzDnR6UZ7RsMV1PxdLL8GDeHBcrvAiYjErbKbaG+JgTz7x4+HKpuduNaNkL9mxvdms0yxvzvvjbfXvxlnEAMXMe7ViFd4ySTVXw73VUrnn/nRM4UviBDsSs3lFRSMdLJdahJPbP8KCuNg/GWPhD7u++a58/sVRSfxiRcGzUHKEROq4VgQVQu2GjegPShJFLgvllulSrge5sBjSwOA== Received: from MW4PR03CA0263.namprd03.prod.outlook.com (2603:10b6:303:b4::28) by BN6PR12MB1842.namprd12.prod.outlook.com (2603:10b6:404:fb::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Wed, 20 Jul 2022 08:27:15 +0000 Received: from CO1NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::85) by MW4PR03CA0263.outlook.office365.com (2603:10b6:303:b4::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.22 via Frontend Transport; Wed, 20 Jul 2022 08:27:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) 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 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.236) by CO1NAM11FT047.mail.protection.outlook.com (10.13.174.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:27:15 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:27:15 +0000 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.26; Wed, 20 Jul 2022 01:27:13 -0700 From: Xueming Li To: Kumara Parameshwaran CC: , Jiayu Hu , dpdk stable Subject: patch 'gro: fix identifying fragmented packets' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:21:31 +0300 Message-ID: <20220720082132.3954126-62-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c437d435-db47-40a6-f49c-08da6a29a727 X-MS-TrafficTypeDiagnostic: BN6PR12MB1842:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dtfehr9Kr6YmJ3pyyvfnp03ninN0PiQIHi++wjxuNC/1ilnEC9iIR6lcJabm?= =?us-ascii?Q?KGvH+ROdRnXyKIH4MsWhRcvCjhlCy0Bsw6+1Hqgn1BvetlplJ4UE2s74D75T?= =?us-ascii?Q?lxyJxv7WNzSizFFD665w6xmsi+j1GyUXNY2VAlJztkK54qpeo/tnFzk3gOyH?= =?us-ascii?Q?aXEWDEPE/kUHvEROARtyd7M0jqRmqvXKs1GPO1JCCCrBimVTVXbwF6nAFYnz?= =?us-ascii?Q?w5hPBfOwAg8oqLB+358QCe1fJtgx0DC6PJJ6vI4FQDtSAWT0+xTtx4hAQH4H?= =?us-ascii?Q?yiWCQPpI9ppsrJYqHoQBz9tPiTY8T+gW/jVJ8vadyn3XZitCN4tDjWJndMgY?= =?us-ascii?Q?gLeqxIE/fAiXOMuybPzPcGN6XAnRi8N5l6kl0B94XlLZR7HSec08YloWKqAD?= =?us-ascii?Q?XIVMV426E/bBzWWDzMDKJDGTnngz/Vbc4AQtGqKMVYW8MYbOoSXdXwZjPmAW?= =?us-ascii?Q?Um8pD6FsY23ZrPysNIwjADAiKnWVwq/4Qw9hNjPUa/b7NaLk4/0W2xAUtI2b?= =?us-ascii?Q?D/bmDE0YJWqqS0dTD08+NsqYzqWGPK+ld5dQyrYlMncRxW/A28DfvuRznF20?= =?us-ascii?Q?fltz5xnsLcbm73CsdKCfs321iKymvSlGCHTk6RbAikHZ0BsKCR+u4Yq752SC?= =?us-ascii?Q?iKJvntXKwGDkzv/T6PQWNyN2flcrFErSzTURt/Uwf2GTBd6HFa2w0NiK4J1o?= =?us-ascii?Q?J3bVcUx0XTewC6hUjzyC3buNagJZOh4yySAr3AvHKuS3BYB7HI4t18Kz5HOx?= =?us-ascii?Q?1LyZxiYY8F7yvb162nY33jPkhUUcqvA/WHofj6dMaKX9+tPuPe+7ccM3APXY?= =?us-ascii?Q?5a/Y4RE8kAduT0MvvZ/FRhvABlLROrGAL4e7FHw4Bh+QGzbqVGywHSrQT/ck?= =?us-ascii?Q?T/H50iNG/c5GJAhpQ0ExL2Lwt65NnSXyUBW1JXEnea1ybd7ucBCVs8mTIfKy?= =?us-ascii?Q?9h92CfgSHC77MfotmCzEdw=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(376002)(136003)(346002)(396003)(46966006)(36840700001)(40470700004)(2906002)(966005)(6666004)(336012)(426003)(47076005)(7696005)(36860700001)(70586007)(40480700001)(70206006)(86362001)(53546011)(55016003)(8676002)(4326008)(40460700003)(6286002)(82310400005)(26005)(1076003)(5660300002)(81166007)(356005)(36756003)(8936002)(82740400003)(2616005)(186003)(16526019)(41300700001)(316002)(54906003)(478600001)(6916009)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:27:15.5713 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c437d435-db47-40a6-f49c-08da6a29a727 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1842 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/22/22. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/6ad5ecf28dd63fb63ac70b11117b33335217d4e3 Thanks. Xueming Li --- >From 6ad5ecf28dd63fb63ac70b11117b33335217d4e3 Mon Sep 17 00:00:00 2001 From: Kumara Parameshwaran Date: Mon, 27 Jun 2022 16:01:14 +0530 Subject: [PATCH] gro: fix identifying fragmented packets Cc: Xueming Li [ upstream commit bdf2f895a66044bc643e98a7262d70c245252927 ] A packet with RTE_PTYPE_L4_FRAG(0x300) contains both RTE_PTYPE_L4_TCP (0x100) & RTE_PTYPE_L4_UDP (0x200). A fragmented packet as defined in rte_mbuf_ptype.h cannot be recognized as other L4 types and hence the GRO layer should not use IS_IPV4_TCP_PKT or IS_IPV4_UDP_PKT for RTE_PTYPE_L4_FRAG. Hence, if the packet type is RTE_PTYPE_L4_FRAG the IP header should be parsed to recognize the appropriate IP type and invoke the respective gro handler. Fixes: 1ca5e6740852 ("gro: support UDP/IPv4") Signed-off-by: Kumara Parameshwaran Reviewed-by: Jiayu Hu --- lib/librte_gro/rte_gro.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_gro/rte_gro.c b/lib/librte_gro/rte_gro.c index 8ca4da67e9..7a788523ad 100644 --- a/lib/librte_gro/rte_gro.c +++ b/lib/librte_gro/rte_gro.c @@ -33,6 +33,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { #define IS_IPV4_TCP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ ((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP) && \ + ((ptype & RTE_PTYPE_L4_FRAG) != RTE_PTYPE_L4_FRAG) && \ (RTE_ETH_IS_TUNNEL_PKT(ptype) == 0)) #define IS_IPV4_UDP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ @@ -41,6 +42,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { #define IS_IPV4_VXLAN_TCP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \ + ((ptype & RTE_PTYPE_L4_FRAG) != RTE_PTYPE_L4_FRAG) && \ ((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \ RTE_PTYPE_TUNNEL_VXLAN) && \ ((ptype & RTE_PTYPE_INNER_L4_TCP) == \ -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:01:01.631873733 +0800 +++ 0062-gro-fix-identifying-fragmented-packets.patch 2022-07-20 15:00:58.807667007 +0800 @@ -1 +1 @@ -From bdf2f895a66044bc643e98a7262d70c245252927 Mon Sep 17 00:00:00 2001 +From 6ad5ecf28dd63fb63ac70b11117b33335217d4e3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bdf2f895a66044bc643e98a7262d70c245252927 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ - lib/gro/rte_gro.c | 2 ++ + lib/librte_gro/rte_gro.c | 2 ++ @@ -23,5 +25,5 @@ -diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c -index 6f7dd4d709..e35399fd42 100644 ---- a/lib/gro/rte_gro.c -+++ b/lib/gro/rte_gro.c -@@ -32,6 +32,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { +diff --git a/lib/librte_gro/rte_gro.c b/lib/librte_gro/rte_gro.c +index 8ca4da67e9..7a788523ad 100644 +--- a/lib/librte_gro/rte_gro.c ++++ b/lib/librte_gro/rte_gro.c +@@ -33,6 +33,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { @@ -35 +37 @@ -@@ -40,6 +41,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { +@@ -41,6 +42,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {