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 1DACA45610 for ; Fri, 12 Jul 2024 12:53:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1756A402E5; Fri, 12 Jul 2024 12:53:48 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2063.outbound.protection.outlook.com [40.107.236.63]) by mails.dpdk.org (Postfix) with ESMTP id 8030B40261 for ; Fri, 12 Jul 2024 12:53:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r7AqWMvgEh+8vuedbJGnMCfBkyNQ1KPiCwgPVli2oMjJcRwl8F3XFZ3PZE1CdmsNvNgfN/0iBEIGoY27xpk5IQ4q80EC/Zj54ML6kznRk577sbAf7DC4CSBhgMQKDsVtc1Nx2MoesYY79AUOfg7TFxIdGrN5aO9ntE/toIb220f6A3szk76oMXNp/oEd9/e1wIEf2TKeI6Z2HDIRLUHaSySUyqQNv6/VBRSzGE0l/8O/pZ6fpsB3icaH22kXxxt/hgJ93rcAvKYmkx5p2VxQ+PR/3Cj2GIEWQXrjTIu/yZF6O2QdSkdMOrQovE4pbWD6ruX0OsvbvZwOhj9cbgiaQw== 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=teSM9dsji5LeofvwvyauTmMyNOsPdK1RzHvVivl4D/E=; b=pOYxc3M+PR2j0tnLDx7kDFwcsuorwfU7rwiSijNZkv3DMUi/78OLgWD1MR+aBmub6L+uhy3s0s0D7jCnRVYKTuxmTlevzIwsWw7MjPA5SvbmsYrxwilNW8In+zUCqOkFiBTrjRtehEyUGSR/R8HBcwCy31IfEb4gmbHJ/npZCedxp+V5C/ygeNcauO0W4dFnkPBzjg2snL/yuM9oxpS7VW/cs4ZrvuODR1HblZU306gC09RlTWUHGS8MYLublq+XSDuSf3xbvtxHpHn3tneXXbTH7iWVaJItMLk5uMdjaKFX9Q86CzXKAVPVrfBb0hAORwo8T4BNfzCbTBpLXdcu9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=gmail.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=teSM9dsji5LeofvwvyauTmMyNOsPdK1RzHvVivl4D/E=; b=QCuT2GqKyN+ARjD8D5xtAS33sfWR5Mq2uwkDnx/ECNn3Ig3twhLbgvNcLqu32EQDgWngQ/262yjDEwp4UaXZ2YN72/wPYjIg3M6U3wvsYITuONp0AQ+LDXz/BoUKM+jFS3XOHrqP4nUylAveMbcPPzkiSw2uPx0n6k8FtCgVJ/b2KhaAcnVfuA8yFUaMtWQDb/jTWhwt8/OCjkhlRJRNseRsklRutYpyD/vbZFnQk7FDKAdV0AfEtrlFyE+9Vxi07CalkOR368TykU2YwSo4pyUBSK8KJaN0x79Xah3Wh0GznTwvDIbGnk7pHoVNbLIGCFkU4yMHkwI0M+eElCKwmQ== Received: from MN0P220CA0015.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:52e::13) by SA1PR12MB6752.namprd12.prod.outlook.com (2603:10b6:806:259::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.34; Fri, 12 Jul 2024 10:53:41 +0000 Received: from BN2PEPF000055E0.namprd21.prod.outlook.com (2603:10b6:208:52e:cafe::7b) by MN0P220CA0015.outlook.office365.com (2603:10b6:208:52e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.24 via Frontend Transport; Fri, 12 Jul 2024 10:53:41 +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 BN2PEPF000055E0.mail.protection.outlook.com (10.167.245.10) 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:41 +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:53: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; Fri, 12 Jul 2024 03:53:29 -0700 From: Xueming Li To: =?UTF-8?q?Abdullah=20=C3=96mer=20Yama=C3=A7?= CC: Honnappa Nagarahalli , dpdk stable Subject: patch 'hash: fix RCU reclamation size' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:45:05 +0800 Message-ID: <20240712104528.308638-80-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: BN2PEPF000055E0:EE_|SA1PR12MB6752:EE_ X-MS-Office365-Filtering-Correlation-Id: b9b4c6ce-9338-4c1d-615d-08dca260e49c 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: =?utf-8?B?bEJPZllVaERKdGZtZmhMMW1zNjhicWFsY29lL2paWlFOZ2F3UENVZTB6ektx?= =?utf-8?B?VzRrUkFuY0N0SVdGUzF0VUtsRWZLb2psWjE4KytXNTZrSkI2eFNUaVJzMUtH?= =?utf-8?B?emE3dHJmYnVHS0NYVXN0WDhLdVNKbFFmZzJkS1VKZkZCS21VR3p4dlhKZmN6?= =?utf-8?B?dWp3YUhYMmJISTNaQU1sVzdDUWxnZWpXVDArNG5Td3VFU1BNY0JMcUdSK2hL?= =?utf-8?B?b1JvWUo5L1A3RU5ac2NWKzFqcDRFNURMV2xadnBGWHNmWmJuZnE0NkxlV0dL?= =?utf-8?B?WVZDNmZ5eXA3R1hZTUVOQ0hhNmtHVGw1TGswVEJ0d2FURUtMV2FmN1FZNzdo?= =?utf-8?B?L1hvdEp5TkRFaHdVUDA5b2hJd1JiVzRyZWVocEhueCtaaGxSUkg1bkJTS0Qy?= =?utf-8?B?RjQ4NGtGZUhoYnlxUytZeDN0K2RHb0Q5RWVMUFRiVkQ5b0ovWVBlZG80ODVQ?= =?utf-8?B?cVdYWExqSTEycjdmbzVUbnJzTVllTEI5Um1ZWHliTlNFNFFORkxadGN2a0FX?= =?utf-8?B?KzNhMTFRU0lXUUtjc1UwY09ERkNwVjBnRXprbHFSY3REWTZjVmhpeXZ4THM5?= =?utf-8?B?cXFWRDcyd0VZOS80djFPSUYvNCtGNGxjR1AraHJWSmYxaXpIQ1lTcjAwVm5T?= =?utf-8?B?SDcwQlpZODJ3Q3FPTkJVY1M5WVFoSkRUMVQvWU1RZDJYTWo4b20ydmVoUW02?= =?utf-8?B?aWg1MTRoeVcvRExaT2V4dmV0Y2dlUERWNGtjZ01OamN5NnJMbXlCdXRZVWhD?= =?utf-8?B?NFZmNGwrcW1jOFViRVJnb2F2MGN6YjFVR1pmdE53RGhtQURDWEdPTkpEWXA4?= =?utf-8?B?bDVwMklKMUFycjZxdlJ6U0UvK1Rhb0VrWnRPc00wRk9yYXAzNldUTVlHYWxm?= =?utf-8?B?dDZrWWFkVTNjRnhpV1E5aW82bGlnNDR0Vk92ckVPSGhWWTZ6RTFZR3drTTJT?= =?utf-8?B?dnlmT0VJL0VUeE1GSldydjRYNEVVc0U1amxnTXlUSGtzdzEzOW5jZU1uclRQ?= =?utf-8?B?RnpheTJma2NBVWZaTjhNODViQjYrY0F3SUpHc2w3bkJBYThoMTUrbGtmeXpI?= =?utf-8?B?ZmdTNVphV05VazFFWVNnVjZJYXpmVFNtYWVwbnBKR21WUjBqZC9FWXV4QlIz?= =?utf-8?B?dGVSNEh6TFE4RjEwaWFjV3ZLQ0NSVGxCdjV3R2NWVXphQzB2WVRoRFUyaDRH?= =?utf-8?B?Z1hwNXdhc2FhZmlmZjFZTVJwZGhiWVVXUktZcGVrTTA2UG5TcGRSdEdsRk1E?= =?utf-8?B?V3Q1a210NURHZlZ5ajFSaFE1N0h2ZTZYYktVTFdSa0dEMkFBV3ZLa2prSVpR?= =?utf-8?B?R2FHUnVuUGhVWVlQeXhJK0U2RDlTZHdrV3ZPSlUwYnNibUJTbm4zaUl2dnVj?= =?utf-8?B?YzI1VU81NmdCSjFWTXpNbUQ1ZWdiMVJzQ2RMNEF5Y09mK2ZlM2FnU01Mb3Np?= =?utf-8?B?dGUrVXJVK1RQN0lmZ09yV1dON0xyQTRSUVJlL3NWZ043SWlIVnYwRzNjczhx?= =?utf-8?B?UndYRFkyTzJJbkh5M0VZRWVIVG1sL3BPdEdYRE5iNkxXN24zbHJxVnZhSlJ2?= =?utf-8?B?UERGRjJBTEJtaTdTTnJ3bVdiMmxQUWgrNlhCRVhDWVorUThoME5kNm1VVU5t?= =?utf-8?B?RGl5anhSWW9wNG0xSUxmdFcydWFyMGduTkxSaENnVHZpWmlDYTNzVngyclJW?= =?utf-8?B?UTB5N0VsOGZIZlpvVUE0MEFFb0dzTWN6WFNibzFxeERrdmhMZzc2dmt3ajl5?= =?utf-8?B?OTZBb0JzY2RCZGx0QnU5dUxUMFlDSnRQNDZZanlpTXVsR21SMUhxemRvN2xi?= =?utf-8?B?TUZZa1dJYVNVRFd6UGVmbmdrN0pyS0VGL1UrUWlQTTcwd0NYZzhZRTVmNWxw?= =?utf-8?B?Qm5pb2E1WWUwTzJqTXdLdlB2YlpsYXdEQmlMaUtuZml2cWc9PQ==?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:53:41.3594 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b9b4c6ce-9338-4c1d-615d-08dca260e49c 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: BN2PEPF000055E0.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6752 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=7c1ecb9fef003a1d5db7c9dc43eb3381a87ca119 Thanks. Xueming Li --- >From 7c1ecb9fef003a1d5db7c9dc43eb3381a87ca119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abdullah=20=C3=96mer=20Yama=C3=A7?= Date: Mon, 13 May 2024 16:35:53 +0000 Subject: [PATCH] hash: fix RCU reclamation size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit d45a7eed07d6b024956d10af529fcdcdd798227f ] Set the maximum reclamation size to user provided value. Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation") Signed-off-by: Abdullah Ömer Yamaç Reviewed-by: Honnappa Nagarahalli --- .mailmap | 2 +- lib/hash/rte_cuckoo_hash.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index ac2268a1d1..15c75499e5 100644 --- a/.mailmap +++ b/.mailmap @@ -2,7 +2,7 @@ Aakash Sasidharan Aaro Koskinen Aaron Campbell Aaron Conole -Abdullah Ömer Yamaç +Abdullah Ömer Yamaç Abdullah Sevincer Abed Kamaluddin Abhijit Gangurde diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index 7871f6e090..258b6b7f2b 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -1551,6 +1551,7 @@ rte_hash_rcu_qsbr_add(struct rte_hash *h, struct rte_hash_rcu_config *cfg) if (params.size == 0) params.size = total_entries; params.trigger_reclaim_limit = cfg->trigger_reclaim_limit; + params.max_reclaim_size = cfg->max_reclaim_size; if (params.max_reclaim_size == 0) params.max_reclaim_size = RTE_HASH_RCU_DQ_RECLAIM_MAX; params.esize = sizeof(struct __rte_hash_rcu_dq_entry); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:17.671873799 +0800 +++ 0079-hash-fix-RCU-reclamation-size.patch 2024-07-12 18:40:14.216594214 +0800 @@ -1 +1 @@ -From d45a7eed07d6b024956d10af529fcdcdd798227f Mon Sep 17 00:00:00 2001 +From 7c1ecb9fef003a1d5db7c9dc43eb3381a87ca119 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit d45a7eed07d6b024956d10af529fcdcdd798227f ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 3e73eec762..9013e15ea9 100644 +index ac2268a1d1..15c75499e5 100644 @@ -35 +37 @@ -index 16c9c4c5c4..265335f845 100644 +index 7871f6e090..258b6b7f2b 100644 @@ -38 +40 @@ -@@ -1558,6 +1558,7 @@ rte_hash_rcu_qsbr_add(struct rte_hash *h, struct rte_hash_rcu_config *cfg) +@@ -1551,6 +1551,7 @@ rte_hash_rcu_qsbr_add(struct rte_hash *h, struct rte_hash_rcu_config *cfg)