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 1DC9F41D8D for ; Mon, 27 Feb 2023 08:04:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16E4740A84; Mon, 27 Feb 2023 08:04:38 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2044.outbound.protection.outlook.com [40.107.93.44]) by mails.dpdk.org (Postfix) with ESMTP id 3075F4114A for ; Mon, 27 Feb 2023 08:04:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dgpizKruS5wTD+dncsssHff2yHDu6ulMT9lYxXbg3NTH6WoJLqee4k1e+jCWm2q+u5jzGQfZSO00VocFt1Ux6fNIEIEvjDBpQd1YAkltYb8q4tkR57PFY1CDdpdhQ0s3gmgPadRvwFEQmRhNEJAzn2gkrwxgcaruT7i0XC/0+hylsw1igvxfLlBmOqniQWPuo8DVhszTPQz4NjdouSeUJadS5VTiLn5CikUtwHTgt4NCySSwHeRpRvB44rwnd6O3p99AzKzMyegy1Zd/p+c8QwlPOTn3vDPsyt4oq3K5V3KB6zhjXgMl0Vxo6eCodf+UPcBwZ+flyFdD+HM/Q61Ihg== 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=vlRMAHrBH5vbcbfMO28VTo9S2/xWHXwB1gMOI4JDC8E=; b=A/ADMAzd1pnLXBT0UtdLUNVtvDPjWyjNAJDc8JFrTUo2pyxaVPWGFEkypETMDcU900Sv0VQbcSiZCDbrjaQVLxLaP9+KacpIEU7Ty3oicHnz22tk+qwoE1fOheRjvbAmtJpmzXVcqAXDZ3OQZaD4v9s2KezgiRRs+E04NK+DvJQ+retgk3Yv2UerwZqoRVsJBqcTrlZZanCVU8G2QtOEXINkf7eNDZHkpONRCF7Mb8skENvjiubgvu2CxZ5KES220JVU2bjs2Dmp76EiY1C2DFIz/SYYGJuU/unU808rEqRfIfRW0IqjE+/AxpMgR/JSDUwSUoPpX7kstyUSUOqDIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.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 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=vlRMAHrBH5vbcbfMO28VTo9S2/xWHXwB1gMOI4JDC8E=; b=CdayTlURWmBQbJWuglermiXLydLjnHf1p95dEEWFt0ZamAsovZSmmRWO0HJRxc0wJo5FCSk/8NGE7XrhZxiY6hvn3LstZeyI52LSqV8n2CEEvx+ZrkAfrHhWQBMGor6qBwdW2jDpPDMgOoOXc2GKwB4gO1kGluPRiWIbUk0AB5Fc56uojVJ0tpvxCfKiEAEWLx7YVTkrjuROS0/98wtCDJfTnCHZl74GceuWTd8fgCIhg1DttvskO4yWtf9riPrN9aNCcSQODGrft4ljIFW7Q2eBV8Cmbyz+5D8l4kxiMI0gcv+Sl/sVFfD37E3FYVXJ75njJPGIu7ZzERBArIx/4Q== Received: from BL0PR02CA0141.namprd02.prod.outlook.com (2603:10b6:208:35::46) by SN7PR12MB6929.namprd12.prod.outlook.com (2603:10b6:806:263::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:04:34 +0000 Received: from BL02EPF000108E8.namprd05.prod.outlook.com (2603:10b6:208:35:cafe::c8) by BL0PR02CA0141.outlook.office365.com (2603:10b6:208:35::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:04:34 +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 BL02EPF000108E8.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:04:34 +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.36; Sun, 26 Feb 2023 23:04:17 -0800 Received: from nvidia.com (10.126.231.37) 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.37; Sun, 26 Feb 2023 23:04:15 -0800 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix teardown of flows sharing a mask ID' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:58:58 +0800 Message-ID: <20230227070107.15664-30-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] 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: BL02EPF000108E8:EE_|SN7PR12MB6929:EE_ X-MS-Office365-Filtering-Correlation-Id: 8beca561-9798-4853-6593-08db1890e1a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pBQqzS0znLCDDqOaOkAxN23VBegel6gTkPDuW6xs8EpaF+oitFcxoinQWHEI25PSZ4ZO7zcSox6GVYxHWE8EMUIg0hzJSO0MuiyejekNp+SXf70hHDPhnAhIszo0HyKO3CUJpEr5w4RkbNUCvjSrVg6BoPdgZi7DJoGa6Vum8RKz2UqHYMuCsPFB2rYX3GAA8Hpag6A5M//D5LqKJUE685FjcBD4gKdfrUu2pGEgspPpPasv7cq2yBOZSsf486vp2o9FIpZeGE/cT2W3+DKWTsrBy2d7x9t+RRN6urw6zRBEAZHZLjjYlUAC6kvC2sXtBqXZx6oemuiaKA4trgEoMojkdMurj4Xyn7OKfOFEbxy/ZmwZVw26T6F2E+TtTkQp6Wc/7BqBnFCaMEJxn6idak7cd6qEAvMd6/MhmAWJyKOhoJtsa+U3OkOzqTfhOCtZAdtUxOT/ozGV2H6d4GLwgsBIN/LW3E2opOZlb8PXY7MAo906tDFfgagr9koG+TcLtGJWM6oQTp9RCJkz7s7EmZbgdzdr9F/8c6KhSLFJefagtikKp6UwBx84qsw9EtLkeL82GoUaEPhK8dWGfYzWuGN8Js4M2/ZsbCP8nKI7jasX+jIcPGe5KVgXwTYzVDnCAZeEh+m/vMHLp8BWCWt2iePhK4ZNyF1IW6k3nOwQ/ZqWbh9pHOO6ywRHJghgkA9VxYpqCKfJmBMHOqqWmcEolNSq/0GvZ1hFzgisrDSQYC+f2KQWfM+WSIq9C7zLYeGCYgzcQ8GC/LB4RZz07z8PQUAVnLtNigGBrJ1D7pQ3i5M= 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:(13230025)(4636009)(346002)(376002)(136003)(39860400002)(396003)(451199018)(46966006)(40470700004)(36840700001)(66899018)(336012)(66574015)(47076005)(426003)(316002)(54906003)(36756003)(40460700003)(86362001)(55016003)(40480700001)(356005)(7636003)(36860700001)(82740400003)(82310400005)(1076003)(6666004)(53546011)(83380400001)(186003)(26005)(16526019)(6286002)(2616005)(5660300002)(8936002)(2906002)(966005)(478600001)(7696005)(4326008)(41300700001)(6916009)(70206006)(70586007)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:04:34.1031 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8beca561-9798-4853-6593-08db1890e1a4 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: BL02EPF000108E8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6929 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.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 03/01/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=1df8c209233c5689b766f6389b78c0104fd480b4 Thanks. Xueming Li --- >From 1df8c209233c5689b766f6389b78c0104fd480b4 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 24 Jan 2023 15:16:31 +0800 Subject: [PATCH] net/nfp: fix teardown of flows sharing a mask ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit ea2883336d11516b6c7e81f208a65be4b133997f ] The same data in mask section of different flow add/delete control messages will share the same mask ID of mask table. The first flow add control message and the last flow delete control message for a specific mask ID should have the NFP_FL_META_FLAG_MANAGE_MASK flag set, this will indicate to the flower firmware to allocate/deallocate the mask table entry. The original logic wrongly process the flow delete control message, and caused the first flow delete control message to have the NFP_FL_META_FLAG_MANAGE_MASK flagset, thus the flower firmware deallocate the mask table entry on the first delete. This in turn prevented all the other flows sharing the same mask ID from offloading. Fixes: ac09376096d8 ("net/nfp: add structures and functions for flow offload") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index d1d209ce13..8784e01628 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -285,7 +285,7 @@ nfp_check_mask_remove(struct nfp_flow_priv *priv, rte_free(mask_entry); if (meta_flags) - *meta_flags &= ~NFP_FL_META_FLAG_MANAGE_MASK; + *meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK; } return true; @@ -3592,6 +3592,7 @@ nfp_flow_teardown(struct nfp_flow_priv *priv, nfp_flow_meta = nfp_flow->payload.meta; mask_data = nfp_flow->payload.mask_data; mask_len = nfp_flow_meta->mask_len << NFP_FL_LW_SIZ; + nfp_flow_meta->flags &= ~NFP_FL_META_FLAG_MANAGE_MASK; if (!nfp_check_mask_remove(priv, mask_data, mask_len, &nfp_flow_meta->flags)) { PMD_DRV_LOG(ERR, "nfp mask del check failed."); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:41.928000200 +0800 +++ 0031-net-nfp-fix-teardown-of-flows-sharing-a-mask-ID.patch 2023-02-27 14:08:40.739237000 +0800 @@ -1 +1 @@ -From ea2883336d11516b6c7e81f208a65be4b133997f Mon Sep 17 00:00:00 2001 +From 1df8c209233c5689b766f6389b78c0104fd480b4 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit ea2883336d11516b6c7e81f208a65be4b133997f ] @@ -23 +25,0 @@ -Cc: stable@dpdk.org @@ -32 +34 @@ -index d6c8c89921..ff2e21c817 100644 +index d1d209ce13..8784e01628 100644 @@ -44 +46 @@ -@@ -3653,6 +3653,7 @@ nfp_flow_teardown(struct nfp_flow_priv *priv, +@@ -3592,6 +3592,7 @@ nfp_flow_teardown(struct nfp_flow_priv *priv,