From patchwork Mon Oct 9 16:36:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 132445 X-Patchwork-Delegate: rasland@nvidia.com 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 B78D14233F; Mon, 9 Oct 2023 18:37:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 95EED40E7C; Mon, 9 Oct 2023 18:37:07 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2078.outbound.protection.outlook.com [40.107.101.78]) by mails.dpdk.org (Postfix) with ESMTP id 58B7140E01 for ; Mon, 9 Oct 2023 18:37:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R5xRVcBPS6a9T7GMScceCMPAU9/gT3k9Z7pPlLbhjmyJ95LWBT5DiDsZN0KEVSzUoJAkHBseDP3FGqCoKiJ8OEuzFeFlKWWrRrD3mOiTFYpr6MCwVlzBDXH+p390ULhZ8ErE7achlyCoKWCm7xP4RTm+D+3RIo5uZDFbZpUMJittg4Hma1r58nv4UdH844WsnkqkGqgqzytaC5HXVILKNTGhz4WMZ/K7q8p//SvTb2dBzetub/FM1651s/J3v8DePM2uU4s/ANKASM/Q0hnqbLkIIRKBMMx+7PRhT4kPXW3w74Ler1aDuNmVNWjkwJ3lDyCbut3zSH0hgGONS4/dIw== 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=xMG2LJMBT8Wn/N0I+5z73jyJF3QrMcC8gKsElh25dp8=; b=Gkpjg+Zz1OiybY9jQBKmVmyeB7Bl46sYdageqJGm/dcSNn3wCqUYHW23UL7Aq3XL+EV+iseh90R3B13Fp9Vi3Q/3Ik0HL35TxCRP8kBGwVAlA9TLgugWr2yUfSEHlUwj5HZAY9lApL+TvIC2ncqXN8TTP0hMy4gXraFxAGn6KssQ+9yCyzBIj6UJJjiWxmJjFp2yZA/X0eJZwC7Q+bYuj6Bzdwk8SmxNIWbRhburT8IR+a6zOs8Nj6/Bt2pSBn5kJ2m8k9m6ZmOQwYdnTpoO0/RKvaFDMubbUob7/QHRoPtujePATKpvmbTZEx7PnhixOVlH+QCQZ0z6xDCWBigJkw== 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=xMG2LJMBT8Wn/N0I+5z73jyJF3QrMcC8gKsElh25dp8=; b=mibBDcGqGvrAFCCxqW53UiuSO1359KpfR/I+JPz89dlOBCbv6kJ4miW6uVZd47ZX1ctmhKP7Lt4avd2qKfrsNJ7/qvC8+oE6bw0w7nYQVL06VGenYi/gcaALjQKVBH3YT2okYZ7lQWiH0eY3WKC5v/V+AUB/eNIdKnQo9g0FpCppmL7SkUD/Dn679MBREJ7m/lmxsvgzPSTiwC18864Ca5bYw+sXkMuZ97sFQtSqUr889XL/hhVQzz05A30w52lrCxP6TROBuFI0hCZKWdogNJoZEnP5PCftJwqe0NSa6mf5Sanz12osyooSzOnzE10Ljx8JQUbt+StnDkw62lbciw== Received: from DM6PR10CA0026.namprd10.prod.outlook.com (2603:10b6:5:60::39) by DS7PR12MB8232.namprd12.prod.outlook.com (2603:10b6:8:e3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.43; Mon, 9 Oct 2023 16:37:04 +0000 Received: from DS2PEPF0000343F.namprd02.prod.outlook.com (2603:10b6:5:60:cafe::39) by DM6PR10CA0026.outlook.office365.com (2603:10b6:5:60::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37 via Frontend Transport; Mon, 9 Oct 2023 16:37:04 +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 DS2PEPF0000343F.mail.protection.outlook.com (10.167.18.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.14 via Frontend Transport; Mon, 9 Oct 2023 16:37:04 +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, 9 Oct 2023 09:36:46 -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; Mon, 9 Oct 2023 09:36:44 -0700 From: Alexander Kozyrev To: CC: , , , , , Subject: [PATCH 5/5] net/mlx5/hws: fix integrity bits level Date: Mon, 9 Oct 2023 19:36:17 +0300 Message-ID: <20231009163617.3999365-6-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20231009163617.3999365-1-akozyrev@nvidia.com> References: <20231009163617.3999365-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: DS2PEPF0000343F:EE_|DS7PR12MB8232:EE_ X-MS-Office365-Filtering-Correlation-Id: c40c1038-49a5-47aa-ef30-08dbc8e5f860 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9AaYKtPMRiQerSYKqMnL+v2Lw8HxGSlE414DLBa0B7ERS9v+DqxQZ0Un6cdY38oVd4fQLg+PgYGqhpm2Ld/qcdQFtgPM4pE1Q9JAGBeDEZf0aAX7m+2Cq6SJWwfJdl4xfXQVedesGZNXN30ijVVt0DbirSlFtOamcfkVwgN62MsW1CTxtR4rkqgX0Ndk7mqTzse33YR4TO+zPARL4vMbea/y7SY8/oilvUPr84z4xxwsu96cKjC6hQaJi+gKvG1HkQiERe+Zsy0OKSSwTQGN76N8IXtXrxfDnu+ldkAXPyMApFxFqNtQ1SHNPzAXudcRf5omneF9O8arYQ08dPwk8NikijYtTFLUfuBHraAYFf+6HwxIScfk1Z/M5+dSeujRLzBkAPqvz3mTBMdNFkIUwttArjbQCg49mykgZE3qUyYZiwAssOpBgUkALEjsHDHkbj4y1t8vR5VyZyXZmJsOGW4y27tLEMXCNaWc7RNioGyixRYLLhEuX2bb0nI4qtfM7rZsVgIJ1ncbO4nmEO+TM9vrJore3liWccK0lHpLookaPJIS9jvA6Qw9cUV5SkTf7AXorL1hIJo6Fu6g0JSMalqELYtVsSiWR1jZ3Xy95c4bjiS7NRLlB1IaYRR5Ac9KkN/0ohVaR2qqqT0CuuSdpyKPZfnViWfiqYdM3eaiS+EsY/tBZcT6cJnhC6I4cSPDTJPXlg6VKD6CBJwFMO7uirpOkR52fC+8iLRDG4TUKMqiAqfL7vhwTRo6zne30DLl 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)(346002)(396003)(136003)(376002)(230922051799003)(451199024)(82310400011)(1800799009)(186009)(64100799003)(46966006)(36840700001)(40470700004)(40460700003)(40480700001)(26005)(16526019)(2616005)(82740400003)(7636003)(107886003)(356005)(1076003)(426003)(336012)(6916009)(70586007)(54906003)(478600001)(6666004)(47076005)(36860700001)(70206006)(83380400001)(86362001)(36756003)(8676002)(2906002)(4326008)(8936002)(5660300002)(41300700001)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 16:37:04.1506 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c40c1038-49a5-47aa-ef30-08dbc8e5f860 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: DS2PEPF0000343F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8232 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 84d15a41df..b092249c0a 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -1897,7 +1897,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; @@ -1908,7 +1907,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); @@ -2456,8 +2455,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);