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 8AE864625C for ; Tue, 18 Feb 2025 13:38:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82F34402E1; Tue, 18 Feb 2025 13:38:45 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2077.outbound.protection.outlook.com [40.107.101.77]) by mails.dpdk.org (Postfix) with ESMTP id 726B9402A0 for ; Tue, 18 Feb 2025 13:38:43 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I2dxWi710RYwb7juEmHUIjTWjnsHi5Tx/BDaj/Z7bT0w3j8ctozq92XueNANvd/+2G5ZO7QLlP4/qsX4MavL8X3N6b14dU514aKQLzKw74jCSPPff8Rzb4El3sjFi4xVFIR/Hkd7zMK6UGCbEpwzxpM/dVLYf2Y6RVHOxl9QUEcd0Jyf+tGYB3fJ9UYmL7KU/R2at8FJb1kbxEC5+j+NA4ZUPI9K674bw8iJgydXfbE845ep8upw6YkTzd+bu2tjN3/eD/DX7hkxEre1V4LEW7D0zcEA+UyeLSPmDnNjSzbQ0/grsU/HFlFwWT8MHQLY0Szfcaqipo8zploe6qVYww== 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=hFjZTY0dnyEXgwY6OkIfkMgX4HQfkS5SaZmaoP7pEDY=; b=xaksaduhO8N97wcVEtpiZbTgm/juqS4EIv/5p3niIWI6GyV+vae/51Uvhn0X2/FNKfQKJIQtBIXNdG/VO1J+DPmdbNIEJAvcpDZ9OgrIMCOVDjZX5JlRVCvSfNEugYGtPXW2S2OCnvkD0Txv9CeLxhQtuhhHj4BWQTW/3YxZtPLk0hPEyU/i2bxy6rhpex/WjksQu9kk8BpZkdsiX+7tl4JCB2JO/TapHbQCUdIpjzcb0RAm+Ae184uKbtQ1oVh2YdyrGK2GtBcrhGvbm32dkH7yT7Lhnge8kotIsS2PEr8aT1cw8fDTBPiu87fgYPaf5/oxGjGqZKbOq7w0WKOWBw== 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=hFjZTY0dnyEXgwY6OkIfkMgX4HQfkS5SaZmaoP7pEDY=; b=qx1MhjasYDrUbzxmgq+i5jJRc59S16dsIRcnsTKjqxq+zZia3soOZOoBnTCi5NRYTSRTT4/lyv1AstEGEQ6SPacS6LvlRqEMLfnKwkQtSglVwvo5sVS8nRZnRe6ftLn7u/87QWTD0X33K9gvCv+sWf7Kyjjuhlb1K0CgNjbHIIR3xe3FP28VPFuIlWnvUDI9VVtJ7miSuD/0Ro1YxFHY5OcgtmcX21dyygX/TNzZbfHFl1txv7iJbRtR8FhCuYy+UCegRJ5rDPlbseedihO3MO3vBuR3M9sEL5w7iVRuQyRZN1pBjhCLfsDNh3jZH0TzCNq7aPyT+S6r8QXH+uMF7w== Received: from BN9PR03CA0105.namprd03.prod.outlook.com (2603:10b6:408:fd::20) by DS7PR12MB9044.namprd12.prod.outlook.com (2603:10b6:8:e3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 12:38:38 +0000 Received: from BN3PEPF0000B06B.namprd21.prod.outlook.com (2603:10b6:408:fd:cafe::6d) by BN9PR03CA0105.outlook.office365.com (2603:10b6:408:fd::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.20 via Frontend Transport; Tue, 18 Feb 2025 12:38:38 +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 BN3PEPF0000B06B.mail.protection.outlook.com (10.167.243.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:38:38 +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.1544.4; Tue, 18 Feb 2025 04:38:27 -0800 Received: from nvidia.com (10.126.230.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.14; Tue, 18 Feb 2025 04:38:25 -0800 From: Xueming Li To: Vladimir Medvedkin CC: , Bruce Richardson , "dpdk stable" Subject: patch 'net/ice: fix flows handling' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:24 +0800 Message-ID: <20250218123523.36836-30-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: BN3PEPF0000B06B:EE_|DS7PR12MB9044:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c7bdefd-b9ff-415b-f456-08dd50192b22 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?B8b2sDwJRke0C95WfD3GZljV47ZeBohJREmJ9Refrnuys5hyM8WhY94rpWoe?= =?us-ascii?Q?HcwAHK2zjh7sm0jUQGGBbdhiV+qLyKdXru61DdKstafYK4KGo03BOMXggFqP?= =?us-ascii?Q?PMFl3T34NXAYqAckDpa32ZIv4EKRpc+diXcThAE8vkGX2uRioLRiFFXrvj8N?= =?us-ascii?Q?6ihjdNdg8+H4oZhRcpOmIM5LeeHAC2DfRk/6bNRXzlnzWb42waaOkEU3hWa2?= =?us-ascii?Q?6qClUuecK2PhHdLkK91fkHMGsw9yM4Jk0kZIAJvIHxYIX4cSAHWQ8AbIAFZC?= =?us-ascii?Q?wm0jSDY9WaRCObV67BjkR7M3jQ1ptsUibIR8J0NAVjY7DJNLo6qUlzEEcmTL?= =?us-ascii?Q?aiRs9PD2uI12sEiRA4jMgdyKMBBIm3crIO6qxm+x/HU4nfS9Og2jRxki84qw?= =?us-ascii?Q?VHiCKqzvUpHtl8p3pMsmpCd9RiDucMwuJdaxM9+/F2DbVQmsiDWc82dqVYoF?= =?us-ascii?Q?+IdvQADJzJhLc0LBSreg47+dsO6maOIAu4eX90w5Yiy2GhFZUr8fNpWdSxRB?= =?us-ascii?Q?cVidkMMUUdvwGe6KgTkCsNqeq0JQULfnhqHaG1l5LcPCgmlWnpHSvxJP9fN3?= =?us-ascii?Q?3xruPP1NtfK6C7DsEJcp6ifoBLZ0r6KNVymz1AObC842kfGvLK0LcH1tphEd?= =?us-ascii?Q?UUPElkFDKt2PKRxZza6wAWCunw5MfalhdtnmwtO4J2eyBZj0nG/ix2sq3bgf?= =?us-ascii?Q?3maHSvuYOxvKS3umYJRJSA4JkAlMGESkAre2r+vRDrbGAKmI86dSdFqtVVed?= =?us-ascii?Q?oetOM72IkiSTKYJgmHPU5HcHAVkjkYaS42G2oOrqaHhgrtNdNasMyunlc3x2?= =?us-ascii?Q?pXcRqp7VvSBYX/mvS4RYTjbcX1Xcqd7bWXinPn6d7mcatb3fy9Jom3Qmr6TR?= =?us-ascii?Q?YjJ6fMkMp3u1uR+4kRQHTPpH/gD7qIgGAdPK4LPqlDUHVs9Ot/RJDxMvh46u?= =?us-ascii?Q?54dgo1+oEBMTrG0kHxEXCAopwTKS8XBfNaowXqsIXrmDZBHpJc/YSfnux6qP?= =?us-ascii?Q?4j2IOCazCRJencNO7y1sZs6ud8236jIaG6fw9gr4KoSJUb7vr/e4p3gR0XPl?= =?us-ascii?Q?37bTxRlOoExqWT3nSTPczrc7I07yO+aFNQdKXufXvJrhmeP7gw8GzGycMOLS?= =?us-ascii?Q?NjwsAChucAQnDpXaxlEz4rlfs49VynID7pdzBF3DL5+RfURFW5xE9QiRVtKv?= =?us-ascii?Q?paCEonfq5rqBZZFy9iFhln9i4ovhagnuvN1hrMSWStW7+/wYuJVjy5kGvCVp?= =?us-ascii?Q?GEHTeq2TuCn9mqhvw6K7K9ZDlCMkTwYIiYPeCJ/aC2K0Hv91XvSqlGKi+hne?= =?us-ascii?Q?vrzhKPnJrtWDYGhfWlL/PGJg8H/F6KNyRs8N0UHWzfdsSYX/lWPQS+YqE6pS?= =?us-ascii?Q?RqpsTc575pbBAFqVRUpxvBiom/6drBwmF85ghZQ5dlEa40PHRGIeS8ems1xI?= =?us-ascii?Q?GDuWqJbuNPvScrnzRrd4pVq+pDNsUnWwXRUFR8uj6Xc3In1/8xRBHc2nfQHf?= =?us-ascii?Q?CtdomDMQtUcqjnU=3D?= 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:(13230040)(36860700013)(376014)(82310400026)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:38:38.2406 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c7bdefd-b9ff-415b-f456-08dd50192b22 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: BN3PEPF0000B06B.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB9044 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=03db2facc30eb7fb51f5755496559aa05b1f23b8 Thanks. Xueming Li --- >From 03db2facc30eb7fb51f5755496559aa05b1f23b8 Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Thu, 30 Jan 2025 16:14:42 +0000 Subject: [PATCH] net/ice: fix flows handling Cc: Xueming Li [ upstream commit fabc9e1322e26b41ab74a8e35dcb477c702c3f6d ] Currently ICE PMD uses group attribute to select the appropriate HW engine to offload the flow. This behavior violates the rte_flow API, existing documentation/examples, and reveals hardware specific details. This patch eliminates the use of the group attribute and runs each engine parser in the order they work in the HW pipeline. Fixes: 9c5f0070fa3f ("net/ice: map group to pipeline stage") Signed-off-by: Vladimir Medvedkin Acked-by: Bruce Richardson --- drivers/net/ice/ice_generic_flow.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 50d760004f..5c34e0385f 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -20,6 +20,8 @@ #define ICE_FLOW_ENGINE_DISABLED(mask, type) ((mask) & BIT(type)) +#define ICE_FLOW_ENGINE_NB 3 + static struct ice_engine_list engine_list = TAILQ_HEAD_INITIALIZER(engine_list); @@ -2295,21 +2297,23 @@ ice_flow_process_filter(struct rte_eth_dev *dev, return 0; } - parser = get_flow_parser(attr->group); - if (parser == NULL) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ATTR, - NULL, "NULL attribute."); - return -rte_errno; - } + for (int i = 0; i < ICE_FLOW_ENGINE_NB; i++) { + parser = get_flow_parser(i); + if (parser == NULL) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ATTR, + NULL, "NULL attribute."); + return -rte_errno; + } - if (ice_parse_engine(ad, flow, parser, attr->priority, - pattern, actions, error)) { - *engine = parser->engine; - return 0; - } else { - return -rte_errno; + if (ice_parse_engine(ad, flow, parser, attr->priority, + pattern, actions, error)) { + *engine = parser->engine; + return 0; + } } + + return -rte_errno; } static int -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.758260553 +0800 +++ 0029-net-ice-fix-flows-handling.patch 2025-02-18 19:39:00.508244068 +0800 @@ -1 +1 @@ -From fabc9e1322e26b41ab74a8e35dcb477c702c3f6d Mon Sep 17 00:00:00 2001 +From 03db2facc30eb7fb51f5755496559aa05b1f23b8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fabc9e1322e26b41ab74a8e35dcb477c702c3f6d ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ - drivers/net/intel/ice/ice_generic_flow.c | 30 ++++++++++++++---------- + drivers/net/ice/ice_generic_flow.c | 30 +++++++++++++++++------------- @@ -22 +24 @@ -diff --git a/drivers/net/intel/ice/ice_generic_flow.c b/drivers/net/intel/ice/ice_generic_flow.c +diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c @@ -24,2 +26,2 @@ ---- a/drivers/net/intel/ice/ice_generic_flow.c -+++ b/drivers/net/intel/ice/ice_generic_flow.c +--- a/drivers/net/ice/ice_generic_flow.c ++++ b/drivers/net/ice/ice_generic_flow.c