From patchwork Thu Jan 16 04:10:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weihang Li X-Patchwork-Id: 11336001 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF9DF138D for ; Thu, 16 Jan 2020 04:14:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 986D222522 for ; Thu, 16 Jan 2020 04:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729285AbgAPEOn (ORCPT ); Wed, 15 Jan 2020 23:14:43 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:50774 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729551AbgAPEOm (ORCPT ); Wed, 15 Jan 2020 23:14:42 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 7B93B23ADE1E1A54A310; Thu, 16 Jan 2020 12:14:39 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.439.0; Thu, 16 Jan 2020 12:14:33 +0800 From: Weihang Li To: , CC: , , , , , , Subject: [PATCH RFC for-next 1/6] RDMA/core: support deliver net device event Date: Thu, 16 Jan 2020 12:10:42 +0800 Message-ID: <1579147847-12158-2-git-send-email-liweihang@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1579147847-12158-1-git-send-email-liweihang@huawei.com> References: <1579147847-12158-1-git-send-email-liweihang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-CFilter-Loop: Reflected Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Lang Cheng For the process of handling the link event of the net device, the driver of each provider is similar, so it can be integrated into the ib_core for unified processing. Signed-off-by: Lang Cheng Signed-off-by: Weihang Li --- drivers/infiniband/core/cache.c | 21 ++++++- drivers/infiniband/core/device.c | 123 +++++++++++++++++++++++++++++++++++++++ include/rdma/ib_cache.h | 13 +++++ include/rdma/ib_verbs.h | 8 +++ 4 files changed, 164 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c index 17bfedd..791e965 100644 --- a/drivers/infiniband/core/cache.c +++ b/drivers/infiniband/core/cache.c @@ -1174,6 +1174,23 @@ int ib_get_cached_port_state(struct ib_device *device, } EXPORT_SYMBOL(ib_get_cached_port_state); +int ib_get_cached_port_event_flags(struct ib_device *device, + u8 port_num, + enum ib_port_flags *event_flags) +{ + unsigned long flags; + + if (!rdma_is_port_valid(device, port_num)) + return -EINVAL; + + read_lock_irqsave(&device->cache_lock, flags); + *event_flags = device->port_data[port_num].cache.port_event_flags; + read_unlock_irqrestore(&device->cache_lock, flags); + + return 0; +} +EXPORT_SYMBOL(ib_get_cached_port_event_flags); + /** * rdma_get_gid_attr - Returns GID attributes for a port of a device * at a requested gid_index, if a valid GID entry exists. @@ -1391,7 +1408,7 @@ ib_cache_update(struct ib_device *device, u8 port, bool enforce_security) if (!rdma_is_port_valid(device, port)) return -EINVAL; - tprops = kmalloc(sizeof *tprops, GFP_KERNEL); + tprops = kzalloc(sizeof(*tprops), GFP_KERNEL); if (!tprops) return -ENOMEM; @@ -1435,6 +1452,8 @@ ib_cache_update(struct ib_device *device, u8 port, bool enforce_security) device->port_data[port].cache.pkey = pkey_cache; device->port_data[port].cache.lmc = tprops->lmc; device->port_data[port].cache.port_state = tprops->state; + device->port_data[port].cache.port_event_flags = + tprops->port_event_flags; device->port_data[port].cache.subnet_prefix = tprops->subnet_prefix; write_unlock_irq(&device->cache_lock); diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index f6c2552..f03d6ce 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -1325,6 +1325,77 @@ static int enable_device_and_get(struct ib_device *device) return ret; } +unsigned int ib_query_ndev_port_num(struct ib_device *device, + struct net_device *netdev) +{ + unsigned int port_num; + + rdma_for_each_port(device, port_num) + if (netdev == device->port_data[port_num].netdev) + break; + + return port_num; +} +EXPORT_SYMBOL(ib_query_ndev_port_num); + +static inline enum ib_port_state get_port_state(struct net_device *netdev) +{ + return (netif_running(netdev) && netif_carrier_ok(netdev)) ? + IB_PORT_ACTIVE : IB_PORT_DOWN; +} + +static int ib_netdev_event(struct notifier_block *this, + unsigned long event, void *ptr) +{ + struct ib_device *device = container_of(this, struct ib_device, nb); + struct net_device *netdev = netdev_notifier_info_to_dev(ptr); + + switch (event) { + case NETDEV_CHANGE: + case NETDEV_UP: + case NETDEV_DOWN: { + unsigned int port_num = ib_query_ndev_port_num(device, netdev); + enum ib_port_state last_state; + enum ib_port_state curr_state; + struct ib_event ibev; + enum ib_port_flags flags; + + if (ib_get_cached_port_event_flags(device, port_num, &flags)) + return NOTIFY_DONE; + + if (flags & IB_PORT_BONDING_SLAVE) + goto done; + + if (ib_get_cached_port_state(device, port_num, &last_state)) + return NOTIFY_DONE; + + curr_state = get_port_state(netdev); + + if (last_state == curr_state) + goto done; + + ibev.device = device; + if (curr_state == IB_PORT_DOWN) + ibev.event = IB_EVENT_PORT_ERR; + else if (curr_state == IB_PORT_ACTIVE) + ibev.event = IB_EVENT_PORT_ACTIVE; + else + goto done; + + ibev.element.port_num = port_num; + ib_dispatch_event(&ibev); + dev_dbg(&device->dev, + "core send %s\n", ib_event_msg(ibev.event)); + break; + } + + default: + break; + } +done: + return NOTIFY_DONE; +} + /** * ib_register_device - Register an IB device with IB core * @device: Device to register @@ -1342,6 +1413,7 @@ static int enable_device_and_get(struct ib_device *device) */ int ib_register_device(struct ib_device *device, const char *name) { + unsigned int port; int ret; ret = assign_name(device, name); @@ -1406,6 +1478,34 @@ int ib_register_device(struct ib_device *device, const char *name) } ib_device_put(device); + device->nb.notifier_call = ib_netdev_event; + ret = register_netdevice_notifier(&device->nb); + if (ret) { + device->nb.notifier_call = NULL; + return ret; + } + + rdma_for_each_port(device, port) { + struct ib_event event; + struct net_device *netdev = ib_device_get_netdev(device, port); + enum ib_port_flags flags; + + if (ib_get_cached_port_event_flags(device, port, &flags)) + continue; + + if (flags & IB_PORT_BONDING_SLAVE) + continue; + + if (get_port_state(netdev) == IB_PORT_ACTIVE) { + event.device = device; + event.event = IB_EVENT_PORT_ACTIVE; + event.element.port_num = port; + ib_dispatch_event(&event); + dev_dbg(&device->dev, "init event %s\n", + ib_event_msg(event.event)); + } + } + return 0; dev_cleanup: @@ -1470,6 +1570,29 @@ static void __ib_unregister_device(struct ib_device *ib_dev) */ void ib_unregister_device(struct ib_device *ib_dev) { + unsigned int port; + + unregister_netdevice_notifier(&ib_dev->nb); + + rdma_for_each_port(ib_dev, port) { + struct net_device *netdev = ib_device_get_netdev(ib_dev, port); + struct ib_event event; + u32 flags; + + if (ib_get_cached_port_event_flags(ib_dev, port, &flags)) + continue; + + if (flags) + continue; + + if (get_port_state(netdev) == IB_PORT_ACTIVE) { + event.device = ib_dev; + event.event = IB_EVENT_PORT_ERR; + event.element.port_num = port; + ib_dispatch_event(&event); + } + } + get_device(&ib_dev->dev); __ib_unregister_device(ib_dev); put_device(&ib_dev->dev); diff --git a/include/rdma/ib_cache.h b/include/rdma/ib_cache.h index 870b5e6..f37f667 100644 --- a/include/rdma/ib_cache.h +++ b/include/rdma/ib_cache.h @@ -131,6 +131,19 @@ int ib_get_cached_port_state(struct ib_device *device, u8 port_num, enum ib_port_state *port_active); +/** + * ib_get_cached_port_event_flags - Returns a cached port event flags + * @device: The device to query. + * @port_num: The port number of the device to query. + * @event_flags: port_state for the specified port for that device. + * + * ib_get_cached_port_event_flags() fetches the specified event flags stored in + * the local software cache. + */ +int ib_get_cached_port_event_flags(struct ib_device *device, + u8 port_num, + enum ib_port_flags *event_flags); + bool rdma_is_zero_gid(const union ib_gid *gid); const struct ib_gid_attr *rdma_get_gid_attr(struct ib_device *device, u8 port_num, int index); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index d8031f6..ce88d0b 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -670,6 +670,7 @@ struct ib_port_attr { u8 active_speed; u8 phys_state; u16 port_cap_flags2; + u32 port_event_flags; }; enum ib_device_modify_flags { @@ -2149,12 +2150,18 @@ enum ib_mad_result { IB_MAD_RESULT_CONSUMED = 1 << 2 /* Packet consumed: stop processing */ }; +enum ib_port_flags { + IB_PORT_NORMAL = 0, /* normarl port */ + IB_PORT_BONDING_SLAVE = 1 << 0, /* rdma bonding slave port */ +}; + struct ib_port_cache { u64 subnet_prefix; struct ib_pkey_cache *pkey; struct ib_gid_table *gid; u8 lmc; enum ib_port_state port_state; + enum ib_port_flags port_event_flags; }; struct ib_port_immutable { @@ -2706,6 +2713,7 @@ struct ib_device { /* Used by iWarp CM */ char iw_ifname[IFNAMSIZ]; u32 iw_driver_flags; + struct notifier_block nb; }; struct ib_client_nl_info;