diff mbox series

[v2,3/3] RDMA: Report available cdevs through RDMA_NLDEV_CMD_GET_CHARDEV

Message ID 20190614003819.19974-4-jgg@ziepe.ca (mailing list archive)
State Accepted
Headers show
Series Add RDMA_NLDEV_GET_CHARDEV | expand

Commit Message

Jason Gunthorpe June 14, 2019, 12:38 a.m. UTC 
From: Jason Gunthorpe <jgg@mellanox.com>

Update the struct ib_client for all modules exporting cdevs related to the
ibdevice to also implement RDMA_NLDEV_CMD_GET_CHARDEV. All cdevs are now
autoloadable and discoverable by userspace over netlink instead of relying
on sysfs.

uverbs also exposes the DRIVER_ID for drivers that are able to support
driver id binding in rdma-core.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/infiniband/core/device.c             |  3 ++
 drivers/infiniband/core/ucma.c               | 23 +++++++++
 drivers/infiniband/core/user_mad.c           | 51 ++++++++++++++++++--
 drivers/infiniband/core/uverbs_main.c        | 32 +++++++++++-
 drivers/infiniband/hw/cxgb3/iwch_provider.c  |  1 +
 drivers/infiniband/hw/hns/hns_roce_main.c    |  1 +
 drivers/infiniband/hw/mthca/mthca_provider.c |  1 +
 include/rdma/ib_verbs.h                      |  1 +
 include/uapi/rdma/rdma_netlink.h             |  1 +
 9 files changed, 109 insertions(+), 5 deletions(-)

Comments

