RDMA/nldev: Add explicit pad attribute

Add a specific RDMA_NLDEV_ATTR_PAD attribute to be used for 64b
attribute padding.  To preserve the ABI, make this attribute equal to
RDMA_NLDEV_ATTR_UNSPEC, which has a value of 0, because that has been
used up until now as the pad attribute.

Change all the previous use of 0 as the pad with this
new enum.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index eb567765f45c721c2ee031bd67baf0048aefb7f8..6b0c1eb71ea073d2d2d44c3b405b9075243c5694 100644 (file)
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -122,7 +122,8 @@ static int fill_dev_info(struct sk_buff *msg, struct ib_device *device)
 
        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))
+                             device->attrs.device_cap_flags,
+                             RDMA_NLDEV_ATTR_PAD))
                return -EMSGSIZE;
 
        ib_get_device_fw_str(device, fw);
@@ -131,10 +132,12 @@ static int fill_dev_info(struct sk_buff *msg, struct ib_device *device)
                return -EMSGSIZE;
 
        if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_NODE_GUID,
-                             be64_to_cpu(device->node_guid), 0))
+                             be64_to_cpu(device->node_guid),
+                             RDMA_NLDEV_ATTR_PAD))
                return -EMSGSIZE;
        if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_SYS_IMAGE_GUID,
-                             be64_to_cpu(device->attrs.sys_image_guid), 0))
+                             be64_to_cpu(device->attrs.sys_image_guid),
+                             RDMA_NLDEV_ATTR_PAD))
                return -EMSGSIZE;
        if (nla_put_u8(msg, RDMA_NLDEV_ATTR_DEV_NODE_TYPE, device->node_type))
                return -EMSGSIZE;
@@ -161,11 +164,11 @@ static int fill_port_info(struct sk_buff *msg,
 
        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))
+                             (u64)attr.port_cap_flags, RDMA_NLDEV_ATTR_PAD))
                return -EMSGSIZE;
        if (rdma_protocol_ib(device, port) &&
            nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_SUBNET_PREFIX,
-                             attr.subnet_prefix, 0))
+                             attr.subnet_prefix, RDMA_NLDEV_ATTR_PAD))
                return -EMSGSIZE;
        if (rdma_protocol_ib(device, port)) {
                if (nla_put_u32(msg, RDMA_NLDEV_ATTR_LID, attr.lid))
@@ -209,8 +212,8 @@ static int fill_res_info_entry(struct sk_buff *msg,
 
        if (nla_put_string(msg, RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_NAME, name))
                goto err;
-       if (nla_put_u64_64bit(msg,
-                             RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR, curr, 0))
+       if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR, curr,
+                             RDMA_NLDEV_ATTR_PAD))
                goto err;
 
        nla_nest_end(msg, entry_attr);
@@ -409,7 +412,7 @@ static int fill_res_cq_entry(struct sk_buff *msg, struct netlink_callback *cb,
        if (nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_CQE, cq->cqe))
                goto err;
        if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_USECNT,
-                             atomic_read(&cq->usecnt), 0))
+                             atomic_read(&cq->usecnt), RDMA_NLDEV_ATTR_PAD))
                goto err;
 
        /* Poll context is only valid for kernel CQs */
@@ -445,11 +448,12 @@ static int fill_res_mr_entry(struct sk_buff *msg, struct netlink_callback *cb,
                if (nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_LKEY, mr->lkey))
                        goto err;
                if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_IOVA,
-                                     mr->iova, 0))
+                                     mr->iova, RDMA_NLDEV_ATTR_PAD))
                        goto err;
        }
 
-       if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_MRLEN, mr->length, 0))
+       if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_MRLEN, mr->length,
+                             RDMA_NLDEV_ATTR_PAD))
                goto err;
 
        if (fill_res_name_pid(msg, res))
@@ -484,7 +488,7 @@ static int fill_res_pd_entry(struct sk_buff *msg, struct netlink_callback *cb,
                        goto err;
        }
        if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_USECNT,
-                             atomic_read(&pd->usecnt), 0))
+                             atomic_read(&pd->usecnt), RDMA_NLDEV_ATTR_PAD))
                goto err;
        if ((pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY) &&
            nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY,

diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
index 0ce0943fc8087469814b72d26b3cfe4af36b513a..fbf99aa8a03cbe4b773478494033744fb1eed2ad 100644 (file)
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -253,6 +253,9 @@ enum rdma_nldev_attr {
        /* don't change the order or add anything between, this is ABI! */
        RDMA_NLDEV_ATTR_UNSPEC,
 
+       /* Pad attribute for 64b alignment */
+       RDMA_NLDEV_ATTR_PAD = RDMA_NLDEV_ATTR_UNSPEC,
+
        /* Identifier for ib_device */
        RDMA_NLDEV_ATTR_DEV_INDEX,              /* u32 */