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 1EAC043B86 for ; Tue, 5 Mar 2024 10:49:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18D6540FDE; Tue, 5 Mar 2024 10:49:12 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2088.outbound.protection.outlook.com [40.107.95.88]) by mails.dpdk.org (Postfix) with ESMTP id 563F34014F for ; Tue, 5 Mar 2024 10:49:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FuPZNLnAg9qLGGOk+fy77iCXGUOUeJrNeJL7/truUORs0WgbZ15Co19/R1eiFohAhuURfGYMbKSX7v1RMi8odRfO3OeKOvuqLDkx/p2x10ZBEmw7TYNbGtaHlspQeFtIAq7odXcKndxpHvHDClqhCr+Sy2mxpsONnBjfCcVNKNgL6BLw3dprcsQbaYiaSl6xpS1B6Mt+92UUSHAEygbwCnTJs9ek651X09eueMgu35XaZfIiuIeVMR56msoI8HqFfg9Q+XGciz3y7Ye7AntKxlaS448BA7ZgI6hyC4FU5WS2tpVyKiD6xfAC44oFqD1jxUfcOOO3WAfLVZXDREWS/w== 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=+dSeGGQom3WxufP84DPY9m5nI1XaiZDMMbG1qvbxb0w=; b=AfoPoQl6/RU6LU4+eRLatbYGB6u4HY080weXhTpKZBWPWAS5KdEw6/9xt8jrisukyx4z66r61Byf79w2vALVBxgian02Ev+YZfSH9ZwW0cXP/O9eabQ5ZvSaDf7u43V4oPE4/yEkNL4haV2fB1RSU74mMQ+6Di9BT78oKHFv0wCDFIC/Ol7DViDWoilcQEUGQ1qwQlOmecI97n8CrxRxxlpzmqMgsna4hSWXfVB+QIVl4ps9U5oHjjX6Vh+7N5HlvuiIkRnyNmzM4iPEXijBB1SIlLV9GlEMcxvSCO5fPfwGxBVCtTiGqX/FCjDAKb4o2Kk1HkSxnjJKw+8qm5jpgw== 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 (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=+dSeGGQom3WxufP84DPY9m5nI1XaiZDMMbG1qvbxb0w=; b=enJMwLlW1sbwxrT1T8sXCW409qZOIgDhjB5OGiLOo6XhSxF//9cqoiEGAEAlTsBfKukdnvOA3d+cNyUFcc9+3zDAezB7VBz+YH+MF6Ey+G0vjoUxQvUF94N/8XHgwGdEQ82osFXwAZ/82YHEOYHzTVLUU5H9fWkDPTRTELxBs1C4ipEoqv/aJFp/eIIvjOH7yKY0nbxClpBGT3HchT7/sRwFMn443KB/7MflUnaTtAKJJ7At4DaAH5R+OV2QgGgCjqiiQOXnNEKfi/oWgBn7YlCgeegGU10QYiMKWe6gR1jFe1UlZJ6fKSpeS7jejoUZarORXMxem32VkUECtEgFgw== Received: from DS7PR05CA0108.namprd05.prod.outlook.com (2603:10b6:8:56::27) by MN0PR12MB6296.namprd12.prod.outlook.com (2603:10b6:208:3d3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:49:06 +0000 Received: from CY4PEPF0000FCC4.namprd03.prod.outlook.com (2603:10b6:8:56:cafe::14) by DS7PR05CA0108.outlook.office365.com (2603:10b6:8:56::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24 via Frontend Transport; Tue, 5 Mar 2024 09:49:06 +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 CY4PEPF0000FCC4.mail.protection.outlook.com (10.167.242.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:49:06 +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; Tue, 5 Mar 2024 01:48:50 -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.1258.12; Tue, 5 Mar 2024 01:48:49 -0800 From: Xueming Li To: Kaiwen Deng CC: Qi Zhang , dpdk stable Subject: patch 'net/i40e: remove redundant judgment in flow parsing' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:45:50 +0800 Message-ID: <20240305094757.439387-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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-TrafficTypeDiagnostic: CY4PEPF0000FCC4:EE_|MN0PR12MB6296:EE_ X-MS-Office365-Filtering-Correlation-Id: ba7685e3-42ca-4f72-aca9-08dc3cf97fa0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5dB81cDF4Lfzb+AE+cMNrya9Lptak8PK22WQqz3bDV+loMk7gqoZ89zRdyEToYiILSlZtaWFeZLVRCTgpvwQ1mhE8enmL6Kt2eB+s7BpW0jvL3L8iiUBuv8S8p/IrafAd2d/JpuWYYhJuFndgK4yBAGvnT+IlCa0njF8xNi53cgpSBxyUD200HPaVx7f9VO0KR4OZQGQSP4SvRnUOXhVeJ9ZSvHTYrsKyDur/Y8cIs2Sj8XEwdGR2qB6DV0zv6ao0c6uSpOka+2YBs5CEIXUy5eXD9oKuH6YqGNth1qfhhORohXbmcI93bbfte9Jp42pyi5SqIUQC/UWnrl73ESzWVCn70ViW4Co9mFbF29SCkW91+dfoyLUOaaxRWD8ZX9RpYVAL4qSri7a0xi5U65v83JdFlUUPKO9or/p8lcayCNg1BfGm1qCHqM9qorCiobQzdwlIPE8jak5YXYlv6HBY3IgOaSqJIeRwFSSd0/YpXDO3eTXsvKlSBHBv28kUxgHffIQzoBFW6FbkjAvLuayyx9dO14My2WJZTIvk3oK3HEnf4CbtMy5NBnlk39qjlPL0UVvp8w+XxnrLqDcoNOcOgGXLqeG0N84lpyzFraDFfIdtCTv4fQpxW9NvPdtKxaioDdwrYvvo/R6KJTYk5WEmD6cLGZGvsYsHYLhZuIkb3fJcwm+JHtNhvcsfYsca3VOdU8Iat2LzY8dugzVj/7sUk41FP1tjobfNHJjeSy2JYWo6C0I+r8LQRBhKHyKbIEw 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)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:49:06.4121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba7685e3-42ca-4f72-aca9-08dc3cf97fa0 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: CY4PEPF0000FCC4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6296 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/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=ca47a866b53941ecddfb3735f656f0bc939a2ed2 Thanks. Xueming Li --- >From ca47a866b53941ecddfb3735f656f0bc939a2ed2 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Fri, 24 Nov 2023 15:01:03 +0800 Subject: [PATCH] net/i40e: remove redundant judgment in flow parsing Cc: Xueming Li [ upstream commit e930f8622e05e410a475c6b57dd7edd73b2e1705 ] if (eth_spec && eth_mask && next_type == RTE_FLOW_ITEM_TYPE_END) { ... if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || ...) { ... } ... } Clearly, that condition in the inner "if" is always "false". This commit will remove the redundant judgment. Fixes: 7d83c152a207 ("net/i40e: parse flow director filter") Signed-off-by: Kaiwen Deng Acked-by: Qi Zhang --- drivers/net/i40e/i40e_flow.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 877e49151e..92165c8422 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -1708,8 +1708,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, ether_type = rte_be_to_cpu_16(eth_spec->hdr.ether_type); - if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || - ether_type == RTE_ETHER_TYPE_IPV4 || + if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 || ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:31.399119414 +0800 +++ 0009-net-i40e-remove-redundant-judgment-in-flow-parsing.patch 2024-03-05 17:39:30.663566489 +0800 @@ -1 +1 @@ -From e930f8622e05e410a475c6b57dd7edd73b2e1705 Mon Sep 17 00:00:00 2001 +From ca47a866b53941ecddfb3735f656f0bc939a2ed2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e930f8622e05e410a475c6b57dd7edd73b2e1705 ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org