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 v1 30/33] RDMA/netink: Export lids and sm_lids
Date: Wed, 9 Aug 2017 19:04:02 +0300 [thread overview]
Message-ID: <20170809160405.25142-31-leon@kernel.org> (raw)
In-Reply-To: <20170809160405.25142-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
From: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
According to the IB specification, the LID and SM_LID
are 16-bit wide, but to support OmniPath users, export
it as 32-bit value from the beginning.
Signed-off-by: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
drivers/infiniband/core/nldev.c | 9 ++++++++-
include/uapi/rdma/rdma_netlink.h | 8 ++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index c4884841e2fe..ce733bf33ed9 100644
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -45,6 +45,8 @@ static const struct nla_policy nldev_policy[RDMA_NLDEV_ATTR_MAX] = {
[RDMA_NLDEV_ATTR_NODE_GUID] = { .type = NLA_U64 },
[RDMA_NLDEV_ATTR_SYS_IMAGE_GUID] = { .type = NLA_U64 },
[RDMA_NLDEV_ATTR_SUBNET_PREFIX] = { .type = NLA_U64 },
+ [RDMA_NLDEV_ATTR_LID] = { .type = NLA_U32 },
+ [RDMA_NLDEV_ATTR_SM_LID] = { .type = NLA_U32 },
};
static int fill_dev_info(struct sk_buff *msg, struct ib_device *device)
@@ -102,7 +104,12 @@ static int fill_port_info(struct sk_buff *msg,
nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_SUBNET_PREFIX,
attr.subnet_prefix, 0))
return -EMSGSIZE;
-
+ if (rdma_protocol_ib(device, port)) {
+ if (nla_put_u32(msg, RDMA_NLDEV_ATTR_LID, attr.lid))
+ return -EMSGSIZE;
+ if (nla_put_u32(msg, RDMA_NLDEV_ATTR_SM_LID, attr.sm_lid))
+ return -EMSGSIZE;
+ }
return 0;
}
diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
index 24712d810dca..82e0d64346e1 100644
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -284,6 +284,14 @@ enum rdma_nldev_attr {
*/
RDMA_NLDEV_ATTR_SUBNET_PREFIX, /* u64 */
+ /*
+ * Local Identifier (LID),
+ * According to IB specification, It is 16-bit address assigned
+ * by the Subnet Manager. Extended to be 32-bit for OmniPath users.
+ */
+ RDMA_NLDEV_ATTR_LID, /* u32 */
+ RDMA_NLDEV_ATTR_SM_LID, /* u32 */
+
RDMA_NLDEV_ATTR_MAX
};
#endif /* _UAPI_RDMA_NETLINK_H */
--
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-09 16:04 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 16:03 [pull request][rdma-next v1 00/33] RDMA netlink refactoring and RDMAtool code Leon Romanovsky
[not found] ` <20170809160405.25142-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 16:03 ` [rdma-next v1 01/33] RDMA/core: Add wait/retry version of ibnl_unicast Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 02/33] RDMA/netlink: Remove netlink clients infrastructure Leon Romanovsky
[not found] ` <20170809160405.25142-3-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 16:49 ` Doug Ledford
2017-08-09 16:03 ` [rdma-next v1 03/33] RDMA/netlink: Remove redundant owner option for netlink callbacks Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 04/33] RDMA/netlink: Avoid double pass for RDMA netlink messages Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 05/33] RDMA/iwcm: Remove useless check of nelink client validity Leon Romanovsky
[not found] ` <20170809160405.25142-6-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 16:51 ` Doug Ledford
[not found] ` <29fb15c5-060b-0daa-6f25-4796a2962897-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-08-09 16:54 ` Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 06/33] RDMA/iwcm: Remove extra EXPORT_SYMBOLS Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 07/33] RDMA/netlink: Add flag to consolidate common handing Leon Romanovsky
[not found] ` <20170809160405.25142-8-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 16:53 ` Doug Ledford
2017-08-09 16:03 ` [rdma-next v1 08/33] RDMA/netlink: Simplify the put_msg and put_attr Leon Romanovsky
[not found] ` <20170809160405.25142-9-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 17:00 ` Doug Ledford
[not found] ` <03e0ce22-ad9d-eb7d-be75-b87bc9aa1005-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-08-09 18:39 ` Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 09/33] RDMA/netlink: Rename and remove redundant parameter from ibnl_unicast* Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 10/33] RDMA/netlink: Rename and remove redundant parameter from ibnl_multicast Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 11/33] RDMA/netlink: Simplify and rename ibnl_chk_listeners Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 12/33] RDMA/netlink: Rename netlink callback struct Leon Romanovsky
[not found] ` <20170809160405.25142-13-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 17:06 ` Doug Ledford
2017-08-09 16:03 ` [rdma-next v1 13/33] RDMA/core: Add iterator over ib_devices Leon Romanovsky
[not found] ` <20170809160405.25142-14-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 17:09 ` Doug Ledford
[not found] ` <9ae5be78-67ef-5803-9737-f913dc874861-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-08-10 10:26 ` Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 14/33] RDMA/core: Add and expose static device index Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 15/33] RDMA/netlink: Add and implement doit netlink callback Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 16/33] RDMA/netlink: Reduce indirection access to cb_table Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 17/33] RDMA/netlink: Convert LS to doit callback Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 18/33] RDMA/netlink: Update copyright Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 19/33] RDMA/netlink: Add netlink device definitions to UAPI Leon Romanovsky
[not found] ` <20170809160405.25142-20-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 17:22 ` Doug Ledford
2017-08-09 16:03 ` [rdma-next v1 20/33] RDMA/netlink: Add nldev initialization flows Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 21/33] RDMA/netlink: Implement nldev device dumpit calback Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 22/33] RDMA/netlink: Add nldev device doit implementation Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 23/33] RDMA/netlink: Add nldev port dumpit implementation Leon Romanovsky
[not found] ` <20170809160405.25142-24-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-09 17:47 ` Doug Ledford
[not found] ` <de32381b-0c70-620c-463c-9e89f8ea0388-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-08-10 9:16 ` Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 24/33] RDMA/netlink: Implement nldev port doit callback Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 25/33] RDMA/netlink: Expose device and port capability masks Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 26/33] RDMA: Simplify get firmware interface Leon Romanovsky
2017-08-09 16:03 ` [rdma-next v1 27/33] RDMA/netlink: Export FW version Leon Romanovsky
2017-08-09 16:04 ` [rdma-next v1 28/33] RDMA/netlink: Export node_guid and sys_image_guid Leon Romanovsky
2017-08-09 16:04 ` [rdma-next v1 29/33] RDMA/netlink: Advertise IB subnet prefix Leon Romanovsky
2017-08-09 16:04 ` Leon Romanovsky [this message]
2017-08-09 16:04 ` [rdma-next v1 31/33] RDMA/netlink: Export LID mask control (LMC) Leon Romanovsky
2017-08-09 16:04 ` [rdma-next v1 32/33] RDMA/netlink: Provide port state and physical link state Leon Romanovsky
2017-08-09 16:04 ` [rdma-next v1 33/33] RDMA/netlink: Export node_type Leon Romanovsky
2017-08-09 17:48 ` [pull request][rdma-next v1 00/33] RDMA netlink refactoring and RDMAtool code Doug Ledford
[not found] ` <daad4fb0-cb9d-f6f2-073f-1150d80ac951-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-08-09 18:28 ` 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=20170809160405.25142-31-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