From patchwork Mon Nov 27 16:01:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 134629 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 78D53433E2; Mon, 27 Nov 2023 17:01:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4BC4A40648; Mon, 27 Nov 2023 17:01:40 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2046.outbound.protection.outlook.com [40.107.237.46]) by mails.dpdk.org (Postfix) with ESMTP id B34E9402A3; Mon, 27 Nov 2023 17:01:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=erHj90WmngtSqu2n2h8JqvP4JJ3Dc8lyQwgNloCnXsVP1pW3LpvYoQmyAau0ycrr2o2s/Rmq5WxsV1qeqGzy/tjm4mKxQo582dsh7fHKrV/wbQCP5PEyAf6jkoZt76n5m3tFbZaH63IVE6fyBBd+DfP4j/2sAkfb1X4L10j4eu4kdXLhhX21lUDxNuPhn9v4amdzbq4Xi5mzgyYdYBhdBBkQBLThtKWxA+VShhN8x8uBooT7hz5pw9i7d55EcFfbNxXR5dydCmKFovXPDn6XWIZpYUWUCP2X/eJuLNHGF/5QfUThAwkTxDIcfRu8w5mhZ9Op+p+8lAfdyn0fu0QrNA== 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=Sl0GZTrD5nRnobnaPmOwluEAXlBzgTnG/8ntRw/mA9c=; b=ZUNu46CDHDjZpODonhTboGLyxxZ+I5ZdO8vkkfiA7YQ6sEAATr/LOPs6FiZNGet4o6NVLqgitnY4jwu6+1umZ6ImbrJKkwNVeHvPFzv0LhF+i5evqCskDZGaBTS9FcAlJf5W1FMSiPM/l/rOZVZNmeeunlh8qMwQZAVq3OeGtkMTPpmhtSVRbgK7YUSrVWnFznLH4aBmL7S3YWznQkmVYWwZNEwna6VbcBcvQ1FjYOgmtN94C10duwb+3PbOV2n3UW6oS1mrL+JtRNgGw4O3Js7wJLNvNrgDVxZEfgcvePkrrw03/W1h0aV+elc16LPLWtFtMDyrkou5Q6pI3OBm9g== 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=Sl0GZTrD5nRnobnaPmOwluEAXlBzgTnG/8ntRw/mA9c=; b=cVHcM9CnzvjWSX9V2cC+CHfpLE48CccvcIRWeCArqhFnyUkKakDmMCZ3v5r82Ir7pvA/3C6Ok0AXVAkOb/CPk73cu9ZDUT5ETppe48JG8i16WxXCVzImAPzpIeweNFoJ2EW0nrqgf3jbTrdvKa7W7kb2tgaSOMWeqLNrU/o1QaEP9RSoYsjSj5Epp39x3xXJOB92zRfZVWAkDYs4t8F4zHgzUdy7Ft4UEZ8iQIWRsbk01c4BcIVQG1LYmTVVQcf1dgKwuDDYj1DpC+trVEb80KVUKxMgN1tke98s7l+QNaXhtfNOZHwU5dploBFN3slJ/H1eaCxwNKEvWp3RYYlEXg== Received: from CY5P221CA0093.NAMP221.PROD.OUTLOOK.COM (2603:10b6:930:9::24) by LV3PR12MB9188.namprd12.prod.outlook.com (2603:10b6:408:19b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.29; Mon, 27 Nov 2023 16:01:36 +0000 Received: from CY4PEPF0000E9D7.namprd05.prod.outlook.com (2603:10b6:930:9:cafe::7b) by CY5P221CA0093.outlook.office365.com (2603:10b6:930:9::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.27 via Frontend Transport; Mon, 27 Nov 2023 16:01:35 +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 CY4PEPF0000E9D7.mail.protection.outlook.com (10.167.241.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.17 via Frontend Transport; Mon, 27 Nov 2023 16:01:35 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Mon, 27 Nov 2023 08:01:09 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 27 Nov 2023 08:01:09 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Mon, 27 Nov 2023 08:01:07 -0800 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , , Subject: [PATCH v2] net/mlx5: fix index choosing in TAG modification Date: Mon, 27 Nov 2023 18:01:02 +0200 Message-ID: <20231127160102.450506-1-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231127145058.447245-1-michaelba@nvidia.com> References: <20231127145058.447245-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D7:EE_|LV3PR12MB9188:EE_ X-MS-Office365-Filtering-Correlation-Id: 20a4133c-0c76-4909-53d0-08dbef6221af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uoNbt8I8oeiL7JeNsbEueoz+PEwxeEfnhDG6/AStHjJw/tpWiHSsZjtctgtTSgXWgYEgRrOWUDimDVe43d8dlIshqHt8llq1hMR9/UQ3MAZo991P/N36y+BH0NC2/xuSjgen3YXHcPOfeI9MIQenae60Gxe8CJyQ7SjphdHR4k6KdLL/yeIuaMCmy5BpSaZTzklOO8I8koVnSRrImntFcNg/gJp9wp01CJ4r8kHBiIwriO95fUITQ13eMpIXP5IERRSNhhfgm33rcdmFHQuPzCrJqIjFtpbQDTNt/ljWhsSgDawdymqnRFoLxPqOw0AzOPuIOE6Vw6MMnAcwL8/IhnVZegPgsl+9DQLJPRrVPqOfic/LGHKfvuMYLjvNTJxmbG5RXEIaCO3nB94vwn935cdj8Ef4Lp5YaCCHZ+Bn/48JRM/9RiJ3lfXSDBVb++FY34rt/Vkn+dZG/RSgaXPU3F8JpIkzjvtcO6u55wjp3nQbrfCIWk6RQWPr3iLnb2TW6QoLCLOZz88EvRsAJqowYIQaITJDsCGv9SqM6a1iHESOvnXvKu4u9Uubx/LnxNeLEONPpBMbdN13jfeZ9JxOqycDTnd+L7Ol6PLWxly5npw+8Gp69n4ZkpNo0x3k8LQ2SvT5y2ZwQP7sCi3mQ67kgUxZE4teHH8RAjL7yQ0RwBJgZFxsx9HxL+po3Gh40scuOz7FKyajH1RKPC2oZ2V4oOS48wkm/MCp6HWw9E0t8C2CRTZomTpHW3FQKBgYACck 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)(136003)(376002)(396003)(346002)(39860400002)(230922051799003)(451199024)(82310400011)(1800799012)(186009)(64100799003)(46966006)(36840700001)(40470700004)(83380400001)(356005)(47076005)(7636003)(426003)(336012)(450100002)(55016003)(82740400003)(8936002)(6666004)(7696005)(4326008)(70586007)(70206006)(316002)(36860700001)(54906003)(6916009)(5660300002)(8676002)(86362001)(478600001)(40480700001)(41300700001)(2906002)(36756003)(6286002)(26005)(1076003)(2616005)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2023 16:01:35.2622 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20a4133c-0c76-4909-53d0-08dbef6221af 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: CY4PEPF0000E9D7.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9188 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 When MPLS modification support was added [1], the "tag_index" field was added into "rte_flow_action_modify_data" structure. As part of this change, the "RTE_FLOW_FIELD_TAG" type moved to use it for tag array instead of using "level" field. Using "level" is still supported for backwards compatibility when "tag_index" field is zero. The "mlx5_flow_field_id_to_modify_info()" function calls "flow_hw_get_reg_id()" function with "level" without checking first whether "tag_index" field is valid. This patch calls first to "flow_tag_index_get()" function to get the index before sending it to "flow_hw_get_reg_id()" function. [1] commit c23626f27b09 ("ethdev: add MPLS header modification") Fixes: 04e740e69512 ("net/mlx5: separate registers usage per port") Cc: getelson@nvidia.com Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Ori Kam --- v2: fix the commit reference format. drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 115d730317..e168325f2d 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1925,7 +1925,7 @@ mlx5_flow_field_id_to_modify_info if (priv->sh->config.dv_flow_en == 2) reg = flow_hw_get_reg_id(dev, RTE_FLOW_ITEM_TYPE_TAG, - data->level); + tag_index); else reg = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, tag_index, error);