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 E792D45610 for ; Fri, 12 Jul 2024 12:53:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E136642F39; Fri, 12 Jul 2024 12:53:14 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2059.outbound.protection.outlook.com [40.107.237.59]) by mails.dpdk.org (Postfix) with ESMTP id 5E36E40261 for ; Fri, 12 Jul 2024 12:53:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SzYK5EI/98jf8VUT14qbft72RSeHd9v9m7Xxao2MhfiwZ8desOtXENHy7fepWuDDmR5/1fD0T9CSHKL+Whmh9CrgfecXxV3amW93U0isB70tMSoyuck6m2ErEQZdVlxf2i0cyFC4WRbEYxfEbQed/QwMcd3+2y7k/EzbtypZGEM8WDO67kesMI1NeLfMA/CnF5J/xaBZ0fZSV1yF0pCKeRaLp0PRF9SCGplgt4riORX1B4nQHgzPtdcRX63yfiDrVIGpXmbKYPYJqywj6zxiNC8VHU19LsA0xZqhg5+A/RwLk4llK4pJYJGlUFNwrJzmy4XuWaHCeF1EI29FTqjoJA== 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=Awg5JCpjyaca/sOAXhk/v7pgaAjs51JmuQgUhzLn7Jc=; b=ho3IfAhDsxGOAhCA+8bMj8+667ccpDxKmcegWPhCbBLQqNJ0TutJexHDnhvDYPHVmA2cKjha9+OpnJdSwLyF5nyQ2scXmH189RZ6/HVAVvIQoijwsW7NWta6Fyi1iKKPPUC5notqw+O04rKdmqYI9+wZARubZSPD8y4M4vfpjKTmdQnVqKPVzTRQ+xvmdfmD+zj5tMtz2FmJcg6pqq3dOQkqcuCkfTUZq11nDFck0WIS3/mv74OYLJe6Nb/Jt0fl87oZaGySqOi9N9urGSJZzJXeXarNfCc2AIxDCCitdgWMMvKyPfAM6qGf9ubu8vMGJrX9K8IdZAFXhApGQkKVkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=Awg5JCpjyaca/sOAXhk/v7pgaAjs51JmuQgUhzLn7Jc=; b=US7H2353Jsj5Ve7bg7bpv5UJKtY6F5jxa4l7hE/gPvFasX0R3coNJIewZN6aH665++3QikQnn+3GjBr6t28F/9iK1k7l881dU2lp6eH4Qa4O24hT8x8itM5u6Abr8gepyk1Y5j9QFCaAmB6MEdbVfiYy93+E3UEHqxWhyEodm153pHicI9wN/rAiAl3eHjAoNb+dmBnlJMLKVVdtOzwp6WhDL1U1f/D+yEkag1bLx3CEHT6MVQPyQt69EFI8nZUeFdZXH7NuCpE4eQM26Nw8wmOaIOhQxZGl+jt8PbkpW6Xp9PKLH3ZnqbJBGo8NSP+q8sfmr/vS5L8ExdoG+JS/9A== Received: from BN9PR03CA0547.namprd03.prod.outlook.com (2603:10b6:408:138::12) by CY8PR12MB7413.namprd12.prod.outlook.com (2603:10b6:930:5f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Fri, 12 Jul 2024 10:53:10 +0000 Received: from BN2PEPF000055DB.namprd21.prod.outlook.com (2603:10b6:408:138:cafe::a8) by BN9PR03CA0547.outlook.office365.com (2603:10b6:408:138::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:53:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN2PEPF000055DB.mail.protection.outlook.com (10.167.245.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:53:09 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:52:53 -0700 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.1544.4; Fri, 12 Jul 2024 03:52:51 -0700 From: Xueming Li To: Satheesh Paul CC: Kiran Kumar K , dpdk stable Subject: patch 'common/cnxk: fix flow aging cleanup' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:56 +0800 Message-ID: <20240712104528.308638-71-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055DB:EE_|CY8PR12MB7413:EE_ X-MS-Office365-Filtering-Correlation-Id: f272cb25-29a2-4529-0378-08dca260d170 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RfrQT4iTtd2jgBFkLHDhXV5YMK3BrQwnTPGfyIXFmBAaD7rT/j5VuXOnp+78?= =?us-ascii?Q?/MCKkCPpd0p+hk47Zvd1ciXu+5JAf0iJEwXL7FOI6AHw4A95Y4M9G4vkRUL8?= =?us-ascii?Q?7lEl/fLYpRVrLrWXOcwLNcC7H+TDfihWYBr3QislXdZHjLCs9woBjtWvcbqk?= =?us-ascii?Q?64e5RhWEej8eOYL1DytNZ2S1Hbk0B5qp3JkdedH8iB1Optl/AzG82MOlRus3?= =?us-ascii?Q?j7aK6loo5HX6oeuJz1oq/XqWPVDSsWQmCWVb1KoEC8PF1GxxoV7LIwqihztw?= =?us-ascii?Q?zPVPgPvATzoXqNWMzwEqvjS+ascKrq3qDz/yV+o8N76SGCAJlFBeBXhTSlwE?= =?us-ascii?Q?k9TSv8w3RDXTFlgcd8Lo5VCU3CyrgbV4kNOhdkQpLWV/dK0/jwd1BLOin2SN?= =?us-ascii?Q?hjIAHowF52eUWZp7/QHYZM1rZ/89TRzujZBt8q5n3ynTNVjfPpKHcXcYsAeZ?= =?us-ascii?Q?mkCiKoA/AvYK5jUUbF1cuqJbXpw2Y7CFMu0IpqGb3+I4Eg0/r6vBSJM1hMev?= =?us-ascii?Q?/d3DbvMkSQ7wUpc80yYaIxiz3Au/b5q1twL4esiRpa4xwqWc1/cBFglvXeIl?= =?us-ascii?Q?7sEMVsldl57FcqfUdUlUkdc705EFziX/YGuIBg3RuU/9xp30/gvTJpQxFczF?= =?us-ascii?Q?Wn8MLzhBFPNzA7170ZsbMRhYe6D0U3mQEGeWigo86GNG9J/O4ZD00pCMFeVo?= =?us-ascii?Q?rtcMcEI5utVntvjFMm4ZACXe+vn+8IbKiEqRSEXrN6lzvAW3S10i03YirbCB?= =?us-ascii?Q?Tv1wws4TYbk313ZpcxhPS6SCWD/JAxcsie3IJxb7GnolH58MgIN5cggJZCP4?= =?us-ascii?Q?xiRKBmc/NfDCAzRxji2slYIfNc4YK5su/LBVtEUuK3SDjaFQNMdT+wQC1sNP?= =?us-ascii?Q?/5kNg2NYARLlWfZlKoOZuONp4gjC4f7EIILk48i1Jgz5J7A5zQUcUgkcw34+?= =?us-ascii?Q?Svp/2NpsbIMGnV+lnGoDLKkcrtl3qy/i7Fxb0NYbMr1pJVjx6YbO1Mp2bjyt?= =?us-ascii?Q?2r5cunU1rnIQ1f/tvNSAQzvb754Pnu41uiyd81VHwrQFZxh9Sp6yS7Pv/Lrz?= =?us-ascii?Q?FZTgwYA64WeysdYpwCghZ9VTbecfdl0eeEGrXIBcbpIrFYzQGpOspN/XGwAJ?= =?us-ascii?Q?2R80ZEZpJOkRAbwLhOv/pyYZU/qXyoBtN42wwo86nL+KEe8MhUpOlIlwfLeR?= =?us-ascii?Q?WJ92daRAowNBrF5qiuuLNwiELGEyfXTMOeB1Fsf4LYRgzATcX1A2HbBnzmN3?= =?us-ascii?Q?ucuXlYSH7VBch8YJDGzlXpT7dWX1jdLEQIDWugnxa3nkY+emXHAs892rWPnC?= =?us-ascii?Q?yM4w+PDm7HMseU4HiBI2DpO6AzIXGbp4GJJF6axxQWj3Fqdgq+GHRwowCCvx?= =?us-ascii?Q?CJv423RRXp8eFAPU34hz1hTSJ+Ea4yFvysJyWyzFLtc9DnR8Qn8NrMqKiRzQ?= =?us-ascii?Q?GtaccThfKmhmZ9z5fMQrp0ns1eqMPaJk?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:53:09.2075 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f272cb25-29a2-4529-0378-08dca260d170 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000055DB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7413 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 07/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=2428f9f2e30e1c69ea3ab0d7cd31b3e27d24986b Thanks. Xueming Li --- >From 2428f9f2e30e1c69ea3ab0d7cd31b3e27d24986b Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Wed, 8 May 2024 16:27:13 +0530 Subject: [PATCH] common/cnxk: fix flow aging cleanup Cc: Xueming Li [ upstream commit 85e9542d47009eeea2d4c4eaa703715c1c3bf4f7 ] The aged flows poll thread is not stopped before NPC cleanup resulting in a segmentation fault. Fixing this by stopping aged flows poll thread before proceeding with NPC cleanup. Fixes: 357f5ebc8a24 ("common/cnxk: support flow aging") Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- drivers/common/cnxk/roc_npc.c | 5 +++-- drivers/common/cnxk/roc_npc_aging.c | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index a0d88c0743..fcede1d0b7 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -351,6 +351,8 @@ roc_npc_fini(struct roc_npc *roc_npc) struct npc *npc = roc_npc_to_npc_priv(roc_npc); int rc; + npc_aging_ctrl_thread_destroy(roc_npc); + rc = npc_flow_free_all_resources(npc); if (rc) { plt_err("Error when deleting NPC MCAM entries, counters"); @@ -1626,8 +1628,7 @@ roc_npc_flow_destroy(struct roc_npc *roc_npc, struct roc_npc_flow *flow) if (flow->has_age_action) npc_age_flow_list_entry_delete(roc_npc, flow); - if (roc_npc->flow_age.age_flow_refcnt == 0 && - plt_thread_is_valid(roc_npc->flow_age.aged_flows_poll_thread)) + if (roc_npc->flow_age.age_flow_refcnt == 0) npc_aging_ctrl_thread_destroy(roc_npc); done: diff --git a/drivers/common/cnxk/roc_npc_aging.c b/drivers/common/cnxk/roc_npc_aging.c index e0f2dc2291..15f6e61d76 100644 --- a/drivers/common/cnxk/roc_npc_aging.c +++ b/drivers/common/cnxk/roc_npc_aging.c @@ -303,9 +303,11 @@ npc_aging_ctrl_thread_destroy(struct roc_npc *roc_npc) struct roc_npc_flow_age *flow_age; flow_age = &roc_npc->flow_age; - flow_age->aged_flows_get_thread_exit = true; - plt_thread_join(flow_age->aged_flows_poll_thread, NULL); - npc_aged_flows_bitmap_free(roc_npc); + if (plt_thread_is_valid(flow_age->aged_flows_poll_thread)) { + flow_age->aged_flows_get_thread_exit = true; + plt_thread_join(flow_age->aged_flows_poll_thread, NULL); + npc_aged_flows_bitmap_free(roc_npc); + } } void * -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:17.311592342 +0800 +++ 0070-common-cnxk-fix-flow-aging-cleanup.patch 2024-07-12 18:40:14.176594219 +0800 @@ -1 +1 @@ -From 85e9542d47009eeea2d4c4eaa703715c1c3bf4f7 Mon Sep 17 00:00:00 2001 +From 2428f9f2e30e1c69ea3ab0d7cd31b3e27d24986b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 85e9542d47009eeea2d4c4eaa703715c1c3bf4f7 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index d6ad3756bb..37e1a6a7ef 100644 +index a0d88c0743..fcede1d0b7 100644 @@ -24 +26 @@ -@@ -389,6 +389,8 @@ roc_npc_fini(struct roc_npc *roc_npc) +@@ -351,6 +351,8 @@ roc_npc_fini(struct roc_npc *roc_npc) @@ -33 +35 @@ -@@ -1810,8 +1812,7 @@ roc_npc_flow_destroy(struct roc_npc *roc_npc, struct roc_npc_flow *flow) +@@ -1626,8 +1628,7 @@ roc_npc_flow_destroy(struct roc_npc *roc_npc, struct roc_npc_flow *flow)