From patchwork Sun Oct 29 18:22:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 133617 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 41F9443239; Sun, 29 Oct 2023 19:25:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D852942D91; Sun, 29 Oct 2023 19:24:14 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2049.outbound.protection.outlook.com [40.107.93.49]) by mails.dpdk.org (Postfix) with ESMTP id 761D441148 for ; Sun, 29 Oct 2023 19:24:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VLyQHeQMnGGOleRY1LN1P9pTkHbth3v4agsS0dJkE/QvP9XOPE9oijV5P8J3Jeqh8yE51AwanwP7Zmm6+sMEpCvf07sG7PgzJ2r9r1fiDk8M1hrUYPXkXU+HsoCdChhc30Ps5m5zQGhJLq5frSFHd16+rCS65p+HGPbg4EvztEgbfQWeFXdrPF4UfBbuQFnq3WXsLKO36Zc+bi8oxczfcA5jpd4MvFxLNG7NiXgw0c1h+gfVGe1RVfHYjV6h14HQEI4KLDqYvOLMFGfrFQCI9yRACt34orphzQagFmlOzg4XkApToXetK1jKTHbp+WR5lVQE3ihTlzghvutYMjx2ow== 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=vx2kx0DB7oLzGLM7BwEUqxS2+8x2Xs94OGdIu0PxLl8=; b=jmotuEUEIgv84s69CZzdAqqrb9kuitnjuLztoH95xeazbsbB0fx18uNEwZFHPJzM/ezU0rJKqmw+1IcWoHtPjtBKfqh9E1aHk6KngEDmKJw55afghUPBUhr/vdpNk19xLgHtL01A0pzskhOfgvjiBkJ5RBMCtpciOtnbGuGxF9HrK8KvEOP9Wjufa1MqXyK9dUc4qMXjWWpCDSM1Vi/qiJlu/b3A+Phcma26uP20NLmJoXD1ECzWE7mjg1U/fEUYQhwKBlEJP7C/5GMbnZ1M/HJRfOqkMppWIZZ1tlFrqzGDOsaCErn5u/eRwAj9hwsbW66ZFjRUF3Vy43/kFr90Pg== 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=vx2kx0DB7oLzGLM7BwEUqxS2+8x2Xs94OGdIu0PxLl8=; b=f2NBip2/BZOQU5TmfUMUPaO8GiSnclT/2igM6tci6z3oJlNa0NfueDM1cbN5lXezw9rj4OmwfABi5evyPPcwHg7iuCNUtsYuadI89cMj5WDFP+KXyeF8RA9y7pJP5gHRISvs3k5QL/q4pXBZKm82d9vV/Rn7nw4ye5AdH8EKNdgBMhujNXpCOW3GDCcf2au45bBvM1nMEoWJN/VJVNXvLNyvrGy5VnhV3eOgtpAw2n6/lNCtV9evPKI5wTCkxqA1n0izO0oAh53PVRXIv5N+zK4kH07QR2JeHyG4gYQNnMT0UJcqh/Z6IQATlLT+1nC1HZcqaU1up5OeRlBVEqWcpw== Received: from PR3P189CA0033.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:53::8) by PH7PR12MB7185.namprd12.prod.outlook.com (2603:10b6:510:201::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.25; Sun, 29 Oct 2023 18:24:07 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10a6:102:53:cafe::54) by PR3P189CA0033.outlook.office365.com (2603:10a6:102:53::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.26 via Frontend Transport; Sun, 29 Oct 2023 18:24:05 +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 SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 29 Oct 2023 18:24:05 +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; Sun, 29 Oct 2023 11:23:55 -0700 Received: from nvidia.com (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; Sun, 29 Oct 2023 11:23:52 -0700 From: Gregory Etelson To: CC: , , , "Ori Kam" , Matan Azrad , Viacheslav Ovsiienko , Suanming Mou Subject: [PATCH 12/13] net/mlx5: add support for more registers Date: Sun, 29 Oct 2023 20:22:59 +0200 Message-ID: <20231029182300.227879-13-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231029182300.227879-1-getelson@nvidia.com> References: <20231029182300.227879-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.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: SN1PEPF00026369:EE_|PH7PR12MB7185:EE_ X-MS-Office365-Filtering-Correlation-Id: 0dd135e7-5243-487c-b6cf-08dbd8ac3bd9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cZDWF3HCS85ITJfkWzyRdsnzPU41sjTSrtLCVBlQFUfwJf4CPWQ7f9OE3yZv4FH75/WMurV/j9YlLRje9XljwVDPGG/EEYo80oQ/0cQbv/PV630AgeRW7EcRL95fbHRIiqjO5fx20J/+PoGNBw638Ulnru7fmeHrm8qHfk4CUSdrbdahfmnki1zzF4b0OJSKiZtVp1VkP4joI9CoVAOkUK5q7uLrtc6Fk8m73Liu8s3E61Zw9g8L8NuOeWpj+fmCyGs/SXA3x0bs+M79M75glyJBTeP8eQwr6F3/l989Gj+zHt5W+B+bdDVI9cy7NMkOSbi91VYfuvrfSHP1sZ6MmPukBNLgErTu5QiGwWN5fXujrmUTTCODQFf4eVRkl2I+sVpAkL9uromZ/8AbL3Qw2h0bxDxI1lERpTyotN36ADfbyI2+I6XBVHCuVFsVzwIT8zA5WBtGtgxr7pq3WPG0A4yOf7lz33e5XUkciu3IODJ3S/OC+jFKf5980x0SkgQsQklm0npPO1witafPetLehkAD/3qLl4rKGDz4ohTZQuIdSI2rXYfR2UQosQH66zADgnSU8OvuDIjQSZ0uAyspYAapWOmINCBODq8J2BdBdcga4GMok/bLZjUKYticDD6utswtaij+eyurbUREeT7oHYch4P/GqiE3A63fcE6mbRi5HpijCS/LabJsvx7K5rKTiJq03FOTjCn3oVOHWSMUasTPMI5FeG/dtYAsHYZVi8nhyURYN6FvtfuRc3i+4eI+ 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)(396003)(39850400004)(136003)(376002)(346002)(230922051799003)(82310400011)(1800799009)(451199024)(186009)(64100799003)(36840700001)(46966006)(40470700004)(1076003)(26005)(2616005)(6286002)(16526019)(107886003)(336012)(478600001)(7696005)(83380400001)(47076005)(36860700001)(426003)(5660300002)(2906002)(41300700001)(70586007)(70206006)(4326008)(6916009)(8676002)(8936002)(54906003)(316002)(40460700003)(356005)(7636003)(82740400003)(36756003)(86362001)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2023 18:24:05.1749 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0dd135e7-5243-487c-b6cf-08dbd8ac3bd9 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: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7185 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 From: Ori Kam This commit adds the support for a additional registers that were added to the HW. Signed-off-by: Ori Kam Acked-by: Dariusz Sosnowski --- drivers/common/mlx5/mlx5_devx_cmds.c | 16 +++++++++---- drivers/common/mlx5/mlx5_devx_cmds.h | 2 +- drivers/common/mlx5/mlx5_prm.h | 36 ++++++++++++++++++++++++---- drivers/net/mlx5/mlx5.c | 4 ++-- drivers/net/mlx5/mlx5.h | 2 +- drivers/net/mlx5/mlx5_flow_dv.c | 4 ++++ drivers/net/mlx5/mlx5_flow_hw.c | 2 +- 7 files changed, 53 insertions(+), 13 deletions(-) diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c index 3afb2e9f80..4d8818924a 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.c +++ b/drivers/common/mlx5/mlx5_devx_cmds.c @@ -1229,7 +1229,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, attr->modify_outer_ip_ecn = MLX5_GET (flow_table_nic_cap, hcattr, ft_header_modify_nic_receive.outer_ip_ecn); - attr->set_reg_c = 0xff; + attr->set_reg_c = 0xffff; if (attr->nic_flow_table) { #define GET_RX_REG_X_BITS \ MLX5_GET(flow_table_nic_cap, hcattr, \ @@ -1238,10 +1238,16 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, MLX5_GET(flow_table_nic_cap, hcattr, \ ft_header_modify_nic_transmit.metadata_reg_c_x) - uint32_t tx_reg, rx_reg; + uint32_t tx_reg, rx_reg, reg_c_8_15; tx_reg = GET_TX_REG_X_BITS; + reg_c_8_15 = MLX5_GET(flow_table_nic_cap, hcattr, + ft_field_support_2_nic_transmit.metadata_reg_c_8_15); + tx_reg |= ((0xff & reg_c_8_15) << 8); rx_reg = GET_RX_REG_X_BITS; + reg_c_8_15 = MLX5_GET(flow_table_nic_cap, hcattr, + ft_field_support_2_nic_receive.metadata_reg_c_8_15); + rx_reg |= ((0xff & reg_c_8_15) << 8); attr->set_reg_c &= (rx_reg & tx_reg); #undef GET_RX_REG_X_BITS @@ -1371,7 +1377,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, MLX5_GET(esw_cap, hcattr, esw_manager_vport_number); } if (attr->eswitch_manager) { - uint32_t esw_reg; + uint32_t esw_reg, reg_c_8_15; hcattr = mlx5_devx_get_hca_cap(ctx, in, out, &rc, MLX5_GET_HCA_CAP_OP_MOD_ESW_FLOW_TABLE | @@ -1380,7 +1386,9 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, return rc; esw_reg = MLX5_GET(flow_table_esw_cap, hcattr, ft_header_modify_esw_fdb.metadata_reg_c_x); - attr->set_reg_c &= esw_reg; + reg_c_8_15 = MLX5_GET(flow_table_esw_cap, hcattr, + ft_field_support_2_esw_fdb.metadata_reg_c_8_15); + attr->set_reg_c &= ((0xff & reg_c_8_15) << 8) | esw_reg; } return 0; error: diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h b/drivers/common/mlx5/mlx5_devx_cmds.h index 11772431ae..7f23e925a5 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.h +++ b/drivers/common/mlx5/mlx5_devx_cmds.h @@ -301,7 +301,7 @@ struct mlx5_hca_attr { uint32_t cqe_compression_128:1; uint32_t multi_pkt_send_wqe:1; uint32_t enhanced_multi_pkt_send_wqe:1; - uint32_t set_reg_c:8; + uint32_t set_reg_c:16; uint32_t nic_flow_table:1; uint32_t modify_outer_ip_ecn:1; union { diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 19c6d0282b..2b499666f8 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -840,6 +840,14 @@ enum mlx5_modification_field { MLX5_MODI_IN_MPLS_LABEL_3, MLX5_MODI_IN_MPLS_LABEL_4, MLX5_MODI_OUT_IPV6_NEXT_HDR = 0x4A, + MLX5_MODI_META_REG_C_8 = 0x8F, + MLX5_MODI_META_REG_C_9 = 0x90, + MLX5_MODI_META_REG_C_10 = 0x91, + MLX5_MODI_META_REG_C_11 = 0x92, + MLX5_MODI_META_REG_C_12 = 0x93, + MLX5_MODI_META_REG_C_13 = 0x94, + MLX5_MODI_META_REG_C_14 = 0x95, + MLX5_MODI_META_REG_C_15 = 0x96, MLX5_MODI_INVALID = INT_MAX, }; @@ -2227,8 +2235,22 @@ struct mlx5_ifc_ft_fields_support_2_bits { u8 inner_ipv4_checksum_ok[0x1]; u8 inner_l4_checksum_ok[0x1]; u8 outer_ipv4_checksum_ok[0x1]; - u8 outer_l4_checksum_ok[0x1]; - u8 reserved_at_20[0x60]; + u8 outer_l4_checksum_ok[0x1]; /* end of DW0 */ + u8 reserved_at_20[0x18]; + union { + struct { + u8 metadata_reg_c_15[0x1]; + u8 metadata_reg_c_14[0x1]; + u8 metadata_reg_c_13[0x1]; + u8 metadata_reg_c_12[0x1]; + u8 metadata_reg_c_11[0x1]; + u8 metadata_reg_c_10[0x1]; + u8 metadata_reg_c_9[0x1]; + u8 metadata_reg_c_8[0x1]; + }; + u8 metadata_reg_c_8_15[0x8]; + }; /* end of DW1 */ + u8 reserved_at_40[0x40]; }; struct mlx5_ifc_flow_table_nic_cap_bits { @@ -2250,7 +2272,10 @@ struct mlx5_ifc_flow_table_nic_cap_bits { ft_header_modify_nic_receive; struct mlx5_ifc_ft_fields_support_2_bits ft_field_support_2_nic_receive; - u8 reserved_at_1480[0x780]; + u8 reserved_at_1480[0x280]; + struct mlx5_ifc_ft_fields_support_2_bits + ft_field_support_2_nic_transmit; + u8 reserved_at_1780[0x480]; struct mlx5_ifc_ft_fields_support_bits ft_header_modify_nic_transmit; u8 reserved_at_2000[0x6000]; @@ -2259,7 +2284,10 @@ struct mlx5_ifc_flow_table_nic_cap_bits { struct mlx5_ifc_flow_table_esw_cap_bits { u8 reserved_at_0[0x800]; struct mlx5_ifc_ft_fields_support_bits ft_header_modify_esw_fdb; - u8 reserved_at_C00[0x7400]; + u8 reserved_at_C00[0x800]; + struct mlx5_ifc_ft_fields_support_2_bits + ft_field_support_2_esw_fdb; + u8 reserved_at_1480[0x6b80]; }; enum mlx5_ifc_cross_vhca_object_to_object_supported_types { diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 840c566162..cdb4eeb612 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1604,8 +1604,8 @@ mlx5_init_hws_flow_tags_registers(struct mlx5_dev_ctx_shared *sh) { struct mlx5_dev_registers *reg = &sh->registers; uint32_t meta_mode = sh->config.dv_xmeta_en; - uint8_t masks = (uint8_t)sh->cdev->config.hca_attr.set_reg_c; - uint8_t unset = 0; + uint16_t masks = (uint16_t)sh->cdev->config.hca_attr.set_reg_c; + uint16_t unset = 0; uint32_t i, j; /* diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index a0dcd788b4..0289cbd04b 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1373,7 +1373,7 @@ struct mlx5_hws_cnt_svc_mng { struct mlx5_hws_aso_mng aso_mng __rte_cache_aligned; }; -#define MLX5_FLOW_HW_TAGS_MAX 8 +#define MLX5_FLOW_HW_TAGS_MAX 12 struct mlx5_dev_registers { enum modify_reg aso_reg; diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 9268a07c84..bdc8d0076a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -970,6 +970,10 @@ static enum mlx5_modification_field reg_to_field[] = { [REG_C_5] = MLX5_MODI_META_REG_C_5, [REG_C_6] = MLX5_MODI_META_REG_C_6, [REG_C_7] = MLX5_MODI_META_REG_C_7, + [REG_C_8] = MLX5_MODI_META_REG_C_8, + [REG_C_9] = MLX5_MODI_META_REG_C_9, + [REG_C_10] = MLX5_MODI_META_REG_C_10, + [REG_C_11] = MLX5_MODI_META_REG_C_11, }; /** diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 2148f5a63a..f2159e40fd 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -5615,7 +5615,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, { const struct rte_flow_item_tag *tag = (const struct rte_flow_item_tag *)items[i].spec; - uint8_t regcs = (uint8_t)priv->sh->cdev->config.hca_attr.set_reg_c; + uint16_t regcs = (uint8_t)priv->sh->cdev->config.hca_attr.set_reg_c; if (!((1 << (tag->index - REG_C_0)) & regcs)) return rte_flow_error_set(error, EINVAL,