From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>
Cc: linux-rdma@vger.kernel.org,
Chien Tin Tung <chien.tin.tung@intel.com>,
Steve Wise <swise@opengridcomputing.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
Jiri Pirko <jiri@mellanox.com>, Ariel Almog <ariela@mellanox.com>,
Linux Netdev <netdev@vger.kernel.org>,
Leon Romanovsky <leonro@mellanox.com>
Subject: [PATCH rdma-next V1 19/19] RDMA/netlink: Expose device and port capability masks
Date: Thu, 22 Jun 2017 16:24:34 +0300 [thread overview]
Message-ID: <20170622132434.1327-20-leon@kernel.org> (raw)
In-Reply-To: <20170622132434.1327-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
The port capability mask is exposed to user space via sysfs interface,
while device capabilities are available for verbs only.
This patch provides those capabilities through netlink interface.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
---
drivers/infiniband/core/nldev.c | 19 +++++++++++++++++++
include/uapi/rdma/rdma_netlink.h | 5 +++++
2 files changed, 24 insertions(+)
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 2489ad9d9211..75416f9f7747 100644
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -50,18 +50,37 @@ static int fill_dev_info(struct sk_buff *msg, struct ib_device *device)
return -EMSGSIZE;
if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PORT_INDEX, rdma_end_port(device)))
return -EMSGSIZE;
+
+ BUILD_BUG_ON(sizeof(device->attrs.device_cap_flags) != sizeof(u64));
+ if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_CAP_FLAGS,
+ device->attrs.device_cap_flags, 0))
+ return -EMSGSIZE;
+
return 0;
}
static int fill_port_info(struct sk_buff *msg,
struct ib_device *device, u32 port)
{
+ struct ib_port_attr attr;
+ int ret;
+
if (nla_put_u32(msg, RDMA_NLDEV_ATTR_DEV_INDEX, device->index))
return -EMSGSIZE;
if (nla_put_string(msg, RDMA_NLDEV_ATTR_DEV_NAME, device->name))
return -EMSGSIZE;
if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PORT_INDEX, port))
return -EMSGSIZE;
+
+ ret = ib_query_port(device, port, &attr);
+ if (ret)
+ return ret;
+
+ BUILD_BUG_ON(sizeof(attr.port_cap_flags) > sizeof(u64));
+ if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_CAP_FLAGS,
+ (u64)attr.port_cap_flags, 0))
+ return -EMSGSIZE;
+
return 0;
}
diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
index 1d064fedfa9a..8fc5278d07d6 100644
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -257,6 +257,11 @@ enum rdma_nldev_attr {
*/
RDMA_NLDEV_ATTR_PORT_INDEX, /* u32 */
+ /*
+ * Device and port capabilities
+ */
+ RDMA_NLDEV_ATTR_CAP_FLAGS, /* u64 */
+
RDMA_NLDEV_ATTR_MAX
};
#endif /* _UAPI_RDMA_NETLINK_H */
--
2.13.1
prev parent reply other threads:[~2017-06-22 13:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-22 13:24 [PATCH rdma-next V1 00/19] RDMA Netlink Device Client Leon Romanovsky
[not found] ` <20170622132434.1327-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-06-22 13:24 ` [PATCH rdma-next V1 01/19] RDMA/netlink: Add flag to consolidate common handing Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 03/19] RDMA/netlink: Rename and remove redundant parameter from ibnl_unicast Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 17/19] RDMA/netlink: Add nldev port dumpit implementation Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 02/19] RDMA/netlink: Simplify the put_msg and put_attr Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 04/19] RDMA/netlink: Rename and remove redundant parameter from ibnl_multicast Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 05/19] RDMA/netlink: Simplify and rename ibnl_chk_listeners Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 06/19] RDMA/netlink: Rename netlink callback struct Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 07/19] RDMA/core: Add iterator over ib_devices Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 08/19] RDMA/core: Add and expose static device index Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 09/19] RDMA/netlink: Add and implement doit netlink callback Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 10/19] RDMA/netlink: Reduce indirection access to cb_table Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 11/19] RDMA/netlink: Convert LS to doit callback Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 12/19] RDMA/netlink: Update copyright Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 13/19] RDMA/netlink: Add netlink device definitions to UAPI Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 14/19] RDMA/netlink: Add nldev initialization flows Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 15/19] RDMA/netlink: Implement nldev device dumpit calback Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 16/19] RDMA/netlink: Add nldev device doit implementation Leon Romanovsky
2017-06-22 13:24 ` [PATCH rdma-next V1 18/19] RDMA/netlink: Implement nldev port doit callback Leon Romanovsky
2017-06-22 13:24 ` Leon Romanovsky [this message]
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=20170622132434.1327-20-leon@kernel.org \
--to=leon@kernel.org \
--cc=ariela@mellanox.com \
--cc=chien.tin.tung@intel.com \
--cc=dledford@redhat.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=jiri@mellanox.com \
--cc=leonro@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
--cc=swise@opengridcomputing.com \
/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).