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 1D44645DB9 for ; Wed, 27 Nov 2024 18:23:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1974F40A82; Wed, 27 Nov 2024 18:23:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1429E406BB for ; Wed, 27 Nov 2024 18:23:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kr1/G4sgQknIeYh6+aL+ikhyUw8Sa9AMerRji4d/nr0=; b=NvpgcxbalUw7da9EJX9Lqu/MsTqz2MzqLFvf9hHVAlw8CF8OQAEaVeNvd0z70v8TvO+mX5 T9Y4zsdhbCGMmyFZeiw5s1L1Y1VmkmawqAE81vvmyXY6J5/w2JTxf3DoOJJCXSivmKRRld HG10mULJY7v1RnB/+olARKIf1ETw22Y= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-249-ibkgEaBPMP-_VQG8xPcZ_A-1; Wed, 27 Nov 2024 12:23:27 -0500 X-MC-Unique: ibkgEaBPMP-_VQG8xPcZ_A-1 X-Mimecast-MFC-AGG-ID: ibkgEaBPMP-_VQG8xPcZ_A Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 30E8819541A0; Wed, 27 Nov 2024 17:23:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E8A83003B76; Wed, 27 Nov 2024 17:23:24 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'member: fix choice of bucket for displacement' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:19:01 +0000 Message-ID: <20241127171916.690404-114-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JvU1cK688Vb3Wwk6drm6ipFVdOqPJ2Hoob4knDLAiVQ_1732728206 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.9 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/02/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f7242cd3efdf5e66c221a0c24800ea316f4f697a Thanks. Kevin --- >From f7242cd3efdf5e66c221a0c24800ea316f4f697a 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 [ 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 @@ -494,5 +494,5 @@ rte_member_add_ht(const struct rte_member_setsum *ss, /* 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(); -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.844628434 +0000 +++ 0114-member-fix-choice-of-bucket-for-displacement.patch 2024-11-27 17:17:38.346270000 +0000 @@ -1 +1 @@ -From 33f5b0dcb11580be8091f3b589845e512008e2f0 Mon Sep 17 00:00:00 2001 +From f7242cd3efdf5e66c221a0c24800ea316f4f697a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 33f5b0dcb11580be8091f3b589845e512008e2f0 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 357097ff4b..738471b378 100644 +index a85561b472..0d0376b264 100644 @@ -21 +22 @@ -@@ -495,5 +495,5 @@ rte_member_add_ht(const struct rte_member_setsum *ss, +@@ -494,5 +494,5 @@ rte_member_add_ht(const struct rte_member_setsum *ss,