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 0E63F457A1 for ; Mon, 12 Aug 2024 14:51:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07D5E402C3; Mon, 12 Aug 2024 14:51:49 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) by mails.dpdk.org (Postfix) with ESMTP id 905E04029C for ; Mon, 12 Aug 2024 14:51:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z6wZ3fpnXgYf3HViux0qxhe50ptu+PPQu1U1Kj/8Of1Lzpr+9JqlTT5RCSrLOFy/OBo1QyoORq3rC3VjY2GsNkla+Cb6/F5jGQqh+yxvjVZaqHMplM2DU+I06ljk048ZCB+EFxp37imC4NA22Q+ayr4hbacwvrvxfBFPY0yvTitzeQKMy5w2vAjOcmBY7QXTPgELvY7ybDW1Xt0GsE283oqQQ0sQ5N5NZfM8MrfXHXzW86hDSkQK1OdyF4zACbaIBI1q7zSu7JeJWojQYZjLNH/qniJtXqTt4aOiUhLgKQiFrvqaWKPEl8k3qQlozE3DUBLXHUqZPRuB+1/zqWilkw== 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=QBIe6u13lwMO22WOTJI0oyXlYJyUUdBv9f5kQTZtPwg=; b=TK9vm2hyl7uOiKv/3uxDRUTXJUigdvswW1YGyNV4xb2hPIhcdg/17OhNp9kRsUmwIy8UqrD0w2EAbla+47YbSxAvwWf8CSos7Ppu0R12oplIo/Z5WmdYxYU087eB0VZmVb1SU6G+aLMVRQzRR8Q2mSgMEmXkqWpEcXxIC2N8PedoU0kUBLN8ELc5OCdbG+scCqsnGo3kVC3v8Q31tcpe5K+ieQLcysnHCoRYkb+/AFj/z4rD0OpxDSVc5B/UyT6pHiIe+KlLv6zHTE55ZbWopB9JzGYTcLwSrJ263NQfWWK3ISO/QOhNUaArkq3uwgt0VwHxIOyKRmwP2LyR/Iqo1Q== 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=QBIe6u13lwMO22WOTJI0oyXlYJyUUdBv9f5kQTZtPwg=; b=pqa3VEdkvwfQsynWVSu49hjqh7xz9QjXFvix+dI32+xbJK8Pf7XQ34m1hPxFWLXKTgym1/IhBPlPxaTzlZjk3dK8YcHPf7IY4Ls0Gb+Nk8W1UHwCn0/T6JOcWiA1HG54enrE18C9fJaO2jsaUzYdFDt+EW06B656WMEsFGV9W4SwFpdZ9ObFG2EECd8Pr1xK6ZceUxwzLV/YR6xLa8qPpKEqPCKzlBc0a2Bb0kFTBLMAp9zK29XjcjTkuOU4CtQv8oDbXbWKMM0+rE+ToJeVquW+Ilp2xGIrNP0Vvs4vHfsXsuXDbSiPW2WwJVqeRptORVK7OmIs5MdiXbaLiF6jrg== Received: from SN1PR12CA0111.namprd12.prod.outlook.com (2603:10b6:802:21::46) by DS7PR12MB6072.namprd12.prod.outlook.com (2603:10b6:8:9c::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:51:44 +0000 Received: from SA2PEPF00003F68.namprd04.prod.outlook.com (2603:10b6:802:21:cafe::82) by SN1PR12CA0111.outlook.office365.com (2603:10b6:802:21::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:51:44 +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 SA2PEPF00003F68.mail.protection.outlook.com (10.167.248.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:51:43 +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; Mon, 12 Aug 2024 05:51:31 -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; Mon, 12 Aug 2024 05:51:30 -0700 From: Xueming Li To: Kiran Kumar K CC: , Harman Kalra , dpdk stable Subject: patch 'common/cnxk: fix flow aging on application exit' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:03 +0800 Message-ID: <20240812125035.389667-7-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.231.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: SA2PEPF00003F68:EE_|DS7PR12MB6072:EE_ X-MS-Office365-Filtering-Correlation-Id: 982458ee-9aa5-407b-1357-08dcbacd84f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nZTiyG+i4Cg+si8D60I21/gU/jFK7oMriSOpEpjL8UsjhEX04zkQjhp7bPGg?= =?us-ascii?Q?ggMq4A15J0PLfkSeGuUMM+jy1jnu7jPgfugiw3j6o8lTzheA6Pyij8gpJ4J9?= =?us-ascii?Q?K8qjn/AgzRaIGFjThMEoQwJkwsxL7kjFl9QB+6Gm763mp9ZBtEx8snldzdWJ?= =?us-ascii?Q?zVj0qc9bKtj+0W4XNSlwJA4bwd+cTLG2LygN7g+afVmDN/l7ViJGl74p2mHj?= =?us-ascii?Q?wIMaVPP/5B3S2mgfotah3xaUeG4EB1p9KDy2pPzA5bf2RgVa03w9oDWJi80r?= =?us-ascii?Q?MX1Dezp9Bzh2jrKXA3jc2uweZIENg1pW1OirB/1l37brIGrBrP5zk9XcCaQn?= =?us-ascii?Q?YQneM8X+jA/RaoPlzLIVcVrkMY8SczonWEyCcjnrVVWtfiwyOeJY/7ww+gS1?= =?us-ascii?Q?psGC1c5iGQ9Du+73lKys0zwOA+G0xAODVQlFIVFpoez9IITMqGoQj9iDsWV1?= =?us-ascii?Q?5LTxiK28RuYwDIOTaFZi0UOZSzDgEiA09poG22w6OCV2seFDYeu05BRMy1++?= =?us-ascii?Q?Zn72p1Xo92NOQEBnIZOejORUNpcbUuzHcBWo0vkBpVT4Je6fM8jXkUNAbhdN?= =?us-ascii?Q?BUTNehinBpoaW4dmQJMH+N6Ukl0HCPAEcPGUCtWzmpGFRV6WAIiFT+t4eYpW?= =?us-ascii?Q?4Mr2twLieUxTJSccnvN+vJPD/w3tJP5eSjozsY2Gj2HG70PxGdmPs98waPlO?= =?us-ascii?Q?cQVKVtEBO1HUZOrgVnBIpRxkJys9At7eNhuH4vcpZ40Woh/KsUFF3skRrZRs?= =?us-ascii?Q?Xhji0Ah9fJ6TJEF1FCu9Nkbp4+S+Qf6/yeoPkev+/50ByWXKcn5nyf1NmDRq?= =?us-ascii?Q?LUkXcx/GHQMBHI9YsIkR2xi21/PTi8M4ir+tmczxRLKS/RvkPta+Ac+/ioPi?= =?us-ascii?Q?2/D5PCMci8PuUbq1L0P+SXzT0dKbrDTZ0gAmkS28Ox2e2KoDgXqKq8btNaae?= =?us-ascii?Q?wAW4PqWoJZVgNincrP/0Es/4RAt+7dQei0e+Hq/Ktq0Wjo8NjrYqsBhZIVbt?= =?us-ascii?Q?Z0bsuZsE3ohqubDufAzRXJMIEEfHTi/O8+DBbGCSpx5PXPJqnrmgLvav5TIF?= =?us-ascii?Q?D0yCwBI1Uf57nOpuDICH22n/vF3AbNUFVRrqmLNGmpCQOj6M1cKaQPxTpD5Y?= =?us-ascii?Q?8YGY+Bu4siNpq7npwgcZ0KVZhKbHVNS/0jXcDhlXZMmixNTIfhK44fvQ5mCc?= =?us-ascii?Q?NWo+No7YSEO90PUC8h0ABLfDtl8nvhfRtIEVI+MxWipeHu6T6k8wRxPPs6R9?= =?us-ascii?Q?xgeNI4TX+IB3HVIcCvMAgKf34ENCvnbPW+1ZF9OPfbgBpKtcrYvjxM3/8ZmC?= =?us-ascii?Q?UNadgDM/tcEwvw5ozwxyC0D4xwkk1eAfUp8y5yMTnjX5EckajjIfW8wXcOUK?= =?us-ascii?Q?eDrqVA52vHjqKKYMtxlDskmFXmFP0X7eNVm9EQmBvEpx/pLrjbXSG65ucA0L?= =?us-ascii?Q?/a9Nnqm8HHNqwpdLe//DBVtvpEaBRDRy?= 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)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:51:43.9749 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 982458ee-9aa5-407b-1357-08dcbacd84f0 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: SA2PEPF00003F68.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6072 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=d859544e45c512464d85761a7d3a404c2972cd93 Thanks. Xueming Li --- >From d859544e45c512464d85761a7d3a404c2972cd93 Mon Sep 17 00:00:00 2001 From: Kiran Kumar K Date: Mon, 17 Jun 2024 16:57:54 +0530 Subject: [PATCH] common/cnxk: fix flow aging on application exit Cc: Xueming Li [ upstream commit a4878294318eda0ea242562419a5797bf5440862 ] If flow aging is enabled application termination may take time equivalent to aging timeout. This is because on termination flow thread uses a sleep call which is uninterruptible. Fixes: 357f5ebc8a24 ("common/cnxk: support flow aging") Signed-off-by: Kiran Kumar K Signed-off-by: Harman Kalra --- drivers/common/cnxk/roc_npc_aging.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_npc_aging.c b/drivers/common/cnxk/roc_npc_aging.c index 15f6e61d76..1e85033e2a 100644 --- a/drivers/common/cnxk/roc_npc_aging.c +++ b/drivers/common/cnxk/roc_npc_aging.c @@ -133,6 +133,21 @@ exit: return rc; } +static void +npc_age_wait_until(struct roc_npc_flow_age *flow_age) +{ +#define NPC_AGE_WAIT_TIMEOUT_MS 1000 +#define NPC_AGE_WAIT_TIMEOUT_US (NPC_AGE_WAIT_TIMEOUT_MS * NPC_AGE_WAIT_TIMEOUT_MS) + uint64_t timeout = 0; + uint64_t sleep = 10 * NPC_AGE_WAIT_TIMEOUT_MS; + + do { + plt_delay_us(sleep); + timeout += sleep; + } while (!flow_age->aged_flows_get_thread_exit && + (timeout < (flow_age->aging_poll_freq * NPC_AGE_WAIT_TIMEOUT_US))); +} + uint32_t npc_aged_flows_get(void *args) { @@ -197,7 +212,7 @@ npc_aged_flows_get(void *args) plt_seqcount_write_end(&flow_age->seq_cnt); lbl_sleep: - sleep(flow_age->aging_poll_freq); + npc_age_wait_until(flow_age); } return 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:02.844139342 +0800 +++ 0006-common-cnxk-fix-flow-aging-on-application-exit.patch 2024-08-12 20:44:01.895069255 +0800 @@ -1 +1 @@ -From a4878294318eda0ea242562419a5797bf5440862 Mon Sep 17 00:00:00 2001 +From d859544e45c512464d85761a7d3a404c2972cd93 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a4878294318eda0ea242562419a5797bf5440862 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org