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 2702C45BFD; Mon, 28 Oct 2024 10:19:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23E7A40E41; Mon, 28 Oct 2024 10:19:24 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2071.outbound.protection.outlook.com [40.107.93.71]) by mails.dpdk.org (Postfix) with ESMTP id BAA9C40DDE for ; Mon, 28 Oct 2024 10:19:18 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q3UBW60kHWqvSB2B6mYTslSkoNJFF4bpNdjEIjMYLWlM9aAhK6QK5bEmRfg9tEqqoV7h54HSSpwkU997pJlYrL/YnvnAGEMWR+JyW5//PlR90/j1EHDXVJlPHblTNWxekW4eaVfRtRJFtUKE9T8zxfbhXcnZT3Zne9TvLkLyBwnCi955nN6Lzn4pqeEyMhTxliCVW2IGll99OBX6NKMiWhvG/BzCchZIZjwkmzXBX9CfBZaumMhVumb02D30FGdHzI8y18azNBGxxLJZEztZ4G5o+w7EygxzaaJE86Q5UuesVg+JAvnlFdokntcZ8Sk37UL2x4jmzpIPhvLgKTECDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qpLJf8j6v4vqjZEERKlkqcwBaQIZ9BxxqYUOa9v8+co=; b=ZJ+dW2IRr3llH65AXlWOoVtD1RymeAyvxWbwcXEOqIXG+udnsSj/QNV/a43oD6QUFk9ipM+P+kZE+MMNHbU9eo4XeQr210zb9nM3kJc8GBH7oaNCxIlU+E5abej49WND/CLCtTex/JlCKefjfIQF74wnyKd50Rn0yjZNjP1XhIwkuOnzNxcQ6WOKr9FUi/uLTWK+pW6ydfEqFBl6MvccQQicwwK6slPYwfM7ogQberspqe7oT8ShH2bP5rBq9qRSXQtYHqbXUByVxTMqQI2WQjj7rAE+NTmf9zlMIf+1uA5aZa1fvyO+66BVaeK65Q2OdgxToBPqGGPSISs+/K3DEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net 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=qpLJf8j6v4vqjZEERKlkqcwBaQIZ9BxxqYUOa9v8+co=; b=RgI6V8nLR8BGtZBsP9xNMNQtY9/jRwOIOZ49wVtSQD4+V4W+iiDir4Fw48VmXEb92BYtc4/yF22BWT4O12nnzhCsRC/yYnSSigEz7nEz9RBODpG8PT2REyUIeRTOX6e1FTPCcJjLl6lJBCbNw4CiEtOQHlvIfXGDqwS70EK6q8Di6prLjsihsXgsuZ5c5YNDU75aPPUDmYIA2YjhvAChVJ2WDHZcGU2cRYdKzFJjNLd5EklHKPAac6BwUVazwW3/y4f1IRJZOctoSYtqjzMn4oBPmQautbCBKIXZSMdJiW//hr/8Duw5VuSGfUd8Vb4wcwbhiMrSWggx/rc6L6gSeg== Received: from CH2PR18CA0051.namprd18.prod.outlook.com (2603:10b6:610:55::31) by DS0PR12MB6582.namprd12.prod.outlook.com (2603:10b6:8:d2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.23; Mon, 28 Oct 2024 09:19:15 +0000 Received: from CH2PEPF0000013C.namprd02.prod.outlook.com (2603:10b6:610:55:cafe::72) by CH2PR18CA0051.outlook.office365.com (2603:10b6:610:55::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.26 via Frontend Transport; Mon, 28 Oct 2024 09:19:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CH2PEPF0000013C.mail.protection.outlook.com (10.167.244.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.16 via Frontend Transport; Mon, 28 Oct 2024 09:19:15 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 28 Oct 2024 02:19:03 -0700 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.1544.4; Mon, 28 Oct 2024 02:19:00 -0700 From: "Minggang Li(Gavin)" To: , , , , Dariusz Sosnowski , Bing Zhao , Suanming Mou CC: , Subject: [PATCH V2 7/7] mlx5: add backward compatibility for RDMA monitor Date: Mon, 28 Oct 2024 11:18:22 +0200 Message-ID: <20241028091822.860660-8-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241028091822.860660-1-gavinl@nvidia.com> References: <20241016083818.662020-8-gavinl@nvidia.com> <20241028091822.860660-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: CH2PEPF0000013C:EE_|DS0PR12MB6582:EE_ X-MS-Office365-Filtering-Correlation-Id: 468ffbfc-a3db-4b3b-14d3-08dcf73197ea X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?T8wHJc2oQ08baGzVv0onllRT6QeX8c8Rrd+LWIjSi/S3R0+fCX3JhLdaWIaN?= =?us-ascii?Q?nVXr5MMnS/a0o+WkQq8r9H2fhapxbpthrm/ixwDygp7qMaNjFxgyZX5X0HnE?= =?us-ascii?Q?zpbHxursR6gHTCkF72nFxBnFqQ/wXzoosmEltyLB0crIL0edpJ8hORMka0dv?= =?us-ascii?Q?amykQl2kvF3vt4xpn95ZH5bNoJBpVik+1BwR/0yYlYRIdQwSUzaWkXtvTo2k?= =?us-ascii?Q?bGcM/4a8aYlBAJDFFVxZamdmGvbl7br/qpNPu4HkFzto7R5gVE/sjMbEBaBf?= =?us-ascii?Q?5hnaik3wQKMT0OA7/bVygmjf0FZ01tZ98H1pXsO2nn4ov5cBHpg9t1aVT7FZ?= =?us-ascii?Q?ZiQ37K5cCSsS6VhSg9TrVNF0mzujD5VhpA0qnyp0OLGRh0FD/lW+jKPdlA0P?= =?us-ascii?Q?kP5iNoHTwQV0QwucD/U8D2+hcWyMe/wgP12qRl0JglG2zDexT7Z4E1JVOIRj?= =?us-ascii?Q?VlFTuulSARWA5EinG4pgcZ5ICVr65aAD4R/+J87BYkucZ7y/5+5kKOOZz+cK?= =?us-ascii?Q?FfK56XzOn45UkI1ZmZyBm+PtRUsmfE2FPCSwjmx4VmJFrgoRP6XcWzwBWF3l?= =?us-ascii?Q?BIGF2Qx3fsW9dHop3WvCAwagvyiT8dBgB82C+jkb2XmUdKnuoumMzjkkPVcj?= =?us-ascii?Q?4sUVVIOyR5eQIENroVS5j3NMddAuufSBcQccbnMFKBlKrArjmJzfA7OAIS31?= =?us-ascii?Q?vjRPTD5C30pBNBnjqXBVnWImyjoRfRA3FaJj+/tdpeHHamttHnyy6EXTsnjn?= =?us-ascii?Q?ayeOJTOUcz9Xj6mWmCfY33g7jNrmX8azQqCRbq/6F73D4vLqZeoXaAXvSbzW?= =?us-ascii?Q?EHwr36DfIa4v7NZZEGs/BBBOMkcmv62GGg+SPbwvs0Kw+ngnfHb6ptZc3bs8?= =?us-ascii?Q?IcJKkqV7DBRZz3EsIgg1SHjaI41X0Wag9giRXmILH5fHUrmODpIAb2ujDW/r?= =?us-ascii?Q?S0eAhsmeVFnmo+KVD5P+RAE5n9UrOJsVI2I92rFZSZNlTZ3UEULbwy9inCxu?= =?us-ascii?Q?B50kcplhrsHZZww0neZHDJk8zVgKCxabeOBXXdRiUpJ+c0vbkSNfpA2lks+t?= =?us-ascii?Q?vk2DNhNw5DAgbz6K1k9Li+BC9haM8mpjyzwC+ARxclyZ3ZLd6IIkUXADr3qK?= =?us-ascii?Q?DmDiw3Zbe0BzRr/bGc+0idtxCWT3s/Lv4920FztNsAfbkvhDUwhKrPsHZFsi?= =?us-ascii?Q?YWHPy/ZhzewjFe3YmzGPgQPagFl4QjjKBHVKcuuJUdMNHrkWACSzTmX4ulcc?= =?us-ascii?Q?lrfcAAn3A4nFNqLgh6F8BZQ/P8CVoruSWSICzvDlEFpltWlwVbkc5alZlYf/?= =?us-ascii?Q?Vwcc3SPtl7AADfZFRSsmtHVfIvYhVawiIwPsLc1i1NTsvfxFBoS9DiaM1JRT?= =?us-ascii?Q?5KBE3cckoDRkz8t4UHaJWV5aDhFKVodVz/g7A7KAcL8aTi/NLw=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2024 09:19:15.2520 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 468ffbfc-a3db-4b3b-14d3-08dcf73197ea 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF0000013C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6582 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 Fallback to the old way to update port information if the kernel driver does not support RDMA monitor. Signed-off-by: Minggang Li(Gavin) Acked-by: Viacheslav Ovsiienko --- doc/guides/rel_notes/release_24_11.rst | 14 +++++ drivers/common/mlx5/linux/mlx5_nl.c | 73 +++++++++++++++++++++++++ drivers/common/mlx5/version.map | 1 + drivers/net/mlx5/linux/mlx5_ethdev_os.c | 2 +- drivers/net/mlx5/linux/mlx5_os.c | 27 +++++++-- drivers/net/mlx5/mlx5.h | 1 + 6 files changed, 111 insertions(+), 7 deletions(-) diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index fa4822d928..02827ff392 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -247,6 +247,20 @@ New Features Added ability for node to advertise and update multiple xstat counters, that can be retrieved using ``rte_graph_cluster_stats_get``. +* **Updated NVIDIA mlx5 driver.** + + Optimized port probe in large scale. + In previous release, it would take long time to probe one VF/SF if + hundreds of VF/SF were created in the system. With this newly introduced + feature optimization, the time to probe a VF/SF will be reduced greatly in + large scale, eg hundreds of VF/SFs. This feature is controlled through the + ``probe_opt_en`` device argument. Setting it to a non-zero value indicates + the application will enable this functionality when probing a device. This + feature relies on a feature of RDMA driver to be release in incoming + upstream kernel 6.13 or the equivalent in OFED 24.10, ie. RDMA monitor. + For further information on the devargs limitation, see + "doc/guides/nics/mlx5.rst". + Removed Items ------------- diff --git a/drivers/common/mlx5/linux/mlx5_nl.c b/drivers/common/mlx5/linux/mlx5_nl.c index ce1c2a8e75..12f1a620f3 100644 --- a/drivers/common/mlx5/linux/mlx5_nl.c +++ b/drivers/common/mlx5/linux/mlx5_nl.c @@ -2152,3 +2152,76 @@ mlx5_nl_rdma_monitor_info_get(struct nlmsghdr *hdr, struct mlx5_nl_port_info *da error: rte_errno = EINVAL; } + +static int +mlx5_nl_rdma_monitor_cap_get_cb(struct nlmsghdr *hdr, void *arg) +{ + size_t off = NLMSG_HDRLEN; + uint8_t *cap = arg; + + if (hdr->nlmsg_type != RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_SYS_GET)) + goto error; + + *cap = 0; + while (off < hdr->nlmsg_len) { + struct nlattr *na = (void *)((uintptr_t)hdr + off); + void *payload = (void *)((uintptr_t)na + NLA_HDRLEN); + + if (na->nla_len > hdr->nlmsg_len - off) + goto error; + switch (na->nla_type) { + case RDMA_NLDEV_SYS_ATTR_MONITOR_MODE: + *cap = *(uint8_t *)payload; + return 0; + default: + break; + } + off += NLA_ALIGN(na->nla_len); + } + + return 0; + +error: + return -EINVAL; +} + +/** + * Get RDMA monitor support in driver. + * + * + * @param nl + * Netlink socket of the RDMA kind (NETLINK_RDMA). + * @param[out] cap + * Pointer to port info. + * @return + * 0 on success, negative on error and rte_errno is set. + */ +int +mlx5_nl_rdma_monitor_cap_get(int nl, uint8_t *cap) +{ + union { + struct nlmsghdr nh; + uint8_t buf[NLMSG_HDRLEN]; + } req = { + .nh = { + .nlmsg_len = NLMSG_LENGTH(0), + .nlmsg_type = RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, + RDMA_NLDEV_CMD_SYS_GET), + .nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK, + }, + }; + uint32_t sn = MLX5_NL_SN_GENERATE; + int ret; + + ret = mlx5_nl_send(nl, &req.nh, sn); + if (ret < 0) { + rte_errno = -ret; + return ret; + } + ret = mlx5_nl_recv(nl, sn, mlx5_nl_rdma_monitor_cap_get_cb, cap); + if (ret < 0) { + rte_errno = -ret; + return ret; + } + return 0; +} diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map index 5230576006..8301485839 100644 --- a/drivers/common/mlx5/version.map +++ b/drivers/common/mlx5/version.map @@ -148,6 +148,7 @@ INTERNAL { mlx5_nl_vlan_vmwa_delete; # WINDOWS_NO_EXPORT mlx5_nl_rdma_monitor_init; # WINDOWS_NO_EXPORT mlx5_nl_rdma_monitor_info_get; # WINDOWS_NO_EXPORT + mlx5_nl_rdma_monitor_cap_get; # WINDOWS_NO_EXPORT mlx5_os_umem_dereg; mlx5_os_umem_reg; diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c index 5156d96b3a..6b2c25a7c2 100644 --- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c @@ -736,7 +736,7 @@ mlx5_dev_interrupt_nl_cb(struct nlmsghdr *hdr, void *cb_arg) if (mlx5_nl_parse_link_status_update(hdr, &if_index) < 0) return; - if (sh->cdev->config.probe_opt && sh->cdev->dev_info.port_num > 1) + if (sh->cdev->config.probe_opt && sh->cdev->dev_info.port_num > 1 && !sh->rdma_monitor_supp) mlx5_handle_port_info_update(&sh->cdev->dev_info, if_index, hdr->nlmsg_type); for (i = 0; i < sh->max_port; i++) { diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 47da00937b..93556dc580 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -3022,6 +3022,7 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh) { struct ibv_context *ctx = sh->cdev->ctx; int nlsk_fd; + uint8_t rdma_monitor_supp = 0; sh->intr_handle = mlx5_os_interrupt_handler_create (RTE_INTR_INSTANCE_F_SHARED, true, @@ -3030,20 +3031,34 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh) DRV_LOG(ERR, "Failed to allocate intr_handle."); return; } - if (sh->cdev->config.probe_opt && sh->cdev->dev_info.port_num > 1) { + if (sh->cdev->config.probe_opt && + sh->cdev->dev_info.port_num > 1 && + !sh->rdma_monitor_supp) { nlsk_fd = mlx5_nl_rdma_monitor_init(); if (nlsk_fd < 0) { DRV_LOG(ERR, "Failed to create a socket for RDMA Netlink events: %s", rte_strerror(rte_errno)); return; } - sh->intr_handle_ib = mlx5_os_interrupt_handler_create - (RTE_INTR_INSTANCE_F_SHARED, true, - nlsk_fd, mlx5_dev_interrupt_handler_ib, sh); - if (sh->intr_handle_ib == NULL) { - DRV_LOG(ERR, "Fail to allocate intr_handle"); + if (mlx5_nl_rdma_monitor_cap_get(nlsk_fd, &rdma_monitor_supp)) { + DRV_LOG(ERR, "Failed to query RDMA monitor support: %s", + rte_strerror(rte_errno)); + close(nlsk_fd); return; } + sh->rdma_monitor_supp = rdma_monitor_supp; + if (sh->rdma_monitor_supp) { + sh->intr_handle_ib = mlx5_os_interrupt_handler_create + (RTE_INTR_INSTANCE_F_SHARED, true, + nlsk_fd, mlx5_dev_interrupt_handler_ib, sh); + if (sh->intr_handle_ib == NULL) { + DRV_LOG(ERR, "Fail to allocate intr_handle"); + close(nlsk_fd); + return; + } + } else { + close(nlsk_fd); + } } nlsk_fd = mlx5_nl_init(NETLINK_ROUTE, RTMGRP_LINK); if (nlsk_fd < 0) { diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index fe56bc897a..126b48ac61 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1517,6 +1517,7 @@ struct mlx5_dev_ctx_shared { uint32_t lag_rx_port_affinity_en:1; /* lag_rx_port_affinity is supported. */ uint32_t hws_max_log_bulk_sz:5; + uint32_t rdma_monitor_supp:1; /* Log of minimal HWS counters created hard coded. */ uint32_t hws_max_nb_counters; /* Maximal number for HWS counters. */ uint32_t max_port; /* Maximal IB device port index. */ -- 2.34.1