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 91827433D8 for ; Mon, 11 Dec 2023 11:17:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B5D140ED2; Mon, 11 Dec 2023 11:17:28 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2076.outbound.protection.outlook.com [40.107.96.76]) by mails.dpdk.org (Postfix) with ESMTP id 2594340E0F for ; Mon, 11 Dec 2023 11:17:27 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=STgkPmkXNfEIv2ekpAv14cliOLKfIxdIH5SjVND/m/Swzh2KtWabE2GDs4++1X73btE586pC2cBkRDqFBQWOhvYm7OFKWeVidUXQUJCwREvVYSqJFAeGw8nZBWUObTkT+nyGfz7vFBko0KuJnq6ClX256SGUjGyu9BsXeCZ0L9Gw0dvNd6G5d3bZdzwvXZhFFYltY8Z6VvrdTS5FKvVu9UrGV33G/Q0ZmC1gSKoeNryQhZwFKYyHSIbSwBHIWYUWelBqqNobKhpuV8PhRp1Y00thKUGh09i6KNI8r36F3LKn6NrHYaVt0eJdop3PWvtOsN2LTZ2UyuZeRP8A4zO9qQ== 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=vfZDC35UKPSBbsfBYR3bpmfe/AvL7QB2Q4xnaYzDeck=; b=OFrYp95uqlFPIVPt0ZX9UVAdwh4DoZejhvvaUi8uM2puIv7ZW3hRixJHLQNnTGzYmCp/+mMeYTUynChmOeo2z8bd1zqgysEfQA02r00vcO2+knJCYPyy2dafSb314k+p112btVNbr7O8Jc3UZSNkADpdBACTuzxXcrqDcjijF+BaJDxiH4GczLYZzKTKHieD1lta77ur2wHtrX//NE8pUXYcsq95L9Ii+36Mb7hmhN/U5SrBg2AYkOk4V2cxZwRNwi9xHAg1ikWTBCPeWUaDQMHOKaeyMfLRmlDwKwMN8FKPRTI7Ht+itiUe7Pnlf4G9NO0N1NfWvDzt2SaMu/Qhvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=vfZDC35UKPSBbsfBYR3bpmfe/AvL7QB2Q4xnaYzDeck=; b=UG5vbB/btkg7cXv55tQj1wWz1pWH+tI4E/F/FFiWrZ/Ptvmi8oz3QQKswjdbYpybeV7ELJImS1xIXv/6AssEB/gRNRaetzhoSXaVgo8HV49I8m8PvrO4SVsOseUrGhIIsO3XqHn+NAbUyhpk5JRFGfvYGkoWnUDdq/59z7udbxAGHVqMv2Ad6kJkIUU3owRWLYqH6ZrjXeYuVQYD1C+1y2LgB0D5WrRydlYj0ZXdTvBzHu6oiwtWhpgaXdp1NWGftqdoVYACyizd+BdiYkfho2AyufFq8OJ8Y6Bl048fXZM83SM11aXt55aV4EqLLDTiveUOWgzdV76Q/ieoTpQ10A== Received: from CH0PR03CA0441.namprd03.prod.outlook.com (2603:10b6:610:10e::34) by PH7PR12MB7235.namprd12.prod.outlook.com (2603:10b6:510:206::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:17:22 +0000 Received: from DS3PEPF000099DD.namprd04.prod.outlook.com (2603:10b6:610:10e:cafe::b6) by CH0PR03CA0441.outlook.office365.com (2603:10b6:610:10e::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:17:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF000099DD.mail.protection.outlook.com (10.167.17.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:17:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:17:08 -0800 Received: from nvidia.com (10.126.231.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.986.41; Mon, 11 Dec 2023 02:17:06 -0800 From: Xueming Li To: Alexander Kozyrev CC: Ori Kam , dpdk stable Subject: patch 'net/mlx5/hws: fix integrity bits level' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:16 +0800 Message-ID: <20231211101226.2122-52-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: DS3PEPF000099DD:EE_|PH7PR12MB7235:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f35f717-ec5e-4c20-0665-08dbfa325d14 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NqQJkdi4jn4Cph1NfSK6p8lkq8ZgDc2p/1ztPk0r++E3JghHGCqFxpjN86/jDJ4O9tKNfedGFGCS82CyYrh1oT/WGTMtAzP4aTkm+bKyxxYBhGN/2qxwmWOtl2Jvtsx8GhMb9xocpoxML0AksMK28BcOdBbPPtjDjmQc+2sd0F4889nWGswSu8X6hDfChRBMLQCXSq020gAp/aDD3KbkHQveeOVhnxrUJ16QjIoYLQk2mOLX12OV+b4VRJFU8Th9x1EFpjm6dDpZM2GBBylo3S3+LFj5jMV6NDYiWpIszJ4M0yDD7FIarHOqkAX1ns3fG2dVsw8Bn4sgyL2CsLnWh1ell4AcW+wz6FuAMSXObkASXYiW//HNTMOPWv5fQloe+lKSBZosUXERg4Mq9kKCpzZ5O7w5/Td+LNbkAw9TwAKlxaJENjQoFdsOPuVHYiLf/a4sJWGq7ko5nErg2p/kk7SsnCElSKn1V41KQtBGi2Bu+oVc7HikBtDqLdUPUGEE7wG5NyrSNIz5JDi8ESyL16ahGfDcm60w68Vbrre1PY3HOguucoTwpWx4fdG3CSNgn8kZiUpTtQ6FBgFzINhn8yCw5ByRZO6iv00Lrfagh558g9XotE17DrdWk3tZCR8vZTHYYBFeyQiBKctib1pXXdia3ZRDf9IURC9UxuLnx9iIfGcYPPtWt37MP4Lu204ktIMVJ4R13s/+2zDXBXlYKe+zLvuz+RJfJEHxPgPmoBQTUPnvL48NUwDHmghaHvaKp09EdEfLbtBA64NjjtVHQJxXpnxTgEU9OPWtdz37QC8= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(396003)(136003)(346002)(376002)(230922051799003)(64100799003)(186009)(82310400011)(451199024)(1800799012)(46966006)(36840700001)(40470700004)(55016003)(40480700001)(426003)(336012)(16526019)(6286002)(26005)(1076003)(2616005)(40460700003)(82740400003)(7636003)(36756003)(356005)(86362001)(83380400001)(5660300002)(6666004)(53546011)(7696005)(47076005)(36860700001)(8936002)(8676002)(6862004)(70586007)(70206006)(966005)(54906003)(37006003)(6636002)(316002)(2906002)(4001150100001)(41300700001)(478600001)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:17:21.8553 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f35f717-ec5e-4c20-0665-08dbfa325d14 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099DD.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7235 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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=f0bc00623067e28ccd1d895a706f8f4ee7263b1e Thanks. Xueming Li --- >From f0bc00623067e28ccd1d895a706f8f4ee7263b1e Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Wed, 25 Oct 2023 23:41:01 +0300 Subject: [PATCH] net/mlx5/hws: fix integrity bits level Cc: Xueming Li [ upstream commit 4c4e04d4e08811564c8dcc9b692343543840ca85 ] The level field in the integrity item is not taken into account in the current implementation of hardware steering. Use this value instead of trying to find out the encapsulation level according to the protocol items involved. Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Alexander Kozyrev Acked-by: Ori Kam --- drivers/net/mlx5/hws/mlx5dr_definer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 24bab9518b..6fc5d70f67 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -1328,7 +1328,6 @@ mlx5dr_definer_conv_item_integrity(struct mlx5dr_definer_conv_data *cd, { const struct rte_flow_item_integrity *m = item->mask; struct mlx5dr_definer_fc *fc; - bool inner = cd->tunnel; if (!m) return 0; @@ -1339,7 +1338,7 @@ mlx5dr_definer_conv_item_integrity(struct mlx5dr_definer_conv_data *cd, } if (m->l3_ok || m->ipv4_csum_ok || m->l4_ok || m->l4_csum_ok) { - fc = &cd->fc[DR_CALC_FNAME(INTEGRITY, inner)]; + fc = &cd->fc[DR_CALC_FNAME(INTEGRITY, m->level)]; fc->item_idx = item_idx; fc->tag_set = &mlx5dr_definer_integrity_set; DR_CALC_SET_HDR(fc, oks1, oks1_bits); @@ -1569,8 +1568,7 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, break; case RTE_FLOW_ITEM_TYPE_INTEGRITY: ret = mlx5dr_definer_conv_item_integrity(&cd, items, i); - item_flags |= cd.tunnel ? MLX5_FLOW_ITEM_INNER_INTEGRITY : - MLX5_FLOW_ITEM_OUTER_INTEGRITY; + item_flags |= MLX5_FLOW_ITEM_INTEGRITY; break; case RTE_FLOW_ITEM_TYPE_CONNTRACK: ret = mlx5dr_definer_conv_item_conntrack(&cd, items, i); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.802705900 +0800 +++ 0051-net-mlx5-hws-fix-integrity-bits-level.patch 2023-12-11 17:56:23.027652300 +0800 @@ -1 +1 @@ -From 4c4e04d4e08811564c8dcc9b692343543840ca85 Mon Sep 17 00:00:00 2001 +From f0bc00623067e28ccd1d895a706f8f4ee7263b1e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4c4e04d4e08811564c8dcc9b692343543840ca85 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 7cd563dccd..7dffbfb9b9 100644 +index 24bab9518b..6fc5d70f67 100644 @@ -24 +26 @@ -@@ -1909,7 +1909,6 @@ mlx5dr_definer_conv_item_integrity(struct mlx5dr_definer_conv_data *cd, +@@ -1328,7 +1328,6 @@ mlx5dr_definer_conv_item_integrity(struct mlx5dr_definer_conv_data *cd, @@ -32 +34 @@ -@@ -1920,7 +1919,7 @@ mlx5dr_definer_conv_item_integrity(struct mlx5dr_definer_conv_data *cd, +@@ -1339,7 +1338,7 @@ mlx5dr_definer_conv_item_integrity(struct mlx5dr_definer_conv_data *cd, @@ -41 +43 @@ -@@ -2477,8 +2476,7 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, +@@ -1569,8 +1568,7 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,