rdma: update uapi headers

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/rdma/include/uapi/rdma/ib_user_verbs.h b/rdma/include/uapi/rdma/ib_user_verbs.h
index 1254b51a551a1c370557340a2c480467dd1e5bac..480d9a60b68e475a7dcd20fe326cbe9706ba11c2 100644 (file)
--- a/rdma/include/uapi/rdma/ib_user_verbs.h
+++ b/rdma/include/uapi/rdma/ib_user_verbs.h
@@ -46,7 +46,7 @@
 #define IB_USER_VERBS_ABI_VERSION      6
 #define IB_USER_VERBS_CMD_THRESHOLD    50
 
-enum {
+enum ib_uverbs_write_cmds {
        IB_USER_VERBS_CMD_GET_CONTEXT,
        IB_USER_VERBS_CMD_QUERY_DEVICE,
        IB_USER_VERBS_CMD_QUERY_PORT,
@@ -164,6 +164,7 @@ struct ib_uverbs_get_context {
 struct ib_uverbs_get_context_resp {
        __u32 async_fd;
        __u32 num_comp_vectors;
+       __aligned_u64 driver_data[0];
 };
 
 struct ib_uverbs_query_device {
@@ -310,6 +311,7 @@ struct ib_uverbs_alloc_pd {
 
 struct ib_uverbs_alloc_pd_resp {
        __u32 pd_handle;
+       __u32 driver_data[0];
 };
 
 struct ib_uverbs_dealloc_pd {
@@ -325,6 +327,7 @@ struct ib_uverbs_open_xrcd {
 
 struct ib_uverbs_open_xrcd_resp {
        __u32 xrcd_handle;
+       __u32 driver_data[0];
 };
 
 struct ib_uverbs_close_xrcd {
@@ -345,6 +348,7 @@ struct ib_uverbs_reg_mr_resp {
        __u32 mr_handle;
        __u32 lkey;
        __u32 rkey;
+       __u32 driver_data[0];
 };
 
 struct ib_uverbs_rereg_mr {
@@ -356,11 +360,13 @@ struct ib_uverbs_rereg_mr {
        __aligned_u64 hca_va;
        __u32 pd_handle;
        __u32 access_flags;
+       __aligned_u64 driver_data[0];
 };
 
 struct ib_uverbs_rereg_mr_resp {
        __u32 lkey;
        __u32 rkey;
+       __aligned_u64 driver_data[0];
 };
 
 struct ib_uverbs_dereg_mr {
@@ -372,11 +378,13 @@ struct ib_uverbs_alloc_mw {
        __u32 pd_handle;
        __u8  mw_type;
        __u8  reserved[3];
+       __aligned_u64 driver_data[0];
 };
 
 struct ib_uverbs_alloc_mw_resp {
        __u32 mw_handle;
        __u32 rkey;
+       __aligned_u64 driver_data[0];
 };
 
 struct ib_uverbs_dealloc_mw {
@@ -419,6 +427,7 @@ struct ib_uverbs_ex_create_cq {
 struct ib_uverbs_create_cq_resp {
        __u32 cq_handle;
        __u32 cqe;
+       __aligned_u64 driver_data[0];
 };
 
 struct ib_uverbs_ex_create_cq_resp {
@@ -629,6 +638,7 @@ struct ib_uverbs_create_qp_resp {
        __u32 max_recv_sge;
        __u32 max_inline_data;
        __u32 reserved;
+       __u32 driver_data[0];
 };
 
 struct ib_uverbs_ex_create_qp_resp {
@@ -733,9 +743,6 @@ struct ib_uverbs_ex_modify_qp {
        __u32   reserved;
 };
 
-struct ib_uverbs_modify_qp_resp {
-};
-
 struct ib_uverbs_ex_modify_qp_resp {
        __u32  comp_mask;
        __u32  response_length;
@@ -863,10 +870,12 @@ struct ib_uverbs_create_ah {
        __u32 pd_handle;
        __u32 reserved;
        struct ib_uverbs_ah_attr attr;
+       __aligned_u64 driver_data[0];
 };
 
 struct ib_uverbs_create_ah_resp {
        __u32 ah_handle;
+       __u32 driver_data[0];
 };
 
 struct ib_uverbs_destroy_ah {
@@ -1175,6 +1184,7 @@ struct ib_uverbs_create_srq_resp {
        __u32 max_wr;
        __u32 max_sge;
        __u32 srqn;
+       __u32 driver_data[0];
 };
 
 struct ib_uverbs_modify_srq {

diff --git a/rdma/include/uapi/rdma/rdma_netlink.h b/rdma/include/uapi/rdma/rdma_netlink.h
index e2228c0917154b7dadec4201801a106b47d4b96e..04c80cebef49fd657ea02c34033d6b520fb33117 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_netlink.h
+++ b/rdma/include/uapi/rdma/rdma_netlink.h
@@ -283,6 +283,9 @@ enum rdma_nldev_attr {
 
        /*
         * Device and port capabilities
+        *
+        * When used for port info, first 32-bits are CapabilityMask followed by
+        * 16-bit CapabilityMask2.
         */
        RDMA_NLDEV_ATTR_CAP_FLAGS,              /* u64 */