From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>
Cc: linux-rdma@vger.kernel.org,
Stephen Hemminger <stephen@networkplumber.org>,
Ariel Almog <ariela@mellanox.com>,
Linux Netdev <netdev@vger.kernel.org>,
Leon Romanovsky <leonro@mellanox.com>
Subject: [PATCH rdma-next V2 08/27] RDMA/core: Add and expose static device index
Date: Mon, 3 Jul 2017 09:28:11 +0300 [thread overview]
Message-ID: <20170703062830.30361-9-leon@kernel.org> (raw)
In-Reply-To: <20170703062830.30361-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
This patch adds static device index in similar fashion to
already available in netdev world (struct net->ifindex).
In downstream patches, the RDMA nelink will use this idx-to-ib_device
conversion, so as part of this commit, we are exposing the translation
function to be visible for IB/core users.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/infiniband/core/core_priv.h | 4 ++++
drivers/infiniband/core/device.c | 37 ++++++++++++++++++++++++++++++++++++-
include/rdma/ib_verbs.h | 2 ++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 8cc7a844eb01..8733c26258b2 100644
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -194,4 +194,8 @@ int ib_nl_handle_set_timeout(struct sk_buff *skb,
int ib_nl_handle_ip_res_resp(struct sk_buff *skb,
struct netlink_callback *cb);
+struct ib_device *__ib_device_get_by_index(u32 ifindex);
+/* RDMA device netlink */
+void nldev_init(void);
+void nldev_exit(void);
#endif /* _CORE_PRIV_H */
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 7a799fc90348..7ff65d766d86 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -124,6 +124,17 @@ static int ib_device_check_mandatory(struct ib_device *device)
return 0;
}
+struct ib_device *__ib_device_get_by_index(u32 index)
+{
+ struct ib_device *device;
+
+ list_for_each_entry(device, &device_list, core_list)
+ if (device->index == index)
+ return device;
+
+ return NULL;
+}
+
static struct ib_device *__ib_device_get_by_name(const char *name)
{
struct ib_device *device;
@@ -135,7 +146,6 @@ static struct ib_device *__ib_device_get_by_name(const char *name)
return NULL;
}
-
static int alloc_name(char *name)
{
unsigned long *inuse;
@@ -326,6 +336,30 @@ void ib_get_device_fw_str(struct ib_device *dev, char *str, size_t str_len)
EXPORT_SYMBOL(ib_get_device_fw_str);
/**
+ * __dev_new_index - allocate an device index
+ *
+ * Returns a suitable unique value for a new device interface
+ * number. It assumes that there are less than 2^32-1 ib devices
+ * will be present in the system.
+ */
+static u32 __dev_new_index(void)
+{
+ /*
+ * The device index to allow stable naming.
+ * Similar to struct net -> ifindex.
+ */
+ static u32 index;
+
+ for (;;) {
+ if (!(++index))
+ index = 1;
+
+ if (!__ib_device_get_by_index(index))
+ return index;
+ }
+}
+
+/**
* ib_register_device - Register an IB device with IB core
* @device:Device to register
*
@@ -417,6 +451,7 @@ int ib_register_device(struct ib_device *device,
if (client->add && !add_client_context(device, client))
client->add(device);
+ device->index = __dev_new_index();
down_write(&lists_rwsem);
list_add_tail(&device->core_list, &device_list);
up_write(&lists_rwsem);
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index ba8314ec5768..b73120727d60 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2237,6 +2237,8 @@ struct ib_device {
struct rdmacg_device cg_device;
#endif
+ u32 index;
+
/**
* The following mandatory functions are used only at device
* registration. Keep functions such as these at the end of this
--
2.13.2
next prev parent reply other threads:[~2017-07-03 6:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 6:28 [PATCH rdma-next V2 00/27] RDMA Netlink Device Client Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 02/27] RDMA/netlink: Simplify the put_msg and put_attr Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 03/27] RDMA/netlink: Rename and remove redundant parameter from ibnl_unicast Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 04/27] RDMA/netlink: Rename and remove redundant parameter from ibnl_multicast Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 06/27] RDMA/netlink: Rename netlink callback struct Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 07/27] RDMA/core: Add iterator over ib_devices Leon Romanovsky
2017-07-03 6:28 ` Leon Romanovsky [this message]
2017-07-03 6:28 ` [PATCH rdma-next V2 09/27] RDMA/netlink: Add and implement doit netlink callback Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 10/27] RDMA/netlink: Reduce indirection access to cb_table Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 11/27] RDMA/netlink: Convert LS to doit callback Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 16/27] RDMA/netlink: Add nldev device doit implementation Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 17/27] RDMA/netlink: Add nldev port dumpit implementation Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 18/27] RDMA/netlink: Implement nldev port doit callback Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 20/27] RDMA: Simplify get firmware interface Leon Romanovsky
[not found] ` <20170703062830.30361-21-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-07-17 14:48 ` Dennis Dalessandro
2017-07-03 6:28 ` [PATCH rdma-next V2 21/27] RDMA/netlink: Export FW version Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 22/27] RDMA/netlink: Export node_guid and sys_image_guid Leon Romanovsky
[not found] ` <20170703062830.30361-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-07-03 6:28 ` [PATCH rdma-next V2 01/27] RDMA/netlink: Add flag to consolidate common handing Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 05/27] RDMA/netlink: Simplify and rename ibnl_chk_listeners Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 12/27] RDMA/netlink: Update copyright Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 13/27] RDMA/netlink: Add netlink device definitions to UAPI Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 14/27] RDMA/netlink: Add nldev initialization flows Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 15/27] RDMA/netlink: Implement nldev device dumpit calback Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 19/27] RDMA/netlink: Expose device and port capability masks Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 23/27] RDMA/netlink: Advertise IB subnet prefix Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 27/27] RDMA/netlink: Export node_type Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 24/27] RDMA/netink: Export lids and sm_lids Leon Romanovsky
[not found] ` <20170703062830.30361-25-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-07-17 15:12 ` Dennis Dalessandro
2017-07-03 6:28 ` [PATCH rdma-next V2 25/27] RDMA/netlink: Export LID mask counter (LMC) Leon Romanovsky
2017-07-17 15:14 ` Dennis Dalessandro
2017-07-17 18:32 ` Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 26/27] RDMA/netlink: Provide port state and physical link state Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170703062830.30361-9-leon@kernel.org \
--to=leon@kernel.org \
--cc=ariela@mellanox.com \
--cc=dledford@redhat.com \
--cc=leonro@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).