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 38F9642ECF for ; Thu, 20 Jul 2023 17:23:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34AE440685; Thu, 20 Jul 2023 17:23:10 +0200 (CEST) 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 ADA69400D6 for ; Thu, 20 Jul 2023 17:23:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866588; 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=VEAy+r/BPGqXWeEL0lUxTmxxk3y4kz+0DxK24iroGZE=; b=BYetUylJU4IgKprV/z017IUM/nrAmOOW2Uz+X1W1lCIROyAxYUhUSCuYV9swhfE6++UbK0 qmpRAPgG5ZJkKebo07+g8qE23Gk3aCJAfVB4RkQwLsRkRmsXY+I+p7yUsZbSo6elUh8dJy D0MMNl6Vb+tuk0AbJuQ3d4NSoqSDT2k= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-177-JwuFGzw2OdKpiHrDMhBv0A-1; Thu, 20 Jul 2023 11:23:04 -0400 X-MC-Unique: JwuFGzw2OdKpiHrDMhBv0A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 58AC71C29AFE; Thu, 20 Jul 2023 15:22:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36FF8492C13; Thu, 20 Jul 2023 15:22:50 +0000 (UTC) From: Kevin Traynor To: Vladimir Medvedkin Cc: Konstantin Ananyev , dpdk stable Subject: patch 'hash: fix reading unaligned bits in Toeplitz hash' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:05 +0100 Message-ID: <20230720151942.262154-114-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.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.5 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/25/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/086b98481996e9bced4c406b5901d1dadc69176a Thanks. Kevin --- >From 086b98481996e9bced4c406b5901d1dadc69176a Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Fri, 30 Jun 2023 17:09:26 +0000 Subject: [PATCH] hash: fix reading unaligned bits in Toeplitz hash [ upstream commit 3a54f8de715c29613cf3d34ce3910d2bd27bffb9 ] Fixes: 28ebff11c2dc ("hash: add predictable RSS") Signed-off-by: Vladimir Medvedkin Acked-by: Konstantin Ananyev --- lib/hash/rte_thash.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c index 6847e36f4b..2b97482cfb 100644 --- a/lib/hash/rte_thash.c +++ b/lib/hash/rte_thash.c @@ -672,5 +672,5 @@ rte_thash_get_gfni_matrices(struct rte_thash_ctx *ctx) static inline uint8_t -read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset) +read_unaligned_byte(uint8_t *ptr, unsigned int offset) { uint8_t ret = 0; @@ -683,5 +683,5 @@ read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset) } - return ret >> (CHAR_BIT - len); + return ret; } @@ -690,4 +690,5 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset) { uint32_t ret = 0; + int shift; len = RTE_MAX(len, 0); @@ -697,11 +698,12 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset) ret <<= CHAR_BIT; - ret |= read_unaligned_byte(ptr, RTE_MIN(len, CHAR_BIT), - offset); + ret |= read_unaligned_byte(ptr, offset); offset += CHAR_BIT; len -= CHAR_BIT; } - return ret; + shift = (len == 0) ? 0 : + (CHAR_BIT - ((len + CHAR_BIT) % CHAR_BIT)); + return ret >> shift; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:08.863931070 +0100 +++ 0114-hash-fix-reading-unaligned-bits-in-Toeplitz-hash.patch 2023-07-20 16:17:55.106752325 +0100 @@ -1 +1 @@ -From 3a54f8de715c29613cf3d34ce3910d2bd27bffb9 Mon Sep 17 00:00:00 2001 +From 086b98481996e9bced4c406b5901d1dadc69176a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3a54f8de715c29613cf3d34ce3910d2bd27bffb9 ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ -index 0249883b8d..2228af576b 100644 +index 6847e36f4b..2b97482cfb 100644 @@ -19 +20 @@ -@@ -671,5 +671,5 @@ rte_thash_get_gfni_matrices(struct rte_thash_ctx *ctx) +@@ -672,5 +672,5 @@ rte_thash_get_gfni_matrices(struct rte_thash_ctx *ctx) @@ -26 +27 @@ -@@ -682,5 +682,5 @@ read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset) +@@ -683,5 +683,5 @@ read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset) @@ -33 +34 @@ -@@ -689,4 +689,5 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset) +@@ -690,4 +690,5 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset) @@ -39 +40 @@ -@@ -696,11 +697,12 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset) +@@ -697,11 +698,12 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset)