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 E0D6545E41 for ; Sat, 7 Dec 2024 09:09:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D164440281; Sat, 7 Dec 2024 09:09:07 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2089.outbound.protection.outlook.com [40.107.237.89]) by mails.dpdk.org (Postfix) with ESMTP id D1D4E40281 for ; Sat, 7 Dec 2024 09:09:05 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xeHRgn9RsOwh/XSahVDPEA6lL6oW8/VbXIC1M64dutsmEGct6nO77Css96THb3raECPk0WsslniSNaQw9bsUErsHjC/Cj0crquC5pzIzWm7eIFFjicmSAkN8MsWyQoKIY694JizQKobXXlh2OPVJMDZWXwMiGfqSMH7Zch59bqyAUygklXV6uvr7mdb9xJgNjwYKGEaF3Myx506lQ97/Aa61ntEzYsHMYpb2gu4cJEbNMkSJCMioiiROYxhsUU8ZRoo9PR5oa0XpkQ6X9OrqicJjnYSS4HnNcf+yETTpLhkmIdonpuBPzurS+96nJ3qxk/Hezq7xCkyl9eabpXTQLQ== 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=hrVtZFpnqk8G+O5TazVD2UlD8ebFn6yx0OQiu8e6bLU=; b=C9UtqM7dEQ5+bwDI5Xkv/ALHhQAYzAeGJWpXEA7zXNhNsdkf/yGW82s8HrM5H5m0COB5NLliF163kk5epERcIFUZanZ7b2Ryj1qmylrFJTJ8HvjiOE4fRTGzohCMKkwIUt6bJl8RExRG9zaNh7LyQcwBXu5lAbZRfVlBgD2Yt3THEicKUHzYgPEbLyv9vXDaJLFDEpbAGcd8kw6UV4TZR6RNDGP1Ia+zKFq+plm3bqu2QAx0dYRXJRYeDj5YS1BPnE7wraPS5wKeZYC3ni9gjsNNZp2pVvO5ImsK7nlneqw4hjYiSbJHVg/To01HerA1j7G5wInHrBUKySl5dLcF8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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=hrVtZFpnqk8G+O5TazVD2UlD8ebFn6yx0OQiu8e6bLU=; b=P69gRMMyyJG2+EldcuqZgRXYe+Sb0VJuGUvhAPfOfy+yCIca92JRa+IV2iG/C691MT2VnwBey1TyLXIjM/Zjmg5DxrCrBK5eRCBriKneTMMn5tXV6UZQkFMkcwOeyTZMePzc3MLqdnvI/GVc1eaSCn+CQ9K//DWoAlU64vj6W2mJBSLGH+dkOasPTMCGqniZJP1ZyYvAym+57yuDcu/t8frOp2YvUSSTK233yAf6dcDhvHraedh7jD/42+izGqXwR0YJTvPXglRh77Z//kH442dsbytbUiJz5DR6z/ThA/aB3cA0JHTdekeCdeLJXRsigw4UyzV52cYJLegXHbG7/Q== Received: from BN0PR04CA0062.namprd04.prod.outlook.com (2603:10b6:408:ea::7) by LV8PR12MB9262.namprd12.prod.outlook.com (2603:10b6:408:1e7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.12; Sat, 7 Dec 2024 08:09:01 +0000 Received: from BL02EPF00021F6D.namprd02.prod.outlook.com (2603:10b6:408:ea:cafe::7a) by BN0PR04CA0062.outlook.office365.com (2603:10b6:408:ea::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.10 via Frontend Transport; Sat, 7 Dec 2024 08:09:00 +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 BL02EPF00021F6D.mail.protection.outlook.com (10.167.249.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:09:00 +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; Sat, 7 Dec 2024 00:08:52 -0800 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; Sat, 7 Dec 2024 00:08:50 -0800 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , dpdk stable Subject: patch 'member: fix choice of bucket for displacement' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:40 +0800 Message-ID: <20241207080055.488538-83-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: BL02EPF00021F6D:EE_|LV8PR12MB9262:EE_ X-MS-Office365-Filtering-Correlation-Id: 791ac8c4-a2b1-4a70-1715-08dd1696686d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rgk0DIHtfzgNTMGWZiAZnbCUdmQXwYX+MJqfX7jdqpFqYwgJrIcJ/zUDkjoL?= =?us-ascii?Q?ADvq67ttf4cUuEPOEOA/x1lDmywMw3J41XQmq+z9jM0RSUGP2ttm1ecSth/d?= =?us-ascii?Q?cYq0gmLlZRPRY5x6tmbWGqX4bc02UQVLqGNQmZ4f/w1oz/xR7BKHsKs2DupE?= =?us-ascii?Q?cnrXB856qi+MxAziH19za7Z75T9KParnWs0X/nUR23xLibR2LBC71Pa1HknU?= =?us-ascii?Q?9lLL1yOyDs5OOdKa0r9cM/nsz3cRAuWqAsSiIrNQXt5vTcYm3hX7a8NPUcnK?= =?us-ascii?Q?01YoEGbMOn4pat2vODynqgunRLYq017p2GAf4HjgFjSBsmI+hHFnKuYF5xon?= =?us-ascii?Q?VyeYKQC9jpcly3XoxTfRQSb9jXQLtJ1M0lH646OZCG/omiIDp17fPKQXGZde?= =?us-ascii?Q?bgzC1WmJPNVIz0YB1zHilDTs6JvPSiw6rlYEoFeuwn+EURyWIjbUUW6/A1Qh?= =?us-ascii?Q?owM+M4GDsxLC6FoItewaEfDgPlRUReNsdqBzXdQt8wZKKvu7Sh/EzMF+TCHd?= =?us-ascii?Q?33orM3n8kCsXvUn18bC24KOamT+0wE+q/+7JUPnaJeVKg1DBbr+LaYqJfS4W?= =?us-ascii?Q?+FvTgTQg4Syf+yCd+rXoJw7mrN24uJLVlVsYcaX7xDlhvVjrEadw7YgYNHzB?= =?us-ascii?Q?nYQDr6+SoCQ1cJPFRFBYwPhnOuMGNJoKWDzQPIDS9Bc99ALZaZb5MWTYvbEM?= =?us-ascii?Q?dIVf1ejW6//9PoeG4c9py5W2boWUJhv7X3gTD83b6MymWk9U0A85P7nNtZxv?= =?us-ascii?Q?i+8DhOG6838fl7tCVZA9fWZBbFYI8QknCEGZiLmGA0OU8aX8AkmjC0+FFRJn?= =?us-ascii?Q?EPBLe8d6fNzxzSjKDxmEE8O81IpZUReN3BWLZt2nDvC9C8+dAw/HTuj6RQ4I?= =?us-ascii?Q?R3KRPzdX4ESR9ItRg2ND1/jCWvYGQZe+Xekrcj2oALV4Mvqv5v0NtYd589Pp?= =?us-ascii?Q?4ZnWV8LkaqYgq9wFSNB28QI46sXAsYqAJXV3m5KZgW0l7m2AaHEVeePMnMyj?= =?us-ascii?Q?gTLPy3ooM3WF8rKpi4xh3QunwTsOZkUrVHqD6AiFIB3JvcOmHvjd5xTs0xv6?= =?us-ascii?Q?WAUXq6QbLSEDKOUD47VmzhW7eKVbk6aWESNQSE/poQHaYI9VRC3J2FN75cuG?= =?us-ascii?Q?2za9xu55OLYGdweQx1JsumyjxN4FTRXyST7BN3Pgzwa7mPf8rsQBsZlLAZJs?= =?us-ascii?Q?PjXByPoMobqlxlJyi1Aoi4G54l47UJqJu3U50uFl/6C7RkLe/vhpPFG4wtW3?= =?us-ascii?Q?ZbKZk4APfoWBjhMkibqmGvkYOKcjbo35nzq9D+DJDahjFUIDCBURRZTXnLF0?= =?us-ascii?Q?TVkeFPmBj66Hd8Zi7yP8FlUxoLfC2IHdU/4FsuMKKBS5LkU6HBOKBRNWDE4K?= =?us-ascii?Q?yb2HNveLEz12fH2uYR0smpU9VP9cGFmSM2eBmioxJxI+kp7W3eZKYHqj6vgC?= =?us-ascii?Q?yAAp1xgsAE9iQEi/+hyNtKHLkztw9nmC?= 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)(376014)(82310400026)(36860700013)(1800799024)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:09:00.7332 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 791ac8c4-a2b1-4a70-1715-08dd1696686d 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: BL02EPF00021F6D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9262 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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=c6840df8b593bf813e005fddd03c7de1a7684bc9 Thanks. Xueming Li --- >From c6840df8b593bf813e005fddd03c7de1a7684bc9 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 15 Nov 2024 17:12:29 -0800 Subject: [PATCH] member: fix choice of bucket for displacement Cc: Xueming Li [ upstream commit 33f5b0dcb11580be8091f3b589845e512008e2f0 ] Because of misuse of & vs && operator, the member code would always use the primary bucket. Fixes: 904ec78a239c ("member: implement HT mode") Signed-off-by: Stephen Hemminger --- lib/member/rte_member_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/member/rte_member_ht.c b/lib/member/rte_member_ht.c index a85561b472..0d0376b264 100644 --- a/lib/member/rte_member_ht.c +++ b/lib/member/rte_member_ht.c @@ -493,7 +493,7 @@ rte_member_add_ht(const struct rte_member_setsum *ss, return ret; /* Random pick prim or sec for recursive displacement */ - uint32_t select_bucket = (tmp_sig && 1U) ? prim_bucket : sec_bucket; + uint32_t select_bucket = (tmp_sig & 1U) ? prim_bucket : sec_bucket; if (ss->cache) { ret = evict_from_bucket(); buckets[select_bucket].sigs[ret] = tmp_sig; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:46.833508205 +0800 +++ 0082-member-fix-choice-of-bucket-for-displacement.patch 2024-12-06 23:26:44.083044826 +0800 @@ -1 +1 @@ -From 33f5b0dcb11580be8091f3b589845e512008e2f0 Mon Sep 17 00:00:00 2001 +From c6840df8b593bf813e005fddd03c7de1a7684bc9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 33f5b0dcb11580be8091f3b589845e512008e2f0 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 357097ff4b..738471b378 100644 +index a85561b472..0d0376b264 100644 @@ -21 +23 @@ -@@ -494,7 +494,7 @@ rte_member_add_ht(const struct rte_member_setsum *ss, +@@ -493,7 +493,7 @@ rte_member_add_ht(const struct rte_member_setsum *ss,