RDMA/netink: Export lids and sm_lids

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@mellanox.com>

diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 7af71d5e52c8653ebf97813669d86d87794541aa..16f1d28bea690c15ff562dcef6d48c115f3966ce 100644 (file)
--- 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 481003182a35d969a4214a679082689e0affbf23..7d5caaf541262f3abee0f8a04b65bc583a1f52c4 100644 (file)
--- 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 */