From patchwork Wed Jun 28 19:12:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Medvedkin X-Patchwork-Id: 129084 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 500DC42D83; Wed, 28 Jun 2023 21:12:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE0C040E2D; Wed, 28 Jun 2023 21:12:15 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id DAC6240151; Wed, 28 Jun 2023 21:12:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687979535; x=1719515535; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=VopNnRC0FuH+n/9nMAgvjc8JjW+A5uzgZwixsx8MZpE=; b=P45ClBEYDt6BkvfbHAAKrEQnndd2xObDI564ra86uFdwcECJYHDYGCoX YtBAkwicbPLgdrRVV0//hSET3x5ENNlcOgItc59kP4gcNQiiNfFUSveCB 4WfyifG/jj98j9F0PK8nz4zHOwFNbj05iqIEh16zpJg2X7IcSkyMnyXRQ 3w5Yfefx5LbrCtuBcOIm0U9PygTPKUsoe48vtvO56wzKBtIvgt6oKq+E+ 0ZYlKwOd5yevcHSBPCS7jmVZ5CCGUYB3/V3vGLh1nf75B7v7ozoIKF2Wt OK8rHhXEGz+JL3ekLIOeH1FvTqUv6smKjndZz5kZOvSUPrzqGD4VXmDq6 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="359427545" X-IronPort-AV: E=Sophos;i="6.01,166,1684825200"; d="scan'208";a="359427545" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2023 12:12:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="667233773" X-IronPort-AV: E=Sophos;i="6.01,166,1684825200"; d="scan'208";a="667233773" Received: from unknown (HELO silpixa00401176.ger.corp.intel.com) ([10.237.222.204]) by orsmga003.jf.intel.com with ESMTP; 28 Jun 2023 12:12:12 -0700 From: Vladimir Medvedkin To: dev@dpdk.org Cc: konstantin.v.ananyev@yandex.ru, stable@dpdk.org Subject: [PATCH] hash: fix reading unaligned bits implementation Date: Wed, 28 Jun 2023 19:12:08 +0000 Message-Id: <20230628191208.78701-1-vladimir.medvedkin@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Fixes: 28ebff11c2dc ("hash: add predictable RSS") Cc: stable@dpdk.org Signed-off-by: Vladimir Medvedkin Acked-by: Konstantin Ananyev Tested-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 0249883b8d..2228af576b 100644 --- a/lib/hash/rte_thash.c +++ b/lib/hash/rte_thash.c @@ -670,7 +670,7 @@ 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; @@ -681,13 +681,14 @@ read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset) (CHAR_BIT - (offset % CHAR_BIT)); } - return ret >> (CHAR_BIT - len); + return ret; } static inline uint32_t read_unaligned_bits(uint8_t *ptr, int len, int offset) { uint32_t ret = 0; + int shift; len = RTE_MAX(len, 0); len = RTE_MIN(len, (int)(sizeof(uint32_t) * CHAR_BIT)); @@ -695,13 +696,14 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset) while (len > 0) { 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; } /* returns mask for len bits with given offset inside byte */