From: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Subject: [rdma-next v2 14/33] RDMA/core: Add and expose static device index
Date: Thu, 10 Aug 2017 14:08:08 +0300 [thread overview]
Message-ID: <20170810110827.9952-15-leon@kernel.org> (raw)
In-Reply-To: <20170810110827.9952-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
From: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
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-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
drivers/infiniband/core/core_priv.h | 5 +++++
drivers/infiniband/core/device.c | 37 ++++++++++++++++++++++++++++++++++++-
include/rdma/ib_verbs.h | 2 ++
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 0c175590cf92..cbdcc81e1df8 100644
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -309,4 +309,9 @@ static inline int ib_mad_enforce_security(struct ib_mad_agent_private *map,
return 0;
}
#endif
+
+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 8828f26250a8..deae8b940994 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -134,6 +134,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;
@@ -145,7 +156,6 @@ static struct ib_device *__ib_device_get_by_name(const char *name)
return NULL;
}
-
static int alloc_name(char *name)
{
unsigned long *inuse;
@@ -394,6 +404,30 @@ static int ib_security_change(struct notifier_block *nb, unsigned long event,
return NOTIFY_OK;
}
+/**
+ * __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
@@ -492,6 +526,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 1082b4c81b2c..3391df5fdc9c 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2298,6 +2298,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.14.0
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-08-10 11:08 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-10 11:07 [pull request][rdma-next v2 00/33] RDMA netlink refactoring and RDMAtool code Leon Romanovsky
[not found] ` <20170810110827.9952-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-10 11:07 ` [rdma-next v2 01/33] RDMA/core: Add wait/retry version of ibnl_unicast Leon Romanovsky
2017-08-10 11:07 ` [rdma-next v2 02/33] RDMA/netlink: Remove netlink clients infrastructure Leon Romanovsky
2017-08-10 11:07 ` [rdma-next v2 03/33] RDMA/netlink: Remove redundant owner option for netlink callbacks Leon Romanovsky
2017-08-10 11:07 ` [rdma-next v2 04/33] RDMA/netlink: Avoid double pass for RDMA netlink messages Leon Romanovsky
2017-08-10 11:07 ` [rdma-next v2 05/33] RDMA/iwcm: Remove useless check of netlink client validity Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 06/33] RDMA/iwcm: Remove extra EXPORT_SYMBOLS Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 07/33] RDMA/netlink: Add flag to consolidate common handling Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 08/33] RDMA/netlink: Simplify the put_msg and put_attr Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 09/33] RDMA/netlink: Rename and remove redundant parameter from ibnl_unicast* Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 10/33] RDMA/netlink: Rename and remove redundant parameter from ibnl_multicast Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 11/33] RDMA/netlink: Simplify and rename ibnl_chk_listeners Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 12/33] RDMA/netlink: Rename netlink callback struct Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 13/33] RDMA/core: Add iterator over ib_devices Leon Romanovsky
2017-08-10 11:08 ` Leon Romanovsky [this message]
2017-08-10 11:08 ` [rdma-next v2 15/33] RDMA/netlink: Add and implement doit netlink callback Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 16/33] RDMA/netlink: Reduce indirection access to cb_table Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 17/33] RDMA/netlink: Convert LS to doit callback Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 18/33] RDMA/netlink: Update copyright Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 19/33] RDMA/netlink: Add netlink device definitions to UAPI Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 20/33] RDMA/netlink: Add nldev initialization flows Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 21/33] RDMA/netlink: Implement nldev device dumpit calback Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 22/33] RDMA/netlink: Add nldev device doit implementation Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 23/33] RDMA/netlink: Add nldev port dumpit implementation Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 24/33] RDMA/netlink: Implement nldev port doit callback Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 25/33] RDMA/netlink: Expose device and port capability masks Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 26/33] RDMA: Simplify get firmware interface Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 27/33] RDMA/netlink: Export FW version Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 28/33] RDMA/netlink: Export node_guid and sys_image_guid Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 29/33] RDMA/netlink: Advertise IB subnet prefix Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 30/33] RDMA/netink: Export lids and sm_lids Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 31/33] RDMA/netlink: Export LID mask control (LMC) Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 32/33] RDMA/netlink: Provide port state and physical link state Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 33/33] RDMA/netlink: Export node_type Leon Romanovsky
2017-08-11 15:37 ` [pull request][rdma-next v2 00/33] RDMA netlink refactoring and RDMAtool code Doug Ledford
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=20170810110827.9952-15-leon@kernel.org \
--to=leon-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
--cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
--cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.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