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 91DC543E57 for ; Sat, 13 Apr 2024 14:55:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BDAD40294; Sat, 13 Apr 2024 14:55:35 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2066.outbound.protection.outlook.com [40.107.101.66]) by mails.dpdk.org (Postfix) with ESMTP id EE599400D6 for ; Sat, 13 Apr 2024 14:55:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c2p8RfnAmbvnoKyg1GEiRf+WZuQHOucT9NZbnT/QCQdILcxroEC8Q8iss4swNAlzSXoU/kLwXGX0BZ0gHjXTcDQdfaVLPFIjTPX2+kFfuw4BHcQlGraLWpGePb1KnulPvOiYOv1yfVH9BV9JPW53UnGcAwRNmPivsDm/nhGRI+WWjuZKIZ/8C8nIPG9E4oBPslK5glVsJ7IWd66p+htBtaK2oB9GpjZ50N38F5PlFJapgdMMGzKcwj+lzjg5wsLax7tX2AMWChmgPcWtNkAE1rvGNZFdsiP/jUyIPB6frDKWy+iF5S7F4LH4+dLCPzYylSUfnGy18giSOfgVO3u7/w== 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=ws7lsF0p1dautPA3o1Y0uIX6TulDFC7p0UMbOfxjgEU=; b=PRbdR7UfKddaYD89qugbFKt5aQxQeea5lSkMi14SkBp8123a7PbybKNhuG6sSAOCz0VdaCX4Q6w5avPURyHUB/bRp+A03PTe/rbQ1biZQ+jD1JnOFmzM6afMJCRr0hPohs0yAYkOC1O3vKIlW3CGFMH7HbnUNpACtKVfSraj4zXxYeT4x7lOI0HrcIY2grzm0NCzWLphmcCFzbFgnKsSQGdYk3jy9hFVyuMBDwr2oxNIzuRIG8LaMOm3uIkJ5x+2ll+Sbc/JgPBnOevQ5dYEoJYZGHkVvRkm2ZRnJIA6660enYOaI/oi/6qVJjSAXdp3lTvE5Ik8u4HSzXfY9Vyi5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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 (0) 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=ws7lsF0p1dautPA3o1Y0uIX6TulDFC7p0UMbOfxjgEU=; b=W/sCrgxJKUXLaQjPZdmENuT1Hjz3dFqOlJ9So+Zgq5tRrxXDrd0TKndsYa8QOksYz2vuHTPCTHFhpcuRO7G8Sx3HLeLxjsUT1jpYDWo7Ig6nYUJkMSJGISudDbrPMjgh3QbfDNNkmd7i76j7bcmBt59oAf1wJLG1xg4rg3OScsmZ5yI0a9bVl2AdK/LmiL5uYFunzHrI+REytK8imity5bKoZ50p4vYVIwww7OCt4f17LDmwolc+mEA4EOD+08RUfXuW5EwZUXTSD+C/kWOWj9ilmBSQJ4Z5BEP5h+BitNUTP+rxPvC5f0u0MeMQBpnf4Ss8wbVBWqvKYZ0AzL5N7w== Received: from SJ0PR03CA0042.namprd03.prod.outlook.com (2603:10b6:a03:33e::17) by CY8PR12MB7610.namprd12.prod.outlook.com (2603:10b6:930:9a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 12:55:30 +0000 Received: from SJ1PEPF00001CDC.namprd05.prod.outlook.com (2603:10b6:a03:33e:cafe::f0) by SJ0PR03CA0042.outlook.office365.com (2603:10b6:a03:33e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.22 via Frontend Transport; Sat, 13 Apr 2024 12:55:30 +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 SJ1PEPF00001CDC.mail.protection.outlook.com (10.167.242.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:55:30 +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.41; Sat, 13 Apr 2024 05:55:18 -0700 Received: from nvidia.com (10.126.230.35) 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.1258.12; Sat, 13 Apr 2024 05:55:17 -0700 From: Xueming Li To: Michael Baum CC: Erez Shitrit , Matan Azrad , "dpdk stable" Subject: patch 'net/mlx5/hws: enable multiple integrity items' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:56 +0800 Message-ID: <20240413125005.725659-56-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CDC:EE_|CY8PR12MB7610:EE_ X-MS-Office365-Filtering-Correlation-Id: a7689765-a1c6-48f6-7c3a-08dc5bb90007 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s/fF0a9sMQQZPQQ2+JnXwbAqy5a4StHd5k7bw5RlWelL+jlrElpbXgMihZb0vGA9vv7Rp1TfaKx0mvtR1cCdzAU87G79KuZjTug/c5HcHaxJPS4FoaooFUbGp1P+DaCZJ1NP+lGk2f78m9UGL4yUMxIAs8jww6C0729IMMrfSk6E3WogvoO2dTAw4jy0ZSI32YqZYeuwBmGpe7HPRDHnAvQaVIc3PTdz1HLZzxOm5udLkEF7w/Iio1pKNMxg88NU8bWCDHQDr2g/b0U8nX5Q4Jt/JbbGLD05ef43M/aKFeTTW4QY5XpoR48D/ToBurhOrwHAYYsW8ZopoNMLZWmQNoG1ha5q0THhHA/SfQTcM5S1fLBx1ABxaVoKsT0oKGlK4bRdgI19JPU205jAqx6FdTC/OYbo2mLvPFG3LwvtvVqEWcxBAav2eEbLse/H33LfSAMoTJuUjTfK889yNhKuFzjFpaZd3EuCvPoRFWWcKcAuAW60cyi3kf3l1JInv2DKr9F0IO/jTDeRN6ypCSYuI6hvP5I9K/UDATRPp80Ev0WteToHyuNwKL2x2iqvCne+5buMYU3MTJNgyRrzTuFkMtbAV3JCY2d5s9vD5gxhVsPCRHLsq/0TF9Naa/Le6Twv1t64pL0C5fph7U8TwfKhW5vNw/L1TjyU8HlPuDqhCLpFVmBCdsdNvLwZhXX9kpRVBU38m/rgU7ZmDiDSbLHXgswStUEi6en5MTSDz2u0n/06Z+dEspWjgqHwPV6XwbC2 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:(13230031)(1800799015)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:55:30.6866 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a7689765-a1c6-48f6-7c3a-08dc5bb90007 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: SJ1PEPF00001CDC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7610 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=86c66608c2ac4909fc88f28b26b90ae9a95ed8f1 Thanks. Xueming Li --- >From 86c66608c2ac4909fc88f28b26b90ae9a95ed8f1 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Wed, 28 Feb 2024 11:50:55 +0200 Subject: [PATCH] net/mlx5/hws: enable multiple integrity items Cc: Xueming Li [ upstream commit 8c178ac8ce81ab0cbd9e90fd7eb4a2b47fca7c2b ] The integrity item uses the DW "oks1" in header layout. It includes the all supported bits for both inner and outer. When item is integrity type, the relevant bits are turned on and all DW is submitted. When user provides more then single integrity item in same pattern, the last one overrides the values were submitted before. This is problematic when user wants to match integrity bits for both inner and outer in same pattern, he cannot merge them into single item since rte_flow API provides encapsulation level field to match either inner or outer. This patch avoids the overriding values, when "oks1" is submitted, operator "or" is used instead of regular set. Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Michael Baum Reviewed-by: Erez Shitrit Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_definer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 34a5174aa8..c6918ef4f3 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -41,6 +41,10 @@ (bit_off))); \ } while (0) +/* Getter function based on bit offset and mask, for 32bit DW*/ +#define DR_GET_32(p, byte_off, bit_off, mask) \ + ((rte_be_to_cpu_32(*((const rte_be32_t *)(p) + ((byte_off) / 4))) >> (bit_off)) & (mask)) + /* Setter function based on bit offset and mask */ #define DR_SET(p, v, byte_off, bit_off, mask) \ do { \ @@ -379,7 +383,7 @@ mlx5dr_definer_integrity_set(struct mlx5dr_definer_fc *fc, { bool inner = (fc->fname == MLX5DR_DEFINER_FNAME_INTEGRITY_I); const struct rte_flow_item_integrity *v = item_spec; - uint32_t ok1_bits = 0; + uint32_t ok1_bits = DR_GET_32(tag, fc->byte_off, fc->bit_off, fc->bit_mask); if (v->l3_ok) ok1_bits |= inner ? BIT(MLX5DR_DEFINER_OKS1_SECOND_L3_OK) : -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.767693920 +0800 +++ 0056-net-mlx5-hws-enable-multiple-integrity-items.patch 2024-04-13 20:43:04.987753945 +0800 @@ -1 +1 @@ -From 8c178ac8ce81ab0cbd9e90fd7eb4a2b47fca7c2b Mon Sep 17 00:00:00 2001 +From 86c66608c2ac4909fc88f28b26b90ae9a95ed8f1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8c178ac8ce81ab0cbd9e90fd7eb4a2b47fca7c2b ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index e036aca781..0e15aafb8a 100644 +index 34a5174aa8..c6918ef4f3 100644 @@ -33 +35 @@ -@@ -44,6 +44,10 @@ +@@ -41,6 +41,10 @@ @@ -44 +46 @@ -@@ -509,7 +513,7 @@ mlx5dr_definer_integrity_set(struct mlx5dr_definer_fc *fc, +@@ -379,7 +383,7 @@ mlx5dr_definer_integrity_set(struct mlx5dr_definer_fc *fc,