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 633664326F for ; Thu, 2 Nov 2023 14:13:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C64F40A76; Thu, 2 Nov 2023 14:13:40 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 372E6402D5 for ; Thu, 2 Nov 2023 14:13:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930816; 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=H7hs0tb+/NkQukf0r8/A0TOJX100UO2DvZJXmnNxBJY=; b=GLI20mhsuZ+CzS1GfIZ6tJKvvQp9RtMaNwmbYDSGSsxJD//duGAHkIcTi8+NnKZ96sxHNW zHmBisSjEZp1Fx0RFyz+wrcwYecMci45zVf46XibNOkejQL5h9DdAmhRbgpIhcZI+UpFex jlV6cBavPIpxEuh/+FVk5TlxaPR6Xiw= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-650-_wEB9HklNLWp7b9iJl85zg-1; Thu, 02 Nov 2023 09:13:34 -0400 X-MC-Unique: _wEB9HklNLWp7b9iJl85zg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 25E673816D82; Thu, 2 Nov 2023 13:13:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF8D4492BFC; Thu, 2 Nov 2023 13:13:32 +0000 (UTC) From: Kevin Traynor To: Jieqiang Wang Cc: Feifei Wang , Ruifeng Wang , Bruce Richardson , dpdk stable Subject: patch 'hash: align SSE lookup to scalar implementation' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:20 +0000 Message-ID: <20231102131254.315947-14-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/23. 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/25123c091bb4e33e760cca9a72be5f4b2ac9a145 Thanks. Kevin --- >From 25123c091bb4e33e760cca9a72be5f4b2ac9a145 Mon Sep 17 00:00:00 2001 From: Jieqiang Wang Date: Sat, 7 Oct 2023 15:36:34 +0800 Subject: [PATCH] hash: align SSE lookup to scalar implementation [ upstream commit e93bbaa72cca7ec912d756afdf10e393f9d71791 ] __mm_cmpeq_epi16 returns 0xFFFF if the corresponding 16-bit elements are equal. In original SSE2 implementation for function compare_signatures, it utilizes _mm_movemask_epi8 to create mask from the MSB of each 8-bit element, while we should only care about the MSB of lower 8-bit in each 16-bit element. For example, if the comparison result is all equal, SSE2 path returns 0xFFFF while NEON and default scalar path return 0x5555. Although this bug is not causing any negative effects since the caller function solely examines the trailing zeros of each match mask, we recommend this fix to ensure consistency with NEON and default scalar code behaviors. Fixes: c7d93df552c2 ("hash: use partial-key hashing") Signed-off-by: Feifei Wang Signed-off-by: Jieqiang Wang Reviewed-by: Ruifeng Wang Acked-by: Bruce Richardson --- lib/hash/rte_cuckoo_hash.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index cff4242f79..95c3e6c2f4 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -1867,4 +1867,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches, (__m128i const *)prim_bkt->sig_current), _mm_set1_epi16(sig))); + /* Extract the even-index bits only */ + *prim_hash_matches &= 0x5555; /* Compare all signatures in the bucket */ *sec_hash_matches = _mm_movemask_epi8(_mm_cmpeq_epi16( @@ -1872,4 +1874,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches, (__m128i const *)sec_bkt->sig_current), _mm_set1_epi16(sig))); + /* Extract the even-index bits only */ + *sec_hash_matches &= 0x5555; break; #elif defined(__ARM_NEON) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.231401528 +0000 +++ 0014-hash-align-SSE-lookup-to-scalar-implementation.patch 2023-11-02 13:09:40.786163249 +0000 @@ -1 +1 @@ -From e93bbaa72cca7ec912d756afdf10e393f9d71791 Mon Sep 17 00:00:00 2001 +From 25123c091bb4e33e760cca9a72be5f4b2ac9a145 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e93bbaa72cca7ec912d756afdf10e393f9d71791 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index d92a903bb3..19b23f2a97 100644 +index cff4242f79..95c3e6c2f4 100644 @@ -34 +35 @@ -@@ -1869,4 +1869,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches, +@@ -1867,4 +1867,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches, @@ -41 +42 @@ -@@ -1874,4 +1876,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches, +@@ -1872,4 +1874,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,