From patchwork Wed Oct 25 20:41:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 133316 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 713CC431FE; Wed, 25 Oct 2023 22:41:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6055C40A6F; Wed, 25 Oct 2023 22:41:35 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2077.outbound.protection.outlook.com [40.107.92.77]) by mails.dpdk.org (Postfix) with ESMTP id D754A40A6F for ; Wed, 25 Oct 2023 22:41:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cSs9UpI8MQ4MoztsZ0+tS3XVruzkz94J+myW/HXcreEzYlTXjLBYHR5OQaWZnkMhufCxLmtHl8aEUJkLTxYfFaiAvQEG2aQ4wszbEbpFanXH4f7kd5p09125vvdj5Gerbr8AhUrTEGPr0puSRX+z3GrqX3yOn/fbLcWo6Vha/BEt3eFj6wXdEVqFHdCqhwYeh4lSL8QwYHhlzblaGdnpx/tHwMKsRTzkyCsn3c+jFSISqqNrhqYff0zdxSEZ0FMxkugvlOGFKgP05ZErYwKRLJNqrJP0pw58aK5mC4HUnN2hfFyiX3JcsZGqAGaBlAdWZs5xkMs9I12bEbc3B45r6A== 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=bQMKFqs8XgRfqY+hRP1TodMdcTT6LaDeAWrTe1VdFTU=; b=hlBVw5TOvAb1gvYv9JtSjY3wUHbbVJ14PTMU2UejAcU8UQAwYkObCSaLJO54iDA3wdEM1DJNGIeULvFzUGsFiFo2nDVy8RPfITKWvGN++NMko5cZid1tpwIPYcw4JNzOIyo5CmyxQFugwFGZ6g3yL43HBrGO8Id8ifh8lfQAuMqbQ0RRoql/DoFB/rugIG3eS5PkedONdkPwcPBNwS1tQyXelieSQHrLtg7Gyby1N5nrebVJlEXKkY6QWPQjObdoKOSSEEBVzdibCg14RkegbQoZGa2spBqz6sQae4H0/uj/G9cxBYEe4PvZ+k/SOWHwPTa0Kr0PDblSrurb+mlqaA== 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 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=bQMKFqs8XgRfqY+hRP1TodMdcTT6LaDeAWrTe1VdFTU=; b=S1As+ZbGgjQ8s/i6aKHqRy5oOYrnElBu35lR+s4JGH97tgRksuLitvwSp212xEdhJ7pCMGmd7CPLv1lIkvPYQ1Iv9wb2KWrp5KVoSYJVINHOjJ4TuZA7WYuimR1Zw5iw7CPZP//Vhdx9aQvrKzI8HlSJ2f/dvlEocGm5/LrM2mktwwQeBLvlDFJmAj2ayW+UICsw0lwSwivkbEXT//q6ohwZxhrLlhOCEoEPY8hK3SpaaXqLYIueiuv/QPoBO6Lvu0IAiRNdc/6PJTvALe3puUm3lGUzi67u4nW2Y5MLu0VRhHacJawE2FtBm2qZvoBN6z2vD2fd9N4TGnT7/dGzqQ== Received: from DS0PR17CA0002.namprd17.prod.outlook.com (2603:10b6:8:191::25) by PH8PR12MB6985.namprd12.prod.outlook.com (2603:10b6:510:1bc::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Wed, 25 Oct 2023 20:41:29 +0000 Received: from DS2PEPF00003440.namprd02.prod.outlook.com (2603:10b6:8:191:cafe::ae) by DS0PR17CA0002.outlook.office365.com (2603:10b6:8:191::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.35 via Frontend Transport; Wed, 25 Oct 2023 20:41:29 +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 DS2PEPF00003440.mail.protection.outlook.com (10.167.18.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.18 via Frontend Transport; Wed, 25 Oct 2023 20:41:28 +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; Wed, 25 Oct 2023 13:41:17 -0700 Received: from pegasus01.mtr.labs.mlnx (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; Wed, 25 Oct 2023 13:41:15 -0700 From: Alexander Kozyrev To: CC: , , , , , Subject: [PATCH] net/mlx5/hws: fix integrity bits level Date: Wed, 25 Oct 2023 23:41:01 +0300 Message-ID: <20231025204101.1604238-1-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] 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: DS2PEPF00003440:EE_|PH8PR12MB6985:EE_ X-MS-Office365-Filtering-Correlation-Id: b933bb6a-8266-4774-9761-08dbd59ac3e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5znl37/AcZAAOxjqSgZJC9ABHsXscHQxINzhfymzy2mVYs+3lyksKL8gFIx0w15pJPcwae1+/UGR8xBvEfs6ZofVyMXLt/TtdcQaIZA7mmoUqLvb8e2GzhYueGQalgr3RkNdSfaVPo+IS8kPJ1n1Rx4743h0yWKJB3NHmNhfF2L+OuSOauhTVlShpmIRHSwmP05g836itTadLnfpCuVyR8a06zGK2uJN8iDSTGq739ccmwe9wMDYeF9aQzIRyp2t+qlLqEZgSukkcZ2VhkYmSpLkp5+lejNCFFHQO5OVJmYY1iWDtYvcSIcQ2aKxqAg6Zk+78JqvrsPbueuEoQqErDV6RKRQ7hinMSRz8lNziPGYgWjPOQZBvlxHj8EwT4ydpMGR7/lExkMGWdUsgY4wg1XzDvtKIiVCCLKnSMOSZPDDTRJYCO2CwDfQRV6fA4iyBOeXTqX9uwYBqaTW0ZfPZmZjUebXhGbARKCa08I3UW2OIwFO5exY2z+ttgpMy1fr0bKux7poEfnTIccNMaGuSEIll0RIAaaj1sH9CtV79uHzl/br/V2TLocPMzD7UFI4vZMSh5IIMEtydr7R+2ogHmruJp+788lVbAV/LxXMOes/2CHQXixcawgwKj2Xo3Mvgcztax6bIxIrHpkj1i6wUhBK6AGAIK8A8nT0vBsVHjdPEwnr+HQ3PFYQqnCH9IIs4kBRV1LOVYSwl/pbUrcDuH3fg84X4GW2dD2Zw1VvKNoS9LXpDmyQmpTLlgIc2J8/ 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)(4636009)(376002)(136003)(39860400002)(396003)(346002)(230922051799003)(82310400011)(451199024)(64100799003)(1800799009)(186009)(40470700004)(46966006)(36840700001)(86362001)(1076003)(2906002)(40460700003)(41300700001)(36860700001)(54906003)(478600001)(316002)(70586007)(82740400003)(16526019)(7636003)(6916009)(356005)(2616005)(107886003)(47076005)(336012)(6666004)(40480700001)(426003)(83380400001)(4326008)(36756003)(5660300002)(8676002)(8936002)(70206006)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 20:41:28.9647 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b933bb6a-8266-4774-9761-08dbd59ac3e3 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: DS2PEPF00003440.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6985 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 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 95b5d4b70e..600544c044 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -1716,7 +1716,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; @@ -1727,7 +1726,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); @@ -2282,8 +2281,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);