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 69AC64301F for ; Thu, 10 Aug 2023 02:00:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 639B741151; Thu, 10 Aug 2023 02:00:21 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2055.outbound.protection.outlook.com [40.107.223.55]) by mails.dpdk.org (Postfix) with ESMTP id 07285406B6 for ; Thu, 10 Aug 2023 02:00:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9DxQgdUzhM40X+oWz3JxxtgR7wP6/q6xnzJzGkVDgPs0YEqdQHZz/oUKh4z0jdWqM3vqrXLODljjtdeb58ya3/KfemE7a4ogJK8t1Ye0+AEN8p6IfiM7DW6r7/es2kcINA7GAQv+Zn6OA+lFDjJhMj0ppk2JqQtbuSa7zvkgKo5eepTI0oIQzjogxCuYgTgRyS48aa+EI1KbQKCfGUAjKyxB+L3NznbooqqCBEjpWIsUKZhJckzdpOxR6/HaifL7mlspXQ8nB+lKLDdnvrpuRxI00uDjQxSmwf0Z/GSDANR+NbuYHtHXOYNQqap4e8DFFb8b+VXP8CoO/BaetX1IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=zE88j4hHMFar84nH3FO7LGYVKUkoMs2ccEB1CIOJWGA=; b=ETNM3QbvJUUIlNxjUSQMPDqXjLCaTm+ApK6qx3FMOTChgeRMHHMzH1xUAlZ9jgnGhR7WMcvGbajaqtnVAMZLHa0fdVsinuH9tJQPV8amKgJ76mjZEMaNmbteDXfU/iYjfhlLu5HosGbdJUdcjj8VpUydc7zLY0x1UQXmsLfxrfA5F4a0M5J+nkK79YsYBbvpEESv7vVVpbkU9fEbaX+jMhNBs7x/SOCIhzyfrnSPiLQQ5tDvwLMW430ZfnmADv0GIrDxn28xbeaO6a0OfspQfMRXjOj6b+CnXaLt/InjMh4y7MH8tRSbpiKG5kuAKe13hpXDNInfrWzz+ZivxLazYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com 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 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=zE88j4hHMFar84nH3FO7LGYVKUkoMs2ccEB1CIOJWGA=; b=CYk7JFdaJybkcNKNVe6A/mQ5vTcOCoCrsiD+fZmsu8pBzDAwge6/CXSJUQyAtcjE1oEx6ege5Vx7xf5E8YMG7hCZvjzqj2A/ALmpCnAcPqBWlqQAZC1qLwrBm7Ng/r0ibXmaFMKbDSwUHisgvHeUa/qvyRkKvZi942FxM5Wpz7UFeZbJRU3LKWgthL0XjPr4SF9d7Ng0YXXx/4tRkbL2YjeHCbhVlSLbSCilp5hbNKFNpOEQL0hzSWsrXaw9pwF17tujY2MZc6fVp/J0Y5HwXo2LBF8WqGuoRQD5/YEdVySPnLEwPf3gJ+HY780+ouuxoCP15uxvAGgFcZyg07F1Ew== Received: from CY5PR15CA0248.namprd15.prod.outlook.com (2603:10b6:930:66::15) by DS0PR12MB7876.namprd12.prod.outlook.com (2603:10b6:8:148::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:00:18 +0000 Received: from CY4PEPF0000E9CF.namprd03.prod.outlook.com (2603:10b6:930:66:cafe::2c) by CY5PR15CA0248.outlook.office365.com (2603:10b6:930:66::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:00:17 +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 CY4PEPF0000E9CF.mail.protection.outlook.com (10.167.241.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:00:17 +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.986.5; Wed, 9 Aug 2023 17:00:07 -0700 Received: from nvidia.com (10.126.230.37) 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.986.37; Wed, 9 Aug 2023 17:00:05 -0700 From: Xueming Li To: Vladimir Medvedkin CC: Konstantin Ananyev , dpdk stable Subject: patch 'hash: fix reading unaligned bits in Toeplitz hash' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:58:36 +0800 Message-ID: <20230809235947.1187-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809235947.1187-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809235947.1187-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9CF:EE_|DS0PR12MB7876:EE_ X-MS-Office365-Filtering-Correlation-Id: 70034e2c-6140-405d-3370-08db9934c825 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QSfHNRcr5RqWkh1ZgEN1GsqH5FqriatLbQcHMw3Tm9OboUZLw4NX0qvddM7+5+cVSGZvtPIhJtUP5H/+5Fn2ZjyhEAQ9Aa38VTN8pD9bkeKmIciv4H7cVJqOQqKsSgGNAl9sQ2J/5h9VH2GkK6tElPJHpK9ViRuSG2ZQOWTMElsbJZ+g1FZSonaucwXTxD/MWz7Qgke1ha/52BdGpL0hoz88s3o+RAkedHMBnNwnBgxWGJsjgs8yyZoyKDzr2LL+mu8arKAhq5DYu3T8jU7Hc8t1lqnkQP5z5HEXEJZKDoYkve21UQmbD32kquWVDWRd1S31sFYtOVXzaAwMSnsjKzkoHSnuLlb+NfnxzR7HemthjH6G8zJTyS3e6HxNODggCtdvv8BzFkJKhFdCbwsByDVsomLZRJ55iROWPTKatOs5x83XI5E4CL9RuIRv1h9zrdFYtQ6e6gLmS1xQ25Q3dQm+B0u/HdqaNP5V6ZCwRwmoCsVPaAw6ztllV/NBZ31SOh5elRq/ZYkGTDNioFUrluHPYZU4pVTujS2zqtbY6wY+W7djjBfKBRgWn2f2+US2IkOQGgA++qTBAs/q9AMcjzJV2SpuCjrQuvbGCWpwyYjW/h2NH8e7AMbjgBFzp2C1657AqejZXqe1wCOPQ2TwPwcc1qyFTMj5CH5urDOvnta9Wzapk2Fwlj89VnFNRUuPfVcNh0wLbA1CxLqeeHo7+dUAY436CfV34Nj7/8cpydmsicWZ8j/8AizLSH1AHsSEbMpODKw8TmCi3WYIDvpJRM6sMsqX5bN6TLmLtu9PDguzgOksio2L/4qXUGq94LQW 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:(13230028)(4636009)(39860400002)(376002)(396003)(346002)(136003)(82310400008)(1800799006)(451199021)(186006)(40470700004)(46966006)(36840700001)(40460700003)(55016003)(6286002)(53546011)(16526019)(54906003)(336012)(26005)(1076003)(6666004)(966005)(478600001)(7696005)(47076005)(2616005)(83380400001)(426003)(36860700001)(316002)(6916009)(41300700001)(4326008)(70206006)(70586007)(5660300002)(8936002)(8676002)(40480700001)(2906002)(36756003)(86362001)(356005)(82740400003)(7636003)(23180200003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:00:17.6881 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70034e2c-6140-405d-3370-08db9934c825 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: CY4PEPF0000E9CF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7876 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 22.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 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=1db71d413ef0fc45a8acdd06bca3268ac51d18a5 Thanks. Xueming Li --- >From 1db71d413ef0fc45a8acdd06bca3268ac51d18a5 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 Cc: Xueming Li [ 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 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 */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.649886200 +0800 +++ 0057-hash-fix-reading-unaligned-bits-in-Toeplitz-hash.patch 2023-08-09 21:51:18.204352000 +0800 @@ -1 +1 @@ -From 3a54f8de715c29613cf3d34ce3910d2bd27bffb9 Mon Sep 17 00:00:00 2001 +From 1db71d413ef0fc45a8acdd06bca3268ac51d18a5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3a54f8de715c29613cf3d34ce3910d2bd27bffb9 ] @@ -7 +9,0 @@ -Cc: stable@dpdk.org