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 3CE26457A2 for ; Mon, 12 Aug 2024 14:59:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 58C6C40A82; Mon, 12 Aug 2024 14:59:20 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2057.outbound.protection.outlook.com [40.107.92.57]) by mails.dpdk.org (Postfix) with ESMTP id A69E040674 for ; Mon, 12 Aug 2024 14:59:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pah5HIgCsIUHeYyY28VjVjl8FcwGDu4IwqF6E7bHcsF1tKVeq6m9NfRkQVn/ZJ7n3lzjd6N5xycs+wRvTX8ANSHN51urghCI1h619RCk75sHhUCLWRhizmCAc2AYKXRo12iHWg1L8AAlItVcrSui67L9oJe3NVgcWLsdZbBonTopEWF6C2s8IAyLSevf6biW2puIwc6HuDIlVHt2F/gwixykuUCCs2HkQRocnR9HeykYtNVAgYXFiDo/1snKsHqnbWAWuIJ3LwvFV4YE3sZjB6yI46Z9bAgYSP4312iZMtKLYCnwcJv4GG/qwgG0XUjrjS11EX+MZzt9GTzkvTDhww== 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=qdy/pLd8MX5+aHbUGAZ7hF7XsNI0Ru4PQW+SOIhlS28=; b=ESu1Z5zgnLXPna57hEF3ksml15EBGOoGP0NU+dr2+rv8nVo4RtIm/anLpib8P9Vp69nL0Ffzcbd/wV2O7ecQvt/KDZle6rus9+eMbkZPZYV7+JoxV0UAmQNl7+FBSHX4ToBaRa0EIHQ6sGyoDTJ9S1qhdA9HRd0zsBCLl3f6hEV+u58eS1lRGubIXCOmDGjs/CNHLFvIbmZw8c5lhg65sKh/wt1Ry6TjmLsIGhwSpoFyVdInQ0xlu16uqKH5izN28xZBurazO3+CTWSJBavHE07gAo/Z9+QyOuWmlZcnJHhD0/p0vg/f/C+5LGb9DPL5JA9gxV9GWhpBgts/TMDu4w== 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 (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=qdy/pLd8MX5+aHbUGAZ7hF7XsNI0Ru4PQW+SOIhlS28=; b=sXSMRwC1JqoFu+ldKHZYTc62T8hvAhXpwmuqMArzOgnMM2DOpChumkG+BTnR+WL+UZiLTlQZpQcVXenvVLSTxWaOhbRRcdoYUART6jNnpoD0TRtFiA61KAXGLiU1SOi2BJh3jC+yv7QB/j6A331fWB2NXsNrkdrWUiNzQI3t1eD8EeuO/xDEq3506n2iqi+RdQ9R6otukm8XUVcRJrudygYOgeJz8JvuBSrkiDN5AYxaqKBAw/FvUTSZ6e6l6PPa4ptHbkvExw6Q7rxzQ3DQnjT4i3GBvOt9bWQqoh5A6h+u20QnpUKYshpN/53JZ5/1FqiEfWH2HOCLwlxbyUO3XA== Received: from BN9PR03CA0471.namprd03.prod.outlook.com (2603:10b6:408:139::26) by CYYPR12MB8923.namprd12.prod.outlook.com (2603:10b6:930:bc::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:59:15 +0000 Received: from BL02EPF0001A0FD.namprd03.prod.outlook.com (2603:10b6:408:139:cafe::9d) by BN9PR03CA0471.outlook.office365.com (2603:10b6:408:139::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:59:15 +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 BL02EPF0001A0FD.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:59:15 +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; Mon, 12 Aug 2024 05:59:02 -0700 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.4; Mon, 12 Aug 2024 05:59:00 -0700 From: Xueming Li To: Chaoyong He CC: , Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix flow mask table entry' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:26 +0800 Message-ID: <20240812125035.389667-90-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.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: BL02EPF0001A0FD:EE_|CYYPR12MB8923:EE_ X-MS-Office365-Filtering-Correlation-Id: 25c9aefd-976f-47c2-5842-08dcbace91ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?7Wllj+H+JFCKBJJLoRNtvOegcvP/2d9M7q6bpiSnVaNZHYL2Pxr/tud7I2IZ?= =?us-ascii?Q?We2T62A+I1yt1HPQFb6zEG9IQoXJ7gDswXOMb1H39vACWGMIL/ZzmNGrK/JB?= =?us-ascii?Q?XTuIOO+lX5MwSEkPzFxZqQXVlwgbr01as/7UVHVH/7MRRF8/g7X5O7tiWIfo?= =?us-ascii?Q?r3FGAP7ulBbU67ke+r6LYcbQBakv2HBzMVn4MwqA8QpMPvH9jk59HbWcOvwV?= =?us-ascii?Q?Eb9L4+gX5NV6qI1wPq7NHZ5Z4/MNp5IQedxVaO+LbtuYEsWvKhgBNS03VbIU?= =?us-ascii?Q?WgMhD6u/rZnNHOfdEV3p3m6mXlyccNxPoBVSWqzCqO+XkEXYAJD855tQCA1O?= =?us-ascii?Q?ri55bnCqD85+dBJW9Oqysbr1Ft4QdIao3028z1OIHpaPSaOfb/Chcg8G4URl?= =?us-ascii?Q?dVavsR5HvlRhIQ1gUyqYADjjj80aBHocvem2dq0V9BOqJCaV7HTiW43j7fwr?= =?us-ascii?Q?n1PoIrbbFx/Wr4webW7nNko+en8a05ciq8BFfDEplIoDrSfeNZUgFlKn66dc?= =?us-ascii?Q?6zg7QOud4BKbFUSEz3Yd0ct5WRVQ4kujRi7JaRzNOCD9hRPmlP/kYe23ofqa?= =?us-ascii?Q?9r+EeTgUP+cbkZ9/zdD8jk31wwKyUiqpNnr3usIYUtlfNqg0tK5gd5SJYNCw?= =?us-ascii?Q?n4SYvt+LBPbqLo+9L+ZxkuzW1jb6uGVGfNJATwnajf+ulDvDdIrtHv2HK6Hi?= =?us-ascii?Q?co6UNhUDwlDXPqCdruTay/l2/O+d/8kTe5tSWF1r135dgHFSKEA+zXIIfa60?= =?us-ascii?Q?mrPGVpia17FIKipeHJz9mRljczEIU+8Gjw+MhGyz07fj43lVmGAkDMxZmqs1?= =?us-ascii?Q?2nQoc2qoQSN77OaRjFH6A141nabXR4e+eZe3Hf8NI37fw4NF6JtfgTaOzUQA?= =?us-ascii?Q?DbBLyCCJSlh+0Z8ytewQhHeBNyJEDfHGleP3dMqCE7OR+4otmucE57pot4Ok?= =?us-ascii?Q?YpOoI6X7I8dloYwE6FqG5CMTa5+BOx97tzUM2La1Gjjgxn35DP+uAC+gWC8t?= =?us-ascii?Q?etEpPHHLK5ivUI591DBAis0+VUPG94QqAPkHhoNMDBEnYfTvzZq2TnR0EWrk?= =?us-ascii?Q?nHEIBp0IeOFxXF5VIYxNxOjMKKZqrwUZNvfS2Kr+GnDzsi/QvcnQfAxzacXQ?= =?us-ascii?Q?417tRtiUv2RvlH1oYfgySt7/jiAmY9U+bseLjOhCq4kKA2qyFnhCY6aJfA+T?= =?us-ascii?Q?ialYxWnAjXqgSdouVVbniP3VdpQLo8tPmJybVEuuZtCtZGCyy5UA5b5XZyA1?= =?us-ascii?Q?G/3Ccl9W0cfMOhcqNEkCeR/MA4umOw0jy1EGlTVd8oywOGy7Qtk4mV6YalXg?= =?us-ascii?Q?3Q2AqYxnmSc+VP0mfe+Ocs+aMKAUOXAnqYLhaPM0WRg196jUjoysV9A4fyAp?= =?us-ascii?Q?Li7b/McqhYOChu5oQotDeeWcnBuv2RQ8L/N5u4RxB4OAOxEecw=3D=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)(1800799024)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:59:15.2016 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25c9aefd-976f-47c2-5842-08dcbace91ed 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: BL02EPF0001A0FD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8923 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=2e84f93745cb6f5bc3875d193245f58993674613 Thanks. Xueming Li --- >From 2e84f93745cb6f5bc3875d193245f58993674613 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Wed, 19 Jun 2024 17:53:36 +0800 Subject: [PATCH] net/nfp: fix flow mask table entry Cc: Xueming Li [ upstream commit dbb29b4685912b7df4332d49d4037f282803eb9a ] The mask table entry using reference count to manage the flow rules which have the same mask, and the new mask table entry will indicated by flag 'NFP_FL_META_FLAG_MANAGE_MASK'. The abuse of 'NFP_FL_META_FLAG_MANAGE_MASK' will cause the firmware abnormal and the flow offload will not work. Fixes: 7d18af7f6fdc ("net/nfp: support merged flows and conntrack stats") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 942301f855..9ad434affb 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -312,14 +312,14 @@ nfp_check_mask_add(struct nfp_flow_priv *priv, ret = nfp_mask_table_add(priv, mask_data, mask_len, mask_id); if (ret != 0) return false; + + *meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK; } else { /* Mask entry already exist */ mask_entry->ref_cnt++; *mask_id = mask_entry->mask_id; } - *meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK; - return true; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.426913668 +0800 +++ 0089-net-nfp-fix-flow-mask-table-entry.patch 2024-08-12 20:44:02.355069346 +0800 @@ -1 +1 @@ -From dbb29b4685912b7df4332d49d4037f282803eb9a Mon Sep 17 00:00:00 2001 +From 2e84f93745cb6f5bc3875d193245f58993674613 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dbb29b4685912b7df4332d49d4037f282803eb9a ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ - drivers/net/nfp/flower/nfp_flower_flow.c | 4 ++-- + drivers/net/nfp/nfp_flow.c | 4 ++-- @@ -23,5 +25,5 @@ -diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c -index af2c824ff2..980eabee93 100644 ---- a/drivers/net/nfp/flower/nfp_flower_flow.c -+++ b/drivers/net/nfp/flower/nfp_flower_flow.c -@@ -317,14 +317,14 @@ nfp_check_mask_add(struct nfp_flow_priv *priv, +diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c +index 942301f855..9ad434affb 100644 +--- a/drivers/net/nfp/nfp_flow.c ++++ b/drivers/net/nfp/nfp_flow.c +@@ -312,14 +312,14 @@ nfp_check_mask_add(struct nfp_flow_priv *priv,