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 77FE2A0093 for ; Fri, 11 Mar 2022 08:49:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6996740F35; Fri, 11 Mar 2022 08:49:43 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2061.outbound.protection.outlook.com [40.107.93.61]) by mails.dpdk.org (Postfix) with ESMTP id D4CB640F35 for ; Fri, 11 Mar 2022 08:49:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MF8J4kn7r/oKoz6uCFoQZUZfWRlSs2YiyHHMYiYvxBDr06G5V8JSwA1Hnhu43zojHo8t8+g6+uMoigAI8CAGNWD3D9AOVoiIv9B7A9G+f9hvHpuzGwRL5INQgCgiFrX36nHutC2Zy+V/xmEImiUpTUb9ydEDJ7n6dg5uXVxzePqA+mVP3BQ2W6nXcd42LriJLNyBLaC80R13WN2cSxudpOtxnMTEQtLmjB5PhVlb5eqxyN+1OGrPRvt7xZiMtBEKD6BakN+Ew4XsoXW/5HVgvBQHWLHwmp9QoHl3aFpb+WIelT8ktl67ICtbRh+JQlXV/wJ+ENmV3nn2hMojhlKd4Q== 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=HLK9jqg7nTjl24k5+QRMXwZmWIJk7/luArI7C3B0MTg=; b=e30XqL8p7en2H19gi7kZH8rtNzphwHc1vPQnMjKQQJ8m7jvZq0bdYPPgbCkyiBNjFpTdYJCJBLBhz7uw3JrSCKAKvkTjH/lqcpy9oc6XtLXKqaTKaX/QBmGGRBFUK0H/+WsxowXBqYuZx8SOHsyf4L6bNEzZPxaUxVxq3dyNTq53VmGSKp5eR45734EzFHOndHEVpr6CgHbg16scYNk4PDkRQXSsXiMmn983fV31UjoPdmUFEBUr+f8wl4kpfKk5dxigmmwEd7TuZVs2BL4/aZrbYzNg/Gre+Pc7AMlU9NmB5w/GAvnc6xNUZZKfK14/Z6SK0tobE+3feRXhDWGr2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=debian.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=HLK9jqg7nTjl24k5+QRMXwZmWIJk7/luArI7C3B0MTg=; b=WIAn/S6ech44koRxkTtbRYTDFiqyrieEwmgZwdkNgtYJFrRcCnJIf6stV3ecOpOqjAKwWXnbwjbV8pf8gqMWrzMtObmIenkE3DLL4sBa/IBl4JZBQxbtpCTUgjkLGL2xStrqTFOobzZFMQsZrxWTzFpOFXw0WT54QJJeG4pK/No/erYo6Y/wfJvyWSjh1CX2+JRKylCALTzFrfawbz7kwLwRJ8TjvnEyPUac5KCwywYwvad389gKSY+MSIF/dM+/EN+KsvcbP33jenr1O/moaq8S1veBQSYHSSZe6Rhq4CQs/IQRFRlp+NTc8rSXWUwlqMM8qhTH3kcoN8fbuPi21A== Received: from MW4PR04CA0080.namprd04.prod.outlook.com (2603:10b6:303:6b::25) by MWHPR12MB1792.namprd12.prod.outlook.com (2603:10b6:300:114::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.27; Fri, 11 Mar 2022 07:49:39 +0000 Received: from CO1NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6b:cafe::65) by MW4PR04CA0080.outlook.office365.com (2603:10b6:303:6b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.20 via Frontend Transport; Fri, 11 Mar 2022 07:49:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) 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.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.234) by CO1NAM11FT059.mail.protection.outlook.com (10.13.174.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5061.22 via Frontend Transport; Fri, 11 Mar 2022 07:49:39 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Fri, 11 Mar 2022 07:49:38 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.22; Thu, 10 Mar 2022 23:49:37 -0800 Received: from nvidia.com (10.127.8.11) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.22 via Frontend Transport; Thu, 10 Mar 2022 23:49:36 -0800 From: Dmitry Kozlyuk To: CC: Luca Boccassi Subject: [PATCH 20.11 1/3] common/mlx5: add Netlink event helpers Date: Fri, 11 Mar 2022 09:49:31 +0200 Message-ID: <20220311074933.1194679-2-dkozlyuk@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220311074933.1194679-1-dkozlyuk@nvidia.com> References: <20220311074933.1194679-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: f788e03a-e9d0-4369-8cf7-08da0333b231 X-MS-TrafficTypeDiagnostic: MWHPR12MB1792: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: BFGd+9flP21Vk69XYeBoT4boh+Wer0l52MHoir5JVvGhtqKZKElczou9j5IOpByZE4JslPU7xggB55yw43pxjJAG9WkIPXZV9LBlz4zGxBdiyhdlWHbarDt1cqjX7kSd5nRC9Dxk+vBxkYc2wpqAqr9Xj490JUq7rg9Bb69upheiQ/jLd/iNUHUuRJv9h1mKz9TmcbStsHNl39BUDxQ0BMenN+bWgciQ+JRP8cqOo2OxlLytJ1XMfSEAgr8W/ls9kN9MYTfcMJj/ol5sNBpc18fb5XadqBEKya3mdvOqNsyt12PxwazuwYv3UyJg1jnDZDnOYmn16P8HlMRPU0Y4bgyO3G6oSsbTCVMkrUH0UowydXJguJlMQovqHhqQJCiO2eXctJRqrwpe28SFckFv/DLxEdwITLt7yy3FFGcxYHhcNOsl6iDfH99dgH8X2DYldEgFunY528X7h91UL085HmO0VJ5EyovGpzXyYUDpku8pDabt+9eykmOlCM1KHS86s6ThUdevRMJqdPb08BvV53sBl1x9b1se0pd8JjlThDsgPVlJ7AhME6cfWIGu4qnLQTOFDtyE0nFZaEKNdB2xvm7vu4kXAUImUhNXtJp8ZCdC4w1Xegj8uyPPcHSurLlrg+3K2tNjUZsrkj3yslvAwHInX/G8Eeee0d2WN5Vfw49A2R0STslh7eOCja3OviBWuL0BsXTQ3X8o4ZT3+0Fh6+whSZPiezYNkej/Ivj9tt8= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(47076005)(6286002)(2906002)(55016003)(7696005)(36860700001)(82310400004)(70206006)(70586007)(8676002)(4326008)(508600001)(40460700003)(81166007)(356005)(316002)(6666004)(86362001)(6916009)(83380400001)(5660300002)(1076003)(186003)(2616005)(36756003)(8936002)(26005)(426003)(336012)(36900700001)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2022 07:49:39.2903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f788e03a-e9d0-4369-8cf7-08da0333b231 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.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1792 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 be66461cba371c3138ce942eb9fe5657f9e9a446 ] Introduce mlx5_nl_read_events() to read Netlink events (technically, messages) from a socket that was configured to listen for them via a new mlx5_nl_init() parameter. Add mlx5_nl_parse_link_status_update() helper to extract information from link-related events. This patch is a shared base for later fixes. Signed-off-by: Dmitry Kozlyuk --- drivers/common/mlx5/linux/mlx5_nl.c | 105 +++++++++++++++++++++++++- drivers/common/mlx5/linux/mlx5_nl.h | 8 +- drivers/common/mlx5/version.map | 3 + drivers/net/mlx5/linux/mlx5_os.c | 8 +- drivers/net/mlx5/linux/mlx5_vlan_os.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- 6 files changed, 120 insertions(+), 8 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_nl.c b/drivers/common/mlx5/linux/mlx5_nl.c index 145e354b2c..15a5f7b303 100644 --- a/drivers/common/mlx5/linux/mlx5_nl.c +++ b/drivers/common/mlx5/linux/mlx5_nl.c @@ -180,19 +180,22 @@ uint32_t atomic_sn; * * @param protocol * Netlink protocol (e.g. NETLINK_ROUTE, NETLINK_RDMA). + * @param groups + * Groups to listen (e.g. RTMGRP_LINK), can be 0. * * @return * A file descriptor on success, a negative errno value otherwise and * rte_errno is set. */ int -mlx5_nl_init(int protocol) +mlx5_nl_init(int protocol, int groups) { int fd; int buf_size; socklen_t opt_size; struct sockaddr_nl local = { .nl_family = AF_NETLINK, + .nl_groups = groups, }; int ret; @@ -1798,3 +1801,103 @@ mlx5_nl_enable_roce_set(int nlsk_fd, int family_id, const char *pci_addr, /* Now, need to reload the driver. */ return mlx5_nl_driver_reload(nlsk_fd, family_id, pci_addr); } + +/** + * Try to parse a Netlink message as a link status update. + * + * @param hdr + * Netlink message header. + * @param[out] ifindex + * Index of the updated interface. + * @param[out] flags + * New interface flags. + * + * @return + * 0 on success, negative on failure. + */ +int +mlx5_nl_parse_link_status_update(struct nlmsghdr *hdr, uint32_t *ifindex) +{ + struct ifinfomsg *info; + + switch (hdr->nlmsg_type) { + case RTM_NEWLINK: + case RTM_DELLINK: + case RTM_GETLINK: + case RTM_SETLINK: + info = NLMSG_DATA(hdr); + *ifindex = info->ifi_index; + return 0; + } + return -1; +} + +/** + * Read pending events from a Netlink socket. + * + * @param nlsk_fd + * Netlink socket. + * @param cb + * Callback invoked for each of the events. + * @param cb_arg + * User data for the callback. + * + * @return + * 0 on success, including the case when there are no events. + * Negative on failure and rte_errno is set. + */ +int +mlx5_nl_read_events(int nlsk_fd, mlx5_nl_event_cb *cb, void *cb_arg) +{ + char buf[8192]; + struct sockaddr_nl addr; + struct iovec iov = { + .iov_base = buf, + .iov_len = sizeof(buf), + }; + struct msghdr msg = { + .msg_name = &addr, + .msg_namelen = sizeof(addr), + .msg_iov = &iov, + .msg_iovlen = 1, + }; + struct nlmsghdr *hdr; + ssize_t size; + + while (1) { + size = recvmsg(nlsk_fd, &msg, MSG_DONTWAIT); + if (size < 0) { + if (errno == EAGAIN) + return 0; + if (errno == EINTR) + continue; + DRV_LOG(DEBUG, "Failed to receive netlink message: %s", + strerror(errno)); + rte_errno = errno; + return -rte_errno; + + } + hdr = (struct nlmsghdr *)buf; + while (size >= (ssize_t)sizeof(*hdr)) { + ssize_t msg_len = hdr->nlmsg_len; + ssize_t data_len = msg_len - sizeof(*hdr); + ssize_t aligned_len; + + if (data_len < 0) { + DRV_LOG(DEBUG, "Netlink message too short"); + rte_errno = EINVAL; + return -rte_errno; + } + aligned_len = NLMSG_ALIGN(msg_len); + if (aligned_len > size) { + DRV_LOG(DEBUG, "Netlink message too long"); + rte_errno = EINVAL; + return -rte_errno; + } + cb(hdr, cb_arg); + hdr = RTE_PTR_ADD(hdr, aligned_len); + size -= aligned_len; + } + } + return 0; +} diff --git a/drivers/common/mlx5/linux/mlx5_nl.h b/drivers/common/mlx5/linux/mlx5_nl.h index 15129ffdc8..05189e997a 100644 --- a/drivers/common/mlx5/linux/mlx5_nl.h +++ b/drivers/common/mlx5/linux/mlx5_nl.h @@ -11,6 +11,7 @@ #include "mlx5_common.h" +typedef void (mlx5_nl_event_cb)(struct nlmsghdr *hdr, void *user_data); /* VLAN netdev for VLAN workaround. */ struct mlx5_nl_vlan_dev { @@ -30,7 +31,7 @@ struct mlx5_nl_vlan_vmwa_context { }; __rte_internal -int mlx5_nl_init(int protocol); +int mlx5_nl_init(int protocol, int groups); __rte_internal int mlx5_nl_mac_addr_add(int nlsk_fd, unsigned int iface_idx, uint64_t *mac_own, struct rte_ether_addr *mac, uint32_t index); @@ -77,4 +78,9 @@ __rte_internal int mlx5_nl_enable_roce_set(int nlsk_fd, int family_id, const char *pci_addr, int enable); +__rte_internal +int mlx5_nl_read_events(int nlsk_fd, mlx5_nl_event_cb *cb, void *cb_arg); +__rte_internal +int mlx5_nl_parse_link_status_update(struct nlmsghdr *hdr, uint32_t *ifindex); + #endif /* RTE_PMD_MLX5_NL_H_ */ diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map index 983714a82c..6c9956c8f1 100644 --- a/drivers/common/mlx5/version.map +++ b/drivers/common/mlx5/version.map @@ -103,4 +103,7 @@ INTERNAL { mlx5_free; mlx5_pci_driver_register; + + mlx5_nl_parse_link_status_update; + mlx5_nl_read_events; }; diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index aa66879d74..b3a5a8d3c7 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1002,8 +1002,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, priv->pci_dev = spawn->pci_dev; priv->mtu = RTE_ETHER_MTU; /* Some internal functions rely on Netlink sockets, open them now. */ - priv->nl_socket_rdma = mlx5_nl_init(NETLINK_RDMA); - priv->nl_socket_route = mlx5_nl_init(NETLINK_ROUTE); + priv->nl_socket_rdma = mlx5_nl_init(NETLINK_RDMA, 0); + priv->nl_socket_route = mlx5_nl_init(NETLINK_ROUTE, 0); priv->representor = !!switch_info->representor; priv->master = !!switch_info->master; priv->domain_id = RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID; @@ -1877,8 +1877,8 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, * matching ones, gathering into the list. */ struct ibv_device *ibv_match[ret + 1]; - int nl_route = mlx5_nl_init(NETLINK_ROUTE); - int nl_rdma = mlx5_nl_init(NETLINK_RDMA); + int nl_route = mlx5_nl_init(NETLINK_ROUTE, 0); + int nl_rdma = mlx5_nl_init(NETLINK_RDMA, 0); unsigned int i; while (ret-- > 0) { diff --git a/drivers/net/mlx5/linux/mlx5_vlan_os.c b/drivers/net/mlx5/linux/mlx5_vlan_os.c index 40e895e080..598026c414 100644 --- a/drivers/net/mlx5/linux/mlx5_vlan_os.c +++ b/drivers/net/mlx5/linux/mlx5_vlan_os.c @@ -136,7 +136,7 @@ mlx5_vlan_vmwa_init(struct rte_eth_dev *dev, uint32_t ifindex) return NULL; } rte_spinlock_init(&vmwa->sl); - vmwa->nl_socket = mlx5_nl_init(NETLINK_ROUTE); + vmwa->nl_socket = mlx5_nl_init(NETLINK_ROUTE, 0); if (vmwa->nl_socket < 0) { DRV_LOG(WARNING, "Can not create Netlink socket" diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c index 06e602e72a..6519b9c9ac 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c @@ -504,7 +504,7 @@ mlx5_vdpa_get_ib_device_match(struct rte_pci_addr *addr) static int mlx5_vdpa_nl_roce_disable(const char *addr) { - int nlsk_fd = mlx5_nl_init(NETLINK_GENERIC); + int nlsk_fd = mlx5_nl_init(NETLINK_GENERIC, 0); int devlink_id; int enable; int ret; -- 2.25.1