From patchwork Tue Oct 24 17:51:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 133275 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 D38764316B; Tue, 24 Oct 2023 19:53:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D191A41104; Tue, 24 Oct 2023 19:52:39 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2040.outbound.protection.outlook.com [40.107.220.40]) by mails.dpdk.org (Postfix) with ESMTP id 5605840DC9 for ; Tue, 24 Oct 2023 19:52:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wyx73Ey/yzwXNVauVonmiLYqaIWNHS3Bqz1XMK0G96DangIya2YR1JXurUGpmSgnFjZ/p3KG+h/n7zlOjeBTMaIkPIMINfTTJTD7MTHTUSUUXZeRdCScxQ+yy7CTOwwzTd7Cr+Qkp6YtR7DAScMSK0SR9gsVi2khxyuJOVHeNQF1rpirL9YQlPAzqPKiN2vISdKJKF+WplEm1kHIIg5VyGv+7IbCKAbINRXtrcqpbuZucjh9MAglAKmylx5i/W5RQlMmOB9TQAVPcXlZLRASiD5L0EwS+fLMHm9iaKmJ7cy41LoEuJuajuVVHb54knytAQTAehB3EBfxPIfDaP6x/A== 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=doVg3uloVj0g4isFYPoHdrJRqmk4hf5XRqDqwcYQMWM=; b=GB3+HLygmJ/8WLHmGDw7r6kI9KLSeRtNSKepqiOLkGovfyeBlW00Gs8c7unosdtviynsvRqNOrVk5gxVgJjU3iS+BO5jNnfZXSp/kOqMql5kIqo6+TazKlyi3Kt5ozDrZWT6VCkVDHJgkLPUPvoJN75piXQKMybyExljD/51jRfhcGqcrFgpJoZvGmrYjRtv3l285wqQg3c2ZprtXnJeT/5o4P0beQat8xCL7/0NqHSjFaYWcyBft6AXqmaIhZbMZ9dcQ0v1p4BOvSxLTWUpOZT92x3MxxvoXQZCNQO9gsN0fAK6/nRZVMjLfCQoYrxktEycbwifWiu+due+NB9rnw== 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 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=doVg3uloVj0g4isFYPoHdrJRqmk4hf5XRqDqwcYQMWM=; b=LLG2atcx3BFT2LQrmRC5sbnqV/vXq95tbigzfRHvCi7G6VhFslAwNlizJeh9OiMokEMMWw8tyIwUiLMFiHnFE1Gu9pFW6kmgINmzuPwqmnpwGDQhswa25iFQkv3aZaKLmuPDXVhw8ZAaZ5Y+vLgRacdnm9dQpeint2oUreTVKaUZ5p1NeF02NQI148OV260oy8l5Q8wKlBdZjji7u+U79VM4gka++n6XoxZgVYyhLRTJlWgLwHrM3BPpm+AHMha8XX2ATZ2Htdcb/vI7NrxxsnTOFUpQXNdv9lJqBzDfRTEXjwueTIfH6lmZCYCl5MAcKn7pYXP/SHM/23rMcU4TqA== Received: from DS7PR03CA0163.namprd03.prod.outlook.com (2603:10b6:5:3b2::18) by DM3PR12MB9391.namprd12.prod.outlook.com (2603:10b6:0:3d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 24 Oct 2023 17:52:35 +0000 Received: from DS1PEPF0001709D.namprd05.prod.outlook.com (2603:10b6:5:3b2:cafe::f5) by DS7PR03CA0163.outlook.office365.com (2603:10b6:5:3b2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.34 via Frontend Transport; Tue, 24 Oct 2023 17:52:35 +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 DS1PEPF0001709D.mail.protection.outlook.com (10.167.18.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Tue, 24 Oct 2023 17:52:34 +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; Tue, 24 Oct 2023 10:52:18 -0700 Received: from pegasus01.mtr.labs.mlnx (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.986.41; Tue, 24 Oct 2023 10:52:16 -0700 From: Alexander Kozyrev To: CC: , , , , , Subject: [PATCH v3 7/7] net/mlx5/hws: fix integrity bits level Date: Tue, 24 Oct 2023 20:51:32 +0300 Message-ID: <20231024175132.1435553-8-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20231024175132.1435553-1-akozyrev@nvidia.com> References: <20230828182251.3917624-1-akozyrev@nvidia.com> <20231024175132.1435553-1-akozyrev@nvidia.com> MIME-Version: 1.0 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: DS1PEPF0001709D:EE_|DM3PR12MB9391:EE_ X-MS-Office365-Filtering-Correlation-Id: af8d22a8-a9d3-46ed-e46c-08dbd4ba0125 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cZKwv6xLqCqHE5PxJqNlN9wM+qvvbyAlSVYQQZSfLgN862ZK8RJEoSb2a1iG5XK3vSmgt7XapyquFoKutafoNS4zCkmV9/V5A5+VvFxL8N+swYAeFlEumGIZqxaNC2god2YLgFcn1NMBYPxNYb1aYOM4dlaPSJ3PehEgfw6CzrQPNNiW0pi58z+nN6q5omMQZ2bvRhl36sEy7QvLmXc6l3oaGtq64Gd8s5JSu0f5xvGjw/hJmV8UJJjJymXAGB4uF/N0tPBs03hTVMXddvVshoa4hfyemYNR+Yej69FKe50HZVC/K1h9ko+BAD/F9uAkEe/prUs34dPf+sSvZ7TzgodEx+nSgNEJnjpq9OUdoda6j3i/jkd9108ZsngHAuzlHv+hlPzvjSBCEfFoYADzkrLNLbX3BuSfYnCbKvV65wjOY4Jo0WjxiR3zdgLg9PNgWG8W0J+92tSTlA2hRUmwN65cqwP5T+Xdkg8y0/pWJdbt62v3R/yA0Nx9VklhLPyYMu79B1ctF+cPCThF/h2/8YUKHm13vHzQqkHkm/Kv4HuAGhUxsq3KMQ/NgwRD+xEIE3YGw9UHoBPYLKGbXgsWjAXHYsTjHT39xjGRKroGWwPV4KkgAiRx1jWYZ4sQsQYgj8c12qT8m43Pyc6hYzHZoTDFFuJTd4Enp7KJgKHAUksodzPFdLQJbk6r8vwSu46huR4/sRNgf4ujzpjqy2C2Q44ztfqqGZ0IRNCHQpBGlms6k+RO1tYTz6vHHw4npkkI 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)(396003)(39860400002)(376002)(346002)(136003)(230922051799003)(64100799003)(1800799009)(451199024)(82310400011)(186009)(46966006)(40470700004)(36840700001)(36860700001)(2906002)(6916009)(70586007)(70206006)(316002)(54906003)(82740400003)(356005)(2616005)(6666004)(107886003)(1076003)(7636003)(16526019)(336012)(40480700001)(47076005)(426003)(83380400001)(40460700003)(86362001)(5660300002)(36756003)(4326008)(478600001)(8676002)(41300700001)(8936002)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 17:52:34.9604 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: af8d22a8-a9d3-46ed-e46c-08dbd4ba0125 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: DS1PEPF0001709D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB9391 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 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 --- 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 c752896ca7..f1f9235956 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -1905,7 +1905,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; @@ -1916,7 +1915,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); @@ -2471,8 +2470,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);