From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4B20BA0032 for ; Fri, 18 Feb 2022 08:19:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6222641158; Fri, 18 Feb 2022 08:19:04 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2075.outbound.protection.outlook.com [40.107.220.75]) by mails.dpdk.org (Postfix) with ESMTP id 5608541142 for ; Fri, 18 Feb 2022 08:19:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MrKklc6IbyO/iIEDVQWiItOAexgX/bPuSGFhWV4QjlBcJVBOED/NHg2Jwl6p1DsQfIh6trIvwRaaTipG29QRUTj7X9eKlFVtZQiGHTMxgQ/9LXulh7yvG0EYVZSGGQU2IO6DjDwupWVe6uxXqIJfHsF2i6KF90eQP0NXgDMjHc5isGcxxO10gp/df7RiAedT2fu/k3Hwcgj4NCQIb7sZgccSbG5O6iwhPFVZo5IxW0vRgnxiRmY60xFGtihkS4eCHGTWN3Ke7twm6CYSp8P2s4/KZ1uLvLkNPrjgam64lovpPNhAPNpCfALSWA8ZCwbpMaNIN2Voa3wFOq5RGLcQtw== 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=wENDdeFppaibbVK0vWPlGT47jfF9qKVS5fQof7BcOz8=; b=T1L8N+6ZTI6caDn0KRj2tqhKFvUaUf6znt5MdJSHJX6RIouH70SYCH5CF+S0kzeM8eDFCkCFEvvpGjS4S5CZxRJQov1lSKRQSMoMZXT++ekLqR9CpZTt0NTVvdOJxAwb7MibmkP2YdR7BCvb/53Cjyi1hbgGAfJb7pE2cKSnyLtkdVX/W1wd56VAZ+8+XrNPMhL4sidf4Rcyugqlwqwf2ctNu0DUXnjn7osvEZ/UQe94B5f5tlp3d5at/GBh74IupYQRPu5kMocU4AbTdD/HXQ1JpgfLUvLC6lv7TOvONM8htOZ+NWdFExbkpDypTrF8LNV3N7GNnk45KwftuCQhpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) 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=wENDdeFppaibbVK0vWPlGT47jfF9qKVS5fQof7BcOz8=; b=HKQUCOyRmPmK6fC3rJnuh79kItsLdvI1+C2gBUxNGdwzJ3eCMol16drfX7coF9ZwbMcp8gSyO0vaeIYuMFV6tHCvQysHpDwR3a9iB4NdhY/qcSgdSSlgV+lCRF+QRbCFzjG+sanX/4Kbtq9Sf9tT0v/tRNUjbjVPnhD/OU7pKu768VAJI4mIVaJtb5UUxDf2IrzS+zgAxMzz6lgav0nAl5MoSBUiBuuD0X+/ANxgTY2S7z/5PQS0n6vcwAYNlGs9pRTJuD+lsSUMoFWUyvzl8Kk0HJLZK76NIhdHABbOne2Yb4Jola022XzojJvhDRDsMUBcvRhimijPpAW2NgSZzg== Received: from DM3PR12CA0046.namprd12.prod.outlook.com (2603:10b6:0:56::14) by MN2PR12MB3407.namprd12.prod.outlook.com (2603:10b6:208:c5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.17; Fri, 18 Feb 2022 07:18:57 +0000 Received: from DM6NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:0:56:cafe::95) by DM3PR12CA0046.outlook.office365.com (2603:10b6:0:56::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.16 via Frontend Transport; Fri, 18 Feb 2022 07:18:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) 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 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.236) by DM6NAM11FT032.mail.protection.outlook.com (10.13.173.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4995.15 via Frontend Transport; Fri, 18 Feb 2022 07:18:57 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 18 Feb 2022 07:18:56 +0000 Received: from nvidia.com (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.9; Thu, 17 Feb 2022 23:18:53 -0800 From: Shun Hao To: , , , , Xueming Li CC: , , Subject: [PATCH v1 1/2] common/mlx5: query E-Switch manager vport ID Date: Fri, 18 Feb 2022 09:18:33 +0200 Message-ID: <20220218071834.11534-2-shunh@nvidia.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20220218071834.11534-1-shunh@nvidia.com> References: <20220218071834.11534-1-shunh@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f7580ca-c834-4d0a-812e-08d9f2aeed8b X-MS-TrafficTypeDiagnostic: MN2PR12MB3407:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ie3BPxisDm+KiUCIsAAzctvpjGJcNXIjYzK7j+QAoU88ZCkZ2wmy6175yqTIxW8DiKvrZy3f047ZC2+aiV4Wzhw5gQkYqROoDe8CAgOQqIm/IlKiaqnCNE89OR6sKu6WsLOBkPb1r9LZCQ8Y8Adc9ITFdR77cO34GHB5tCRlrE/D8y8oh52Ishv5iSoj/dnmnH3HRlOxp33v8dpWKtDJuNzgUl6mNiyf7GurXkVhs1unjMhVDL+rzh3m3o5t5objkDYooG6MBR3xpsyhGRvp+XEULoLzqGpE/V676xGtU8+2RzkMFEWLoeNHmD6o9Vq6b/flofjjvIcrgRThP9w4LIqgTY41I4xlXd0wLwOLXwirZ3oLaUhgwuvbVQFbXNtQMFGdSETdO1VkIJr7Lxgf2QLbZ6y7TNjfdiQ/x289SN5aTtDqKqMYufKo+x+ll761qMIwcU180o8YJZuvCVD5mYkT6uPQVskHPLSs5J2WKPqJwqSxD0kYqCeWonRvFx6zn6sdwjtnqzdI9+BGY1Uke7dtZqpkH/Vk8cO6SAyh5h4ZwoLnFpY1N+nGXeMU0AE3FkINUY//TBrdHSyDJmssz8AhrSFUBC+2T/9+mBX3H6FRT0yeJsJSc00+euxg6cLAMPR3t7y/wIYCUYrDKE7p3Ixr7dI0UoHbqCdtNKMVt/9MuTkGgQYykOJJmKsw3xGQT47HKIgcJRc5Ii4EhGfQzw== X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(336012)(426003)(47076005)(26005)(186003)(6286002)(16526019)(1076003)(316002)(110136005)(6636002)(5660300002)(36756003)(356005)(86362001)(81166007)(8936002)(70586007)(36860700001)(7696005)(70206006)(508600001)(4326008)(2906002)(55016003)(82310400004)(8676002)(2616005)(40460700003)(83380400001)(6666004)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2022 07:18:57.1960 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f7580ca-c834-4d0a-812e-08d9f2aeed8b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3407 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org One of the E-Switch vports plays the special role - it is assigned as "E-Switch manager" and has some special exclusive rights and duties - it maintains all the representors, manages FDB domain flows, etc. By default, the E-Switch vport index was supposed to be zero on standalone NICs (regular ConnectX) and 0xFFFE SmartNIC (BlueField), but that was not always correct - this index can be assigned with any value by kernel/hypervisor. To handle this, this uses the DevX API to query E-Switch manager vport ID directly from firmware during initialization. Fixes: a564038699f9 ("net/mlx5: support E-Switch manager egress traffic match") Cc: stable@dpdk.org Signed-off-by: Shun Hao --- drivers/common/mlx5/mlx5_devx_cmds.c | 12 ++++++++++++ drivers/common/mlx5/mlx5_devx_cmds.h | 2 ++ drivers/common/mlx5/mlx5_prm.h | 12 ++++++++++++ 3 files changed, 26 insertions(+) diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c index 2e807a0829..6d632b97ed 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.c +++ b/drivers/common/mlx5/mlx5_devx_cmds.c @@ -1130,6 +1130,18 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, goto error; } } + if (attr->eswitch_manager) { + hcattr = mlx5_devx_get_hca_cap(ctx, in, out, &rc, + MLX5_SET_HCA_CAP_OP_MOD_ESW | + MLX5_HCA_CAP_OPMOD_GET_CUR); + if (!hcattr) + return rc; + attr->esw_mgr_vport_id_valid = + MLX5_GET(esw_cap, hcattr, + esw_manager_vport_number_valid); + attr->esw_mgr_vport_id = + MLX5_GET(esw_cap, hcattr, esw_manager_vport_number); + } return 0; error: rc = (rc > 0) ? -rc : rc; diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h b/drivers/common/mlx5/mlx5_devx_cmds.h index 37821b493e..4373761c29 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.h +++ b/drivers/common/mlx5/mlx5_devx_cmds.h @@ -252,6 +252,8 @@ struct mlx5_hca_attr { uint32_t umr_modify_entity_size_disabled:1; uint32_t umr_indirect_mkey_disabled:1; uint32_t log_min_stride_wqe_sz:5; + uint32_t esw_mgr_vport_id_valid:1; /* E-Switch Mgr vport ID is valid. */ + uint16_t esw_mgr_vport_id; /* E-Switch Mgr vport ID . */ uint16_t max_wqe_sz_sq; }; diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 495b63191a..b9e39aa717 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -1264,6 +1264,7 @@ enum { MLX5_GET_HCA_CAP_OP_MOD_QOS_CAP = 0xc << 1, MLX5_GET_HCA_CAP_OP_MOD_ROCE = 0x4 << 1, MLX5_GET_HCA_CAP_OP_MOD_NIC_FLOW_TABLE = 0x7 << 1, + MLX5_SET_HCA_CAP_OP_MOD_ESW = 0x9 << 1, MLX5_GET_HCA_CAP_OP_MOD_VDPA_EMULATION = 0x13 << 1, MLX5_GET_HCA_CAP_OP_MOD_PARSE_GRAPH_NODE_CAP = 0x1C << 1, MLX5_GET_HCA_CAP_OP_MOD_GENERAL_DEVICE_2 = 0x20 << 1, @@ -1926,6 +1927,16 @@ struct mlx5_ifc_cmd_hca_cap_2_bits { u8 reserved_at_100[0x700]; }; +struct mlx5_ifc_esw_cap_bits { + u8 reserved_at_0[0x60]; + + u8 esw_manager_vport_number_valid[0x1]; + u8 reserved_at_61[0xf]; + u8 esw_manager_vport_number[0x10]; + + u8 reserved_at_80[0x780]; +}; + union mlx5_ifc_hca_cap_union_bits { struct mlx5_ifc_cmd_hca_cap_bits cmd_hca_cap; struct mlx5_ifc_cmd_hca_cap_2_bits cmd_hca_cap_2; @@ -1934,6 +1945,7 @@ union mlx5_ifc_hca_cap_union_bits { struct mlx5_ifc_qos_cap_bits qos_cap; struct mlx5_ifc_virtio_emulation_cap_bits vdpa_caps; struct mlx5_ifc_flow_table_nic_cap_bits flow_table_nic_cap; + struct mlx5_ifc_esw_cap_bits esw_cap; struct mlx5_ifc_roce_caps_bits roce_caps; u8 reserved_at_0[0x8000]; }; -- 2.20.0