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 5DE67A00C2 for ; Tue, 8 Mar 2022 16:10:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 576494068E; Tue, 8 Mar 2022 16:10:57 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2078.outbound.protection.outlook.com [40.107.94.78]) by mails.dpdk.org (Postfix) with ESMTP id E3FA940696 for ; Tue, 8 Mar 2022 16:10:55 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oVD7NW9cV2zconb8+2jpwFnck+txoY3ilUAKrbTKyvz+MPYt6ROfZTjac+CYEFU6eb1xe3aijs0ZvbyW617bZZO9fby7r34+wFrn23+rHdzAPLVq9iV58RmuudFCQYoRsfmYOkxGXKPhuQgRBDk5dN3w5hewNmTSUYhlyzGhkBtFsGg2F650hEyk+Q5Vv9Xstjmi3y0RCKZKrs7LC/OZq1iZ7iXlxE9+YDUctw9q+r5Qupxx6bhv0y+CCd/jm4EGu88I10blMbk4GqEEFcbom8byVbhZWV2wymqvAWVPkikGmieCiRxRYtteUzEdCKMlRIFQHXTu51n94ysQhtYoWw== 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=iqanptWECeQyLjllXicBwv87NcxmrTAZk3g0V1SBi58=; b=dJa2U+nSz+2jIcZVUnpzmCv5CyQWMc7s1NGkUzeS8WMdE8XkeuImiiGQJs68xSKDhfdLHGJAnpB8ay2CTSh0pZvxEUC+73U2iF8jFnhMBYRIpDqAqz826Epf1lRJVLQp1652OlqIz+mGCbTfRgG307TXRdVTnErYvp7GpCYYXeyER+bOE7mAK7rlN7t8LiRBJxJ7tC9uig8ts/0T7L8xr8E3Se9BqkPdwYg5CyYkIEnSuKkNzldm+Os1S7BVkw3QfDbWwf/tCOfBJQy1j8IATbz+w6vekFoLMARlYfDtDHp/CFENWxQnQBYRaAwyJPeJidT2guKZ9zdKGeV9hF9nvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=redhat.com 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=iqanptWECeQyLjllXicBwv87NcxmrTAZk3g0V1SBi58=; b=lzbqv3FmFgMFz2UEn8mZe2IZbJ4Wk+MDKdzvRsJZYgRGuIf5flyXrdJqFaougutmcYqJLsQpg+0rhmE3uAj6fL+BrXwJ2fBh+G7VG4bTLOmKrYJ8NGqzNI8w1uVcUs9FETsYHOid6Fjd2RUbDtXiLaMqwFBBIpJBfz3gA0QjqRePERdlHIGhhXiycWmZVLzZDTn0rEUjTYLUSs+xOeuV34bp4fGPtHv6JWkNqKr4NSgcj7rUzK/Iwx1p5hV4hsKdXlfjVxEeYBSLWi4kmeVHqb+P2kcL1SQvNQR2UtQe25C5U2EBUWplw1mS01XZId+rFYuJl53dzb3eSevqmEZB+g== Received: from DM6PR03CA0071.namprd03.prod.outlook.com (2603:10b6:5:100::48) by MWHPR12MB1422.namprd12.prod.outlook.com (2603:10b6:300:10::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.27; Tue, 8 Mar 2022 15:10:53 +0000 Received: from DM6NAM11FT029.eop-nam11.prod.protection.outlook.com (2603:10b6:5:100:cafe::38) by DM6PR03CA0071.outlook.office365.com (2603:10b6:5:100::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Tue, 8 Mar 2022 15:10:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.235) by DM6NAM11FT029.mail.protection.outlook.com (10.13.173.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5038.14 via Frontend Transport; Tue, 8 Mar 2022 15:10:53 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 8 Mar 2022 15:10:52 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail205.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.9; Tue, 8 Mar 2022 07:10:51 -0800 Received: from nvidia.com (10.127.8.11) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.986.9 via Frontend Transport; Tue, 8 Mar 2022 07:10:50 -0800 From: Dmitry Kozlyuk To: CC: Kevin Traynor , Viacheslav Ovsiienko Subject: [PATCH 21.11 2/3] net/mlx5: fix link status change detection Date: Tue, 8 Mar 2022 17:10:43 +0200 Message-ID: <20220308151044.1012413-3-dkozlyuk@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220308151044.1012413-1-dkozlyuk@nvidia.com> References: <20220308151044.1012413-1-dkozlyuk@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92ad5663-fd0b-4349-4d6d-08da0115d6b9 X-MS-TrafficTypeDiagnostic: MWHPR12MB1422:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I0cJEq2IWEHc15kL7qc9CAUN5kV7fZL5+3MjnpC+u3v1t5mubwmKfZ6SJIwKrXsGKedRzoKULURpZKcZ1Z0mAjmGTzDwd1YTQZ6fkL/5hR8OJ1EnTK1bYNh2xtp725dpIRA5OhxpRYz9D5huGNhttboPo6SEtgN9WsBtXFxXCwSuLCaOYXtkE+NRc4vLYIIgfOngwy/tumzTimUXm14Uzwx+DL2m9L/MbvV8YDKRgr+qf5AR45E2q86SZhdw+bpDAIpfzO7IELZCApXpHAbTVeizB8dPR2h9mszNkDIL3EePKu/vt9KdQzrI2SJrqs2DD/sCK3t2V3JCiqM7IxFY0DPo5IyJ24iUWJT114vkefgIkJuF3nNC04V/cyGSC2qCI807n5mqfcpwEDW1dfSShbIBULYHnZSkUffbIhHErARES0++PtzTYuQ/llEXjrKHuOxpJE7xeUFxnNZ9PGOl4dAL1O0lEgLK6iOL90OKneA0Ktv5HPc070YvWqnj59pXa6oZFNXChAqVpDG9YR5c+xsYvFJlCTBKgNyYU/l9KnuVK/numiO54ih9ofzPIaW5h2HjYNCjR/ijLygITMWplb29ONkMDY6K1Qs/29dgCUS4uPd2knjEdvri4cG4dAdlPEQpAUHbX+XPccuUBfYs4mthABMdulweobAqDHTzevy/DsAXdzS3U4lAH3G7O+CWbqt78iVs4WsEYjHPKBMo7Q== X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(82310400004)(508600001)(2906002)(4326008)(54906003)(336012)(107886003)(186003)(426003)(86362001)(26005)(47076005)(83380400001)(6916009)(36756003)(7696005)(6666004)(55016003)(2616005)(36860700001)(1076003)(40460700003)(8676002)(70586007)(5660300002)(70206006)(356005)(8936002)(81166007)(316002)(6286002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2022 15:10:53.3037 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92ad5663-fd0b-4349-4d6d-08da0115d6b9 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.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT029.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1422 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 [ upstream commit 17f95513adca1f4ee5bba305b154ac984ee50cee ] Sometimes net/mlx5 devices did not detect link status change to "up". Each shared device was monitoring IBV_EVENT_PORT_{ACTIVE,ERR} and queried the link status upon receiving the event. IBV_EVENT_PORT_ACTIVE is delivered when the logical link status (UP flag) is set, but the physical link status (RUNNING flag) may be down at that time, in which case the new link status would be erroneously considered down. IBV interface is insufficient for the task. Monitor interface events using Netlink. Fixes: 198a3c339a8f ("mlx5: handle link status interrupts") Signed-off-by: Dmitry Kozlyuk Reviewed-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_ethdev_os.c | 63 ++++++++++++++++++++----- drivers/net/mlx5/linux/mlx5_os.c | 55 +++++++++++++++++++++ drivers/net/mlx5/mlx5.c | 1 + drivers/net/mlx5/mlx5.h | 3 ++ drivers/net/mlx5/mlx5_trigger.c | 12 ++++- 5 files changed, 120 insertions(+), 14 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c index c19825ee52..8fe73f1adb 100644 --- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "mlx5.h" #include "mlx5_rxtx.h" @@ -760,6 +761,56 @@ mlx5_dev_interrupt_device_fatal(struct mlx5_dev_ctx_shared *sh) } } +static void +mlx5_dev_interrupt_nl_cb(struct nlmsghdr *hdr, void *cb_arg) +{ + struct mlx5_dev_ctx_shared *sh = cb_arg; + uint32_t i; + uint32_t if_index; + + if (mlx5_nl_parse_link_status_update(hdr, &if_index) < 0) + return; + for (i = 0; i < sh->max_port; i++) { + struct mlx5_dev_shared_port *port = &sh->port[i]; + struct rte_eth_dev *dev; + struct mlx5_priv *priv; + + if (port->nl_ih_port_id >= RTE_MAX_ETHPORTS) + continue; + dev = &rte_eth_devices[port->nl_ih_port_id]; + /* Probing may initiate an LSC before configuration is done. */ + if (dev->data->dev_configured && + !dev->data->dev_conf.intr_conf.lsc) + break; + priv = dev->data->dev_private; + if (priv->if_index == if_index) { + /* Block logical LSC events. */ + uint16_t prev_status = dev->data->dev_link.link_status; + + if (mlx5_link_update(dev, 0) < 0) + DRV_LOG(ERR, "Failed to update link status: %s", + rte_strerror(rte_errno)); + else if (prev_status != dev->data->dev_link.link_status) + rte_eth_dev_callback_process + (dev, RTE_ETH_EVENT_INTR_LSC, NULL); + break; + } + } +} + +void +mlx5_dev_interrupt_handler_nl(void *arg) +{ + struct mlx5_dev_ctx_shared *sh = arg; + int nlsk_fd = rte_intr_fd_get(sh->intr_handle_nl); + + if (nlsk_fd < 0) + return; + if (mlx5_nl_read_events(nlsk_fd, mlx5_dev_interrupt_nl_cb, sh) < 0) + DRV_LOG(ERR, "Failed to process Netlink events: %s", + rte_strerror(rte_errno)); +} + /** * Handle shared asynchronous events the NIC (removal event * and link status change). Supports multiport IB device. @@ -823,18 +874,6 @@ mlx5_dev_interrupt_handler(void *cb_arg) tmp = sh->port[tmp - 1].ih_port_id; dev = &rte_eth_devices[tmp]; MLX5_ASSERT(dev); - if ((event.event_type == IBV_EVENT_PORT_ACTIVE || - event.event_type == IBV_EVENT_PORT_ERR) && - dev->data->dev_conf.intr_conf.lsc) { - mlx5_glue->ack_async_event(&event); - if (mlx5_link_update(dev, 0) == -EAGAIN) { - usleep(0); - continue; - } - rte_eth_dev_callback_process - (dev, RTE_ETH_EVENT_INTR_LSC, NULL); - continue; - } DRV_LOG(DEBUG, "port %u cannot handle an unknown event (type %d)", dev->data->port_id, event.event_type); diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 540cf5d708..069d5f8807 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2714,6 +2714,40 @@ mlx5_os_net_cleanup(void) mlx5_pmd_socket_uninit(); } +static int +mlx5_os_dev_shared_handler_install_lsc(struct mlx5_dev_ctx_shared *sh) +{ + int nlsk_fd, flags, ret; + + nlsk_fd = mlx5_nl_init(NETLINK_ROUTE, RTMGRP_LINK); + if (nlsk_fd < 0) { + DRV_LOG(ERR, "Failed to create a socket for Netlink events: %s", + rte_strerror(rte_errno)); + return -1; + } + flags = fcntl(nlsk_fd, F_GETFL); + ret = fcntl(nlsk_fd, F_SETFL, flags | O_NONBLOCK); + if (ret != 0) { + DRV_LOG(ERR, "Failed to make Netlink event socket non-blocking: %s", + strerror(errno)); + rte_errno = errno; + goto error; + } + rte_intr_type_set(sh->intr_handle_nl, RTE_INTR_HANDLE_EXT); + rte_intr_fd_set(sh->intr_handle_nl, nlsk_fd); + if (rte_intr_callback_register(sh->intr_handle_nl, + mlx5_dev_interrupt_handler_nl, + sh) != 0) { + DRV_LOG(ERR, "Failed to register Netlink events interrupt"); + rte_intr_fd_set(sh->intr_handle_nl, -1); + goto error; + } + return 0; +error: + close(nlsk_fd); + return -1; +} + /** * Install shared asynchronous device events handler. * This function is implemented to support event sharing @@ -2751,6 +2785,18 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh) rte_intr_fd_set(sh->intr_handle, -1); } } + sh->intr_handle_nl = rte_intr_instance_alloc + (RTE_INTR_INSTANCE_F_SHARED); + if (sh->intr_handle_nl == NULL) { + DRV_LOG(ERR, "Fail to allocate intr_handle"); + rte_errno = ENOMEM; + return; + } + rte_intr_fd_set(sh->intr_handle_nl, -1); + if (mlx5_os_dev_shared_handler_install_lsc(sh) < 0) { + DRV_LOG(INFO, "Fail to install the shared Netlink event handler."); + rte_intr_fd_set(sh->intr_handle_nl, -1); + } if (sh->devx) { #ifdef HAVE_IBV_DEVX_ASYNC sh->intr_handle_devx = @@ -2798,10 +2844,19 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh) void mlx5_os_dev_shared_handler_uninstall(struct mlx5_dev_ctx_shared *sh) { + int nlsk_fd; + if (rte_intr_fd_get(sh->intr_handle) >= 0) mlx5_intr_callback_unregister(sh->intr_handle, mlx5_dev_interrupt_handler, sh); rte_intr_instance_free(sh->intr_handle); + nlsk_fd = rte_intr_fd_get(sh->intr_handle_nl); + if (nlsk_fd >= 0) { + mlx5_intr_callback_unregister + (sh->intr_handle_nl, mlx5_dev_interrupt_handler_nl, sh); + close(nlsk_fd); + } + rte_intr_instance_free(sh->intr_handle_nl); #ifdef HAVE_IBV_DEVX_ASYNC if (rte_intr_fd_get(sh->intr_handle_devx) >= 0) rte_intr_callback_unregister(sh->intr_handle_devx, diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 25d4d2082b..2234dc7563 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1204,6 +1204,7 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn, for (i = 0; i < sh->max_port; i++) { sh->port[i].ih_port_id = RTE_MAX_ETHPORTS; sh->port[i].devx_ih_port_id = RTE_MAX_ETHPORTS; + sh->port[i].nl_ih_port_id = RTE_MAX_ETHPORTS; } if (sh->devx) { sh->td = mlx5_devx_cmd_create_td(sh->cdev->ctx); diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 737ad6895c..da9c8f5086 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -605,6 +605,7 @@ struct mlx5_age_info { struct mlx5_dev_shared_port { uint32_t ih_port_id; uint32_t devx_ih_port_id; + uint32_t nl_ih_port_id; /* * Interrupt handler port_id. Used by shared interrupt * handler to find the corresponding rte_eth device @@ -1203,6 +1204,7 @@ struct mlx5_dev_ctx_shared { /* Shared interrupt handler section. */ struct rte_intr_handle *intr_handle; /* Interrupt handler for device. */ struct rte_intr_handle *intr_handle_devx; /* DEVX interrupt handler. */ + struct rte_intr_handle *intr_handle_nl; /* Netlink interrupt handler. */ void *devx_comp; /* DEVX async comp obj. */ struct mlx5_devx_obj *tis[16]; /* TIS object. */ struct mlx5_devx_obj *td; /* Transport domain. */ @@ -1585,6 +1587,7 @@ int mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); void mlx5_dev_interrupt_handler(void *arg); void mlx5_dev_interrupt_handler_devx(void *arg); +void mlx5_dev_interrupt_handler_nl(void *arg); int mlx5_set_link_down(struct rte_eth_dev *dev); int mlx5_set_link_up(struct rte_eth_dev *dev); int mlx5_is_removed(struct rte_eth_dev *dev); diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 74c9c0a4ff..2ba456ad7a 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -1205,11 +1205,18 @@ mlx5_dev_start(struct rte_eth_dev *dev) priv->sh->port[priv->dev_port - 1].ih_port_id = (uint32_t)dev->data->port_id; } else { - DRV_LOG(INFO, "port %u starts without LSC and RMV interrupts.", + DRV_LOG(INFO, "port %u starts without RMV interrupts.", dev->data->port_id); - dev->data->dev_conf.intr_conf.lsc = 0; dev->data->dev_conf.intr_conf.rmv = 0; } + if (rte_intr_fd_get(priv->sh->intr_handle_nl) >= 0) { + priv->sh->port[priv->dev_port - 1].nl_ih_port_id = + (uint32_t)dev->data->port_id; + } else { + DRV_LOG(INFO, "port %u starts without LSC interrupts.", + dev->data->port_id); + dev->data->dev_conf.intr_conf.lsc = 0; + } if (rte_intr_fd_get(priv->sh->intr_handle_devx) >= 0) priv->sh->port[priv->dev_port - 1].devx_ih_port_id = (uint32_t)dev->data->port_id; @@ -1261,6 +1268,7 @@ mlx5_dev_stop(struct rte_eth_dev *dev) mlx5_rx_intr_vec_disable(dev); priv->sh->port[priv->dev_port - 1].ih_port_id = RTE_MAX_ETHPORTS; priv->sh->port[priv->dev_port - 1].devx_ih_port_id = RTE_MAX_ETHPORTS; + priv->sh->port[priv->dev_port - 1].nl_ih_port_id = RTE_MAX_ETHPORTS; mlx5_txq_stop(dev); mlx5_rxq_stop(dev); if (priv->obj_ops.lb_dummy_queue_release) -- 2.25.1