rdma: update rdma_netlink.h to get new driver attributes

Pull in the rdma_netlink.h changes from kernel
commits:

25a0ad85156a ("RDMA/nldev: Add explicit pad attribute")
da5c85078215 ("RDMA/nldev: add driver-specific resource tracking)"
0d52d803767e ("RDMA/uapi: Fix uapi breakage")

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/rdma/include/uapi/rdma/rdma_netlink.h b/rdma/include/uapi/rdma/rdma_netlink.h
index 60416ed71c0fcc093ba6a8ad35f3fe405edb331b..6513fb89abfa1d5dc8b676c717c784763aab8d04 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_netlink.h
+++ b/rdma/include/uapi/rdma/rdma_netlink.h
@@ -249,10 +249,22 @@ enum rdma_nldev_command {
        RDMA_NLDEV_NUM_OPS
 };
 
+enum {
+       RDMA_NLDEV_ATTR_ENTRY_STRLEN = 16,
+};
+
+enum rdma_nldev_print_type {
+       RDMA_NLDEV_PRINT_TYPE_UNSPEC,
+       RDMA_NLDEV_PRINT_TYPE_HEX,
+};
+
 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 */
 
@@ -387,7 +399,6 @@ enum rdma_nldev_attr {
        RDMA_NLDEV_ATTR_RES_PD_ENTRY,           /* nested table */
        RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY,     /* u32 */
        RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY, /* u32 */
-
        /*
         * Provides logical name and index of netdevice which is
         * connected to physical port. This information is relevant
@@ -400,7 +411,24 @@ enum rdma_nldev_attr {
         */
        RDMA_NLDEV_ATTR_NDEV_INDEX,             /* u32 */
        RDMA_NLDEV_ATTR_NDEV_NAME,              /* string */
+       /*
+        * driver-specific attributes.
+        */
+       RDMA_NLDEV_ATTR_DRIVER,                 /* nested table */
+       RDMA_NLDEV_ATTR_DRIVER_ENTRY,           /* nested table */
+       RDMA_NLDEV_ATTR_DRIVER_STRING,          /* string */
+       /*
+        * u8 values from enum rdma_nldev_print_type
+        */
+       RDMA_NLDEV_ATTR_DRIVER_PRINT_TYPE,      /* u8 */
+       RDMA_NLDEV_ATTR_DRIVER_S32,             /* s32 */
+       RDMA_NLDEV_ATTR_DRIVER_U32,             /* u32 */
+       RDMA_NLDEV_ATTR_DRIVER_S64,             /* s64 */
+       RDMA_NLDEV_ATTR_DRIVER_U64,             /* u64 */
 
+       /*
+        * Always the end
+        */
        RDMA_NLDEV_ATTR_MAX
 };
 #endif /* _RDMA_NETLINK_H */