From patchwork Mon Nov 27 14:50:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 134628 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 8C4B2433DE; Mon, 27 Nov 2023 15:51:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1282840A4B; Mon, 27 Nov 2023 15:51:22 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2052.outbound.protection.outlook.com [40.107.220.52]) by mails.dpdk.org (Postfix) with ESMTP id 0B7EB402A3; Mon, 27 Nov 2023 15:51:20 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jH7yqpFe5gTg2m3rEPGCtrkpzbF8NR16HXEJtzbIUXiE1rVU9BwBF/JfWmRvI/VjSzqC/3TkWBobJQGO/oRO89qhtP6frvtfaGKekJ3lZHHxlXeFyHF1CzV9kCmQ8srnOZq/GlFXs1oDZYE9jhnFXCWhVAd2d+w5wcpnvX4zVqEb5FuqNf1m8x4bkJoywlRKnjEIYl8Gv/XjyRUA/tNSc8gSw2j1VozUvtMTv0HF4jWlG0tnuwSDD73AbMG+/kmXH8X+pVXPF9YvaaRUhVhvuzhAXm2OzQO+ZbhjcDWG/a6LChwiWEe/HHuaFVt8GpuIhai+cqHPT/YjGQ2UNrCpvA== 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=sR8VFUPdvGOdhYdtTTrB58iqc/9BLrro+MpvotB6h+g=; b=eRnR5fkAHtXEW7AK+fQew1BLmXbRYv64sGkArFeb+rGlb5vAsrJCsfG1oBrvzW6LNYRQ5IG0/0Prl7qap6jd7Mz4QeDbwsN0R7jv7uP+O3ca5oV2HImV284i29/9/thggn19QZW2S/hT9swn4ywxnXapSzugSTCirvehqHhYXHK2Qo855Uina9yYH3y8U63TBZuPULjVPUqPbv2hQdV+McoF10qvgiFb90H4EGiti9zCV+YFbqUQRLKNokl3U1ch6HruzkRR7CxFWNevyompg3sdE7ywPakiuIa9w+WErNTL9T0d66xZGhfxKbNpDLHrLcs3nESicUP2yVPKePEcQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=sR8VFUPdvGOdhYdtTTrB58iqc/9BLrro+MpvotB6h+g=; b=RGEU9mmpi4BskSR/i0YZ3vAU4PVdPfkukW4L0KUA52h5e7M6pZkxVCz9YD5jOKFJMfq96Pegj9UUl6+9rj2SHvRF/cy0BhOxc990pzGArUOv7jRX5mSavAkBpCdsiWwA0oFLKJxLnHaU3B/iayenItH47H3oE1MqAg1x8LhluCot5uZFVmRQ3vTwBsey8ypSGX/5vv3HIu0/t9l4BHYE90KT7dCIjg5JUD3M6db5d4l5/6ANIIgFVwRL496gcH9IVgxZSteyyzQ0La7jd7uGoqa3OEiCL0NZdQkVLQTvc+TcUDHCqiacq6rJDZfO0KxvV6va42fH5DZTBps5eq06ZQ== Received: from DM6PR10CA0025.namprd10.prod.outlook.com (2603:10b6:5:60::38) by PH7PR12MB9104.namprd12.prod.outlook.com (2603:10b6:510:2f3::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.27; Mon, 27 Nov 2023 14:51:17 +0000 Received: from DS1PEPF0001709C.namprd05.prod.outlook.com (2603:10b6:5:60:cafe::36) by DM6PR10CA0025.outlook.office365.com (2603:10b6:5:60::38) 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 14:51:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by DS1PEPF0001709C.mail.protection.outlook.com (10.167.18.106) 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 14:51:17 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) 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 06:51:05 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) 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 06:51:05 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.181) 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 06:51:03 -0800 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , , Subject: [PATCH] net/mlx5: fix index choosing in TAG modification Date: Mon, 27 Nov 2023 16:50:58 +0200 Message-ID: <20231127145058.447245-1-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709C:EE_|PH7PR12MB9104:EE_ X-MS-Office365-Filtering-Correlation-Id: ea742fe8-2dc3-4780-952c-08dbef584f8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VBOq02Rn9zgu3fURKqJoV749kMV0x0TVkFqX+2Y27tf1vxo1F8FAPRlo1vJjs997jWH4FFVWH1UX2vf413yxrkVhKWvReSPe1U9PyJOWlWGHtPBIK41pIN7iIDu2NIi0JqLyIpmFS3SoJznYOY8CiUQfjSFwcfQJianWgZACCs2EktdQKWo4gJw02PGwUX+2I9TZRsyKACfsNFzqkhgce7IUbZqCj21CT4wdSmcAXPIDdcEfFzWUI0g72UKMtaerwhq+rC5n6LZR2C13IUURw96greTqWeIwo29YBI8ea/x6jCAbQdlrtjpr1Xx5kXuzXH4tiW29tlfvplrqojD0gK7zpDsmdpzk2mMYVskh88JisJpwu8M1NTm2PaHSqMlHqYfymqCh8PP9pSPhMMAFkJ/qp8JrMNLiIG7tST2N/LgtAH8hLbEEZVZqaTyo3qMkxW1InzT1o+YHt5mIILRwLzE5/JDSnY/m6l6ob6IeFKtuJ+QHJCNbKuxjZxsIoW/UmcUZcs9CeZXYP30DsEiqUrw3SEl1H5/hUnJws2fhoY0QnpTENL04AnMt7vhE60yaWwGdADtGZmpbp/oMxMlCHopIsVfSR5OqGRTulh78BU5gvXXhE+VIk3c2PHyTWILYnmBQUZTHQC24c5uYKjdsuF7OgsDyNGC98Zc3UJoGj+THPCezmKR8hGJCaZYmCgNDuvQIpm6IyH5NI+H3M4gq1Fej7P3TOzLMgJKBk3hmVVdKBNas/ePCK90mDRHyoI2v X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(39860400002)(376002)(136003)(396003)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(82310400011)(46966006)(40470700004)(36840700001)(36756003)(41300700001)(356005)(7636003)(55016003)(47076005)(2906002)(83380400001)(82740400003)(5660300002)(426003)(336012)(26005)(86362001)(6286002)(2616005)(36860700001)(40480700001)(1076003)(7696005)(8936002)(6666004)(8676002)(4326008)(40460700003)(450100002)(478600001)(54906003)(70206006)(70586007)(6916009)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2023 14:51:17.2293 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea742fe8-2dc3-4780-952c-08dbef584f8a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0001709C.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9104 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] 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 --- 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);