Leon Romanovsky June 18, 2019, 12:19 p.m. UTC | #1 
On Thu, Jun 13, 2019 at 09:38:19PM -0300, Jason Gunthorpe wrote:
> From: Jason Gunthorpe <jgg@mellanox.com>
>
> Update the struct ib_client for all modules exporting cdevs related to the
> ibdevice to also implement RDMA_NLDEV_CMD_GET_CHARDEV. All cdevs are now
> autoloadable and discoverable by userspace over netlink instead of relying
> on sysfs.
>
> uverbs also exposes the DRIVER_ID for drivers that are able to support
> driver id binding in rdma-core.
>
> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
> Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
> ---
>  drivers/infiniband/core/device.c             |  3 ++
>  drivers/infiniband/core/ucma.c               | 23 +++++++++
>  drivers/infiniband/core/user_mad.c           | 51 ++++++++++++++++++--
>  drivers/infiniband/core/uverbs_main.c        | 32 +++++++++++-
>  drivers/infiniband/hw/cxgb3/iwch_provider.c  |  1 +
>  drivers/infiniband/hw/hns/hns_roce_main.c    |  1 +
>  drivers/infiniband/hw/mthca/mthca_provider.c |  1 +
>  include/rdma/ib_verbs.h                      |  1 +
>  include/uapi/rdma/rdma_netlink.h             |  1 +
>  9 files changed, 109 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
> index 7db8566cdb8904..1de4ae5d5e0ef6 100644
> --- a/drivers/infiniband/core/device.c
> +++ b/drivers/infiniband/core/device.c
> @@ -2428,6 +2428,9 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)
>  	if (ops->uverbs_abi_ver)
>  		dev_ops->uverbs_abi_ver = ops->uverbs_abi_ver;
>
> +	dev_ops->uverbs_no_driver_id_binding |=
> +		ops->uverbs_no_driver_id_binding;
> +
>  	SET_DEVICE_OP(dev_ops, add_gid);
>  	SET_DEVICE_OP(dev_ops, advise_mr);
>  	SET_DEVICE_OP(dev_ops, alloc_dm);
> diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
> index 39823c842202db..0274e9b704be59 100644
> --- a/drivers/infiniband/core/ucma.c
> +++ b/drivers/infiniband/core/ucma.c
> @@ -52,6 +52,8 @@
>  #include <rdma/rdma_cm_ib.h>
>  #include <rdma/ib_addr.h>
>  #include <rdma/ib.h>
> +#include <rdma/rdma_netlink.h>
> +#include "core_priv.h"
>
>  MODULE_AUTHOR("Sean Hefty");
>  MODULE_DESCRIPTION("RDMA Userspace Connection Manager Access");
> @@ -1788,6 +1790,19 @@ static struct miscdevice ucma_misc = {
>  	.fops		= &ucma_fops,
>  };
>
> +static int ucma_get_global_nl_info(struct ib_client_nl_info *res)
> +{
> +	res->abi = RDMA_USER_CM_ABI_VERSION;
> +	res->cdev = ucma_misc.this_device;
> +	return 0;
> +}
> +
> +static struct ib_client rdma_cma_client = {
> +	.name = "rdma_cm",
> +	.get_global_nl_info = ucma_get_global_nl_info,
> +};
> +MODULE_ALIAS_RDMA_CLIENT("rdma_cm");
> +
>  static ssize_t show_abi_version(struct device *dev,
>  				struct device_attribute *attr,
>  				char *buf)
> @@ -1816,7 +1831,14 @@ static int __init ucma_init(void)
>  		ret = -ENOMEM;
>  		goto err2;
>  	}
> +
> +	ret = ib_register_client(&rdma_cma_client);
> +	if (ret)
> +		goto err3;
> +
>  	return 0;
> +err3:
> +	unregister_net_sysctl_table(ucma_ctl_table_hdr);
>  err2:
>  	device_remove_file(ucma_misc.this_device, &dev_attr_abi_version);
>  err1:
> @@ -1826,6 +1848,7 @@ static int __init ucma_init(void)
>
>  static void __exit ucma_cleanup(void)
>  {
> +	ib_unregister_client(&rdma_cma_client);
>  	unregister_net_sysctl_table(ucma_ctl_table_hdr);
>  	device_remove_file(ucma_misc.this_device, &dev_attr_abi_version);
>  	misc_deregister(&ucma_misc);
> diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
> index 671f07ba1fad66..547090b41cfbb7 100644
> --- a/drivers/infiniband/core/user_mad.c
> +++ b/drivers/infiniband/core/user_mad.c
> @@ -54,6 +54,7 @@
>
>  #include <rdma/ib_mad.h>
>  #include <rdma/ib_user_mad.h>
> +#include <rdma/rdma_netlink.h>
>
>  #include "core_priv.h"
>
> @@ -1124,11 +1125,48 @@ static const struct file_operations umad_sm_fops = {
>  	.llseek	 = no_llseek,
>  };
>
> +static int ib_umad_get_nl_info(struct ib_device *ibdev, void *client_data,
> +			       struct ib_client_nl_info *res)
> +{
> +	struct ib_umad_device *umad_dev = client_data;
> +
> +	if (!rdma_is_port_valid(ibdev, res->port))
> +		return -EINVAL;
> +
> +	res->abi = IB_USER_MAD_ABI_VERSION;
> +	res->cdev = &umad_dev->ports[res->port - rdma_start_port(ibdev)].dev;
> +
> +	return 0;
> +}
> +
>  static struct ib_client umad_client = {
>  	.name   = "umad",
>  	.add    = ib_umad_add_one,
> -	.remove = ib_umad_remove_one
> +	.remove = ib_umad_remove_one,
> +	.get_nl_info = ib_umad_get_nl_info,
>  };
> +MODULE_ALIAS_RDMA_CLIENT("umad");
> +
> +static int ib_issm_get_nl_info(struct ib_device *ibdev, void *client_data,
> +			       struct ib_client_nl_info *res)
> +{
> +	struct ib_umad_device *umad_dev =
> +		ib_get_client_data(ibdev, &umad_client);
> +
> +	if (!rdma_is_port_valid(ibdev, res->port))
> +		return -EINVAL;
> +
> +	res->abi = IB_USER_MAD_ABI_VERSION;
> +	res->cdev = &umad_dev->ports[res->port - rdma_start_port(ibdev)].sm_dev;
> +
> +	return 0;
> +}
> +
> +static struct ib_client issm_client = {
> +	.name = "issm",
> +	.get_nl_info = ib_issm_get_nl_info,
> +};
> +MODULE_ALIAS_RDMA_CLIENT("issm");
>
>  static ssize_t ibdev_show(struct device *dev, struct device_attribute *attr,
>  			  char *buf)
> @@ -1387,13 +1425,17 @@ static int __init ib_umad_init(void)
>  	}
>
>  	ret = ib_register_client(&umad_client);
> -	if (ret) {
> -		pr_err("couldn't register ib_umad client\n");
> +	if (ret)
>  		goto out_class;
> -	}
> +
> +	ret = ib_register_client(&issm_client);
> +	if (ret)
> +		goto out_client;
>
>  	return 0;
>
> +out_client:
> +	ib_unregister_client(&umad_client);
>  out_class:
>  	class_unregister(&umad_class);
>
> @@ -1411,6 +1453,7 @@ static int __init ib_umad_init(void)
>
>  static void __exit ib_umad_cleanup(void)
>  {
> +	ib_unregister_client(&issm_client);
>  	ib_unregister_client(&umad_client);
>  	class_unregister(&umad_class);
>  	unregister_chrdev_region(base_umad_dev,
> diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
> index 870b3dd35aac63..11c13c1381cf5c 100644
> --- a/drivers/infiniband/core/uverbs_main.c
> +++ b/drivers/infiniband/core/uverbs_main.c
> @@ -51,6 +51,7 @@
>
>  #include <rdma/ib.h>
>  #include <rdma/uverbs_std_types.h>
> +#include <rdma/rdma_netlink.h>
>
>  #include "uverbs.h"
>  #include "core_priv.h"
> @@ -1148,12 +1149,41 @@ static const struct file_operations uverbs_mmap_fops = {
>  	.compat_ioctl = ib_uverbs_ioctl,
>  };
>
> +static int ib_uverbs_get_nl_info(struct ib_device *ibdev, void *client_data,
> +				 struct ib_client_nl_info *res)
> +{
> +	struct ib_uverbs_device *uverbs_dev = client_data;
> +	int ret;
> +
> +	if (res->port != -1)
> +		return -EINVAL;
> +
> +	res->abi = ibdev->ops.uverbs_abi_ver;
> +	res->cdev = &uverbs_dev->dev;
> +
> +	/*
> +	 * To support DRIVER_ID binding in userspace some of the driver need
> +	 * upgrading to expose their PCI dependent revision information
> +	 * through get_context instead of relying on modalias matching. When
> +	 * the drivers are fixed they can drop this flag.
> +	 */
> +	if (!ibdev->ops.uverbs_no_driver_id_binding) {
> +		ret = nla_put_u32(res->nl_msg, RDMA_NLDEV_ATTR_UVERBS_DRIVER_ID,
> +				  ibdev->ops.driver_id);
> +		if (ret)
> +			return ret;
> +	}
> +	return 0;
> +}
> +
>  static struct ib_client uverbs_client = {
>  	.name   = "uverbs",
>  	.no_kverbs_req = true,
>  	.add    = ib_uverbs_add_one,
> -	.remove = ib_uverbs_remove_one
> +	.remove = ib_uverbs_remove_one,
> +	.get_nl_info = ib_uverbs_get_nl_info,
>  };
> +MODULE_ALIAS_RDMA_CLIENT("uverbs");
>
>  static ssize_t ibdev_show(struct device *device, struct device_attribute *attr,
>  			  char *buf)
> diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
> index acba96f289cc06..810fa96af2e9fd 100644
> --- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
> +++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
> @@ -1230,6 +1230,7 @@ static const struct ib_device_ops iwch_dev_ops = {
>  	.owner = THIS_MODULE,
>  	.driver_id = RDMA_DRIVER_CXGB3,
>  	.uverbs_abi_ver = IWCH_UVERBS_ABI_VERSION,
> +	.uverbs_no_driver_id_binding = 1,
>
>  	.alloc_hw_stats	= iwch_alloc_stats,
>  	.alloc_mr = iwch_alloc_mr,
> diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
> index 3e45b119b0eba7..c0e819ed8c9be9 100644
> --- a/drivers/infiniband/hw/hns/hns_roce_main.c
> +++ b/drivers/infiniband/hw/hns/hns_roce_main.c
> @@ -417,6 +417,7 @@ static const struct ib_device_ops hns_roce_dev_ops = {
>  	.owner = THIS_MODULE,
>  	.driver_id = RDMA_DRIVER_HNS,
>  	.uverbs_abi_ver = 1,
> +	.uverbs_no_driver_id_binding = 1,
>
>  	.add_gid = hns_roce_add_gid,
>  	.alloc_pd = hns_roce_alloc_pd,
> diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
> index efd4e3d13ae22c..d97124bee703d7 100644
> --- a/drivers/infiniband/hw/mthca/mthca_provider.c
> +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
> @@ -1147,6 +1147,7 @@ static const struct ib_device_ops mthca_dev_ops = {
>  	.owner = THIS_MODULE,
>  	.driver_id = RDMA_DRIVER_MTHCA,
>  	.uverbs_abi_ver = MTHCA_UVERBS_ABI_VERSION,
> +	.uverbs_no_driver_id_binding = 1,
>
>  	.alloc_pd = mthca_alloc_pd,
>  	.alloc_ucontext = mthca_alloc_ucontext,
> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index a1265e9ce2d11f..6f09fcc21d7a41 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -2321,6 +2321,7 @@ struct ib_device_ops {
>  	struct module *owner;
>  	enum rdma_driver_id driver_id;
>  	u32 uverbs_abi_ver;
> +	unsigned int uverbs_no_driver_id_binding:1;
>
>  	int (*post_send)(struct ib_qp *qp, const struct ib_send_wr *send_wr,
>  			 const struct ib_send_wr **bad_send_wr);
> diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
> index 9903db21a42c58..b27c02185dcc19 100644
> --- a/include/uapi/rdma/rdma_netlink.h
> +++ b/include/uapi/rdma/rdma_netlink.h
> @@ -504,6 +504,7 @@ enum rdma_nldev_attr {
>  	RDMA_NLDEV_ATTR_CHARDEV_NAME,		/* string */
>  	RDMA_NLDEV_ATTR_CHARDEV_ABI,		/* u64 */
>  	RDMA_NLDEV_ATTR_CHARDEV,		/* u64 */
> +	RDMA_NLDEV_ATTR_UVERBS_DRIVER_ID,       /* u64 */

This should be inside nla_policy too.

Thanks



>
>  	/*
>  	 * Always the end
> --
> 2.21.0
>
Jason Gunthorpe June 18, 2019, 1:01 p.m. UTC | #2 
On Tue, Jun 18, 2019 at 12:19:04PM +0000, Leon Romanovsky wrote:
> > diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
> > index 9903db21a42c58..b27c02185dcc19 100644
> > +++ b/include/uapi/rdma/rdma_netlink.h
> > @@ -504,6 +504,7 @@ enum rdma_nldev_attr {
> >  	RDMA_NLDEV_ATTR_CHARDEV_NAME,		/* string */
> >  	RDMA_NLDEV_ATTR_CHARDEV_ABI,		/* u64 */
> >  	RDMA_NLDEV_ATTR_CHARDEV,		/* u64 */
> > +	RDMA_NLDEV_ATTR_UVERBS_DRIVER_ID,       /* u64 */
> 
> This should be inside nla_policy too.

It is an output, not an input. policy only checks inputs.

Jason
Leon Romanovsky June 18, 2019, 1:04 p.m. UTC | #3 
On Tue, Jun 18, 2019 at 10:01:50AM -0300, Jason Gunthorpe wrote:
> On Tue, Jun 18, 2019 at 12:19:04PM +0000, Leon Romanovsky wrote:
> > > diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
> > > index 9903db21a42c58..b27c02185dcc19 100644
> > > +++ b/include/uapi/rdma/rdma_netlink.h
> > > @@ -504,6 +504,7 @@ enum rdma_nldev_attr {
> > >  	RDMA_NLDEV_ATTR_CHARDEV_NAME,		/* string */
> > >  	RDMA_NLDEV_ATTR_CHARDEV_ABI,		/* u64 */
> > >  	RDMA_NLDEV_ATTR_CHARDEV,		/* u64 */
> > > +	RDMA_NLDEV_ATTR_UVERBS_DRIVER_ID,       /* u64 */
> >
> > This should be inside nla_policy too.
>
> It is an output, not an input. policy only checks inputs.

We are putting in policy everything to ensure that it won't be forgotten
once output field will be used as an input.

Thanks

>
> Jason
Jason Gunthorpe June 18, 2019, 1:09 p.m. UTC | #4 
On Tue, Jun 18, 2019 at 01:04:14PM +0000, Leon Romanovsky wrote:
> On Tue, Jun 18, 2019 at 10:01:50AM -0300, Jason Gunthorpe wrote:
> > On Tue, Jun 18, 2019 at 12:19:04PM +0000, Leon Romanovsky wrote:
> > > > diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
> > > > index 9903db21a42c58..b27c02185dcc19 100644
> > > > +++ b/include/uapi/rdma/rdma_netlink.h
> > > > @@ -504,6 +504,7 @@ enum rdma_nldev_attr {
> > > >  	RDMA_NLDEV_ATTR_CHARDEV_NAME,		/* string */
> > > >  	RDMA_NLDEV_ATTR_CHARDEV_ABI,		/* u64 */
> > > >  	RDMA_NLDEV_ATTR_CHARDEV,		/* u64 */
> > > > +	RDMA_NLDEV_ATTR_UVERBS_DRIVER_ID,       /* u64 */
> > >
> > > This should be inside nla_policy too.
> >
> > It is an output, not an input. policy only checks inputs.
> 
> We are putting in policy everything to ensure that it won't be forgotten
> once output field will be used as an input.

Adding dead never tested code is more likely to just get it wrong..

Jason
Leon Romanovsky June 18, 2019, 1:14 p.m. UTC | #5 
On Tue, Jun 18, 2019 at 10:09:51AM -0300, Jason Gunthorpe wrote:
> On Tue, Jun 18, 2019 at 01:04:14PM +0000, Leon Romanovsky wrote:
> > On Tue, Jun 18, 2019 at 10:01:50AM -0300, Jason Gunthorpe wrote:
> > > On Tue, Jun 18, 2019 at 12:19:04PM +0000, Leon Romanovsky wrote:
> > > > > diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
> > > > > index 9903db21a42c58..b27c02185dcc19 100644
> > > > > +++ b/include/uapi/rdma/rdma_netlink.h
> > > > > @@ -504,6 +504,7 @@ enum rdma_nldev_attr {
> > > > >  	RDMA_NLDEV_ATTR_CHARDEV_NAME,		/* string */
> > > > >  	RDMA_NLDEV_ATTR_CHARDEV_ABI,		/* u64 */
> > > > >  	RDMA_NLDEV_ATTR_CHARDEV,		/* u64 */
> > > > > +	RDMA_NLDEV_ATTR_UVERBS_DRIVER_ID,       /* u64 */
> > > >
> > > > This should be inside nla_policy too.
> > >
> > > It is an output, not an input. policy only checks inputs.
> >
> > We are putting in policy everything to ensure that it won't be forgotten
> > once output field will be used as an input.
>
> Adding dead never tested code is more likely to just get it wrong..

What are you talking? It is addition of extra line in the table, which
will be enforced during first attempt to use it as an input.

Less chances to be broken after.

Thanks

>
> Jason
diff mbox series

Patch

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 7db8566cdb8904..1de4ae5d5e0ef6 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -2428,6 +2428,9 @@  void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)
 	if (ops->uverbs_abi_ver)
 		dev_ops->uverbs_abi_ver = ops->uverbs_abi_ver;
 
+	dev_ops->uverbs_no_driver_id_binding |=
+		ops->uverbs_no_driver_id_binding;
+
 	SET_DEVICE_OP(dev_ops, add_gid);
 	SET_DEVICE_OP(dev_ops, advise_mr);
 	SET_DEVICE_OP(dev_ops, alloc_dm);
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 39823c842202db..0274e9b704be59 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -52,6 +52,8 @@ 
 #include <rdma/rdma_cm_ib.h>
 #include <rdma/ib_addr.h>
 #include <rdma/ib.h>
+#include <rdma/rdma_netlink.h>
+#include "core_priv.h"
 
 MODULE_AUTHOR("Sean Hefty");
 MODULE_DESCRIPTION("RDMA Userspace Connection Manager Access");
@@ -1788,6 +1790,19 @@  static struct miscdevice ucma_misc = {
 	.fops		= &ucma_fops,
 };
 
+static int ucma_get_global_nl_info(struct ib_client_nl_info *res)
+{
+	res->abi = RDMA_USER_CM_ABI_VERSION;
+	res->cdev = ucma_misc.this_device;
+	return 0;
+}
+
+static struct ib_client rdma_cma_client = {
+	.name = "rdma_cm",
+	.get_global_nl_info = ucma_get_global_nl_info,
+};
+MODULE_ALIAS_RDMA_CLIENT("rdma_cm");
+
 static ssize_t show_abi_version(struct device *dev,
 				struct device_attribute *attr,
 				char *buf)
@@ -1816,7 +1831,14 @@  static int __init ucma_init(void)
 		ret = -ENOMEM;
 		goto err2;
 	}
+
+	ret = ib_register_client(&rdma_cma_client);
+	if (ret)
+		goto err3;
+
 	return 0;
+err3:
+	unregister_net_sysctl_table(ucma_ctl_table_hdr);
 err2:
 	device_remove_file(ucma_misc.this_device, &dev_attr_abi_version);
 err1:
@@ -1826,6 +1848,7 @@  static int __init ucma_init(void)
 
 static void __exit ucma_cleanup(void)
 {
+	ib_unregister_client(&rdma_cma_client);
 	unregister_net_sysctl_table(ucma_ctl_table_hdr);
 	device_remove_file(ucma_misc.this_device, &dev_attr_abi_version);
 	misc_deregister(&ucma_misc);
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 671f07ba1fad66..547090b41cfbb7 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -54,6 +54,7 @@ 
 
 #include <rdma/ib_mad.h>
 #include <rdma/ib_user_mad.h>
+#include <rdma/rdma_netlink.h>
 
 #include "core_priv.h"
 
@@ -1124,11 +1125,48 @@  static const struct file_operations umad_sm_fops = {
 	.llseek	 = no_llseek,
 };
 
+static int ib_umad_get_nl_info(struct ib_device *ibdev, void *client_data,
+			       struct ib_client_nl_info *res)
+{
+	struct ib_umad_device *umad_dev = client_data;
+
+	if (!rdma_is_port_valid(ibdev, res->port))
+		return -EINVAL;
+
+	res->abi = IB_USER_MAD_ABI_VERSION;
+	res->cdev = &umad_dev->ports[res->port - rdma_start_port(ibdev)].dev;
+
+	return 0;
+}
+
 static struct ib_client umad_client = {
 	.name   = "umad",
 	.add    = ib_umad_add_one,
-	.remove = ib_umad_remove_one
+	.remove = ib_umad_remove_one,
+	.get_nl_info = ib_umad_get_nl_info,
 };
+MODULE_ALIAS_RDMA_CLIENT("umad");
+
+static int ib_issm_get_nl_info(struct ib_device *ibdev, void *client_data,
+			       struct ib_client_nl_info *res)
+{
+	struct ib_umad_device *umad_dev =
+		ib_get_client_data(ibdev, &umad_client);
+
+	if (!rdma_is_port_valid(ibdev, res->port))
+		return -EINVAL;
+
+	res->abi = IB_USER_MAD_ABI_VERSION;
+	res->cdev = &umad_dev->ports[res->port - rdma_start_port(ibdev)].sm_dev;
+
+	return 0;
+}
+
+static struct ib_client issm_client = {
+	.name = "issm",
+	.get_nl_info = ib_issm_get_nl_info,
+};
+MODULE_ALIAS_RDMA_CLIENT("issm");
 
 static ssize_t ibdev_show(struct device *dev, struct device_attribute *attr,
 			  char *buf)
@@ -1387,13 +1425,17 @@  static int __init ib_umad_init(void)
 	}
 
 	ret = ib_register_client(&umad_client);
-	if (ret) {
-		pr_err("couldn't register ib_umad client\n");
+	if (ret)
 		goto out_class;
-	}
+
+	ret = ib_register_client(&issm_client);
+	if (ret)
+		goto out_client;
 
 	return 0;
 
+out_client:
+	ib_unregister_client(&umad_client);
 out_class:
 	class_unregister(&umad_class);
 
@@ -1411,6 +1453,7 @@  static int __init ib_umad_init(void)
 
 static void __exit ib_umad_cleanup(void)
 {
+	ib_unregister_client(&issm_client);
 	ib_unregister_client(&umad_client);
 	class_unregister(&umad_class);
 	unregister_chrdev_region(base_umad_dev,
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 870b3dd35aac63..11c13c1381cf5c 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -51,6 +51,7 @@ 
 
 #include <rdma/ib.h>
 #include <rdma/uverbs_std_types.h>
+#include <rdma/rdma_netlink.h>
 
 #include "uverbs.h"
 #include "core_priv.h"
@@ -1148,12 +1149,41 @@  static const struct file_operations uverbs_mmap_fops = {
 	.compat_ioctl = ib_uverbs_ioctl,
 };
 
+static int ib_uverbs_get_nl_info(struct ib_device *ibdev, void *client_data,
+				 struct ib_client_nl_info *res)
+{
+	struct ib_uverbs_device *uverbs_dev = client_data;
+	int ret;
+
+	if (res->port != -1)
+		return -EINVAL;
+
+	res->abi = ibdev->ops.uverbs_abi_ver;
+	res->cdev = &uverbs_dev->dev;
+
+	/*
+	 * To support DRIVER_ID binding in userspace some of the driver need
+	 * upgrading to expose their PCI dependent revision information
+	 * through get_context instead of relying on modalias matching. When
+	 * the drivers are fixed they can drop this flag.
+	 */
+	if (!ibdev->ops.uverbs_no_driver_id_binding) {
+		ret = nla_put_u32(res->nl_msg, RDMA_NLDEV_ATTR_UVERBS_DRIVER_ID,
+				  ibdev->ops.driver_id);
+		if (ret)
+			return ret;
+	}
+	return 0;
+}
+
 static struct ib_client uverbs_client = {
 	.name   = "uverbs",
 	.no_kverbs_req = true,
 	.add    = ib_uverbs_add_one,
-	.remove = ib_uverbs_remove_one
+	.remove = ib_uverbs_remove_one,
+	.get_nl_info = ib_uverbs_get_nl_info,
 };
+MODULE_ALIAS_RDMA_CLIENT("uverbs");
 
 static ssize_t ibdev_show(struct device *device, struct device_attribute *attr,
 			  char *buf)
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index acba96f289cc06..810fa96af2e9fd 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -1230,6 +1230,7 @@  static const struct ib_device_ops iwch_dev_ops = {
 	.owner = THIS_MODULE,
 	.driver_id = RDMA_DRIVER_CXGB3,
 	.uverbs_abi_ver = IWCH_UVERBS_ABI_VERSION,
+	.uverbs_no_driver_id_binding = 1,
 
 	.alloc_hw_stats	= iwch_alloc_stats,
 	.alloc_mr = iwch_alloc_mr,
diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index 3e45b119b0eba7..c0e819ed8c9be9 100644
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -417,6 +417,7 @@  static const struct ib_device_ops hns_roce_dev_ops = {
 	.owner = THIS_MODULE,
 	.driver_id = RDMA_DRIVER_HNS,
 	.uverbs_abi_ver = 1,
+	.uverbs_no_driver_id_binding = 1,
 
 	.add_gid = hns_roce_add_gid,
 	.alloc_pd = hns_roce_alloc_pd,
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index efd4e3d13ae22c..d97124bee703d7 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -1147,6 +1147,7 @@  static const struct ib_device_ops mthca_dev_ops = {
 	.owner = THIS_MODULE,
 	.driver_id = RDMA_DRIVER_MTHCA,
 	.uverbs_abi_ver = MTHCA_UVERBS_ABI_VERSION,
+	.uverbs_no_driver_id_binding = 1,
 
 	.alloc_pd = mthca_alloc_pd,
 	.alloc_ucontext = mthca_alloc_ucontext,
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index a1265e9ce2d11f..6f09fcc21d7a41 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2321,6 +2321,7 @@  struct ib_device_ops {
 	struct module *owner;
 	enum rdma_driver_id driver_id;
 	u32 uverbs_abi_ver;
+	unsigned int uverbs_no_driver_id_binding:1;
 
 	int (*post_send)(struct ib_qp *qp, const struct ib_send_wr *send_wr,
 			 const struct ib_send_wr **bad_send_wr);
diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
index 9903db21a42c58..b27c02185dcc19 100644
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -504,6 +504,7 @@  enum rdma_nldev_attr {
 	RDMA_NLDEV_ATTR_CHARDEV_NAME,		/* string */
 	RDMA_NLDEV_ATTR_CHARDEV_ABI,		/* u64 */
 	RDMA_NLDEV_ATTR_CHARDEV,		/* u64 */
+	RDMA_NLDEV_ATTR_UVERBS_DRIVER_ID,       /* u64 */
 
 	/*
 	 * Always the end