rdma: update uapi headers

Update the RDMA uapi headers from 5.16.0-rc1

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 0474c74002685d9c75cff30fd9faf88f1d9c4337..7ee73a0652f1afa933fe60a049c8ebb77a267b9a 100644 (file)
--- a/rdma/include/uapi/rdma/ib_user_verbs.h
+++ b/rdma/include/uapi/rdma/ib_user_verbs.h
@@ -457,6 +457,17 @@ struct ib_uverbs_poll_cq {
        __u32 ne;
 };
 
+enum ib_uverbs_wc_opcode {
+       IB_UVERBS_WC_SEND = 0,
+       IB_UVERBS_WC_RDMA_WRITE = 1,
+       IB_UVERBS_WC_RDMA_READ = 2,
+       IB_UVERBS_WC_COMP_SWAP = 3,
+       IB_UVERBS_WC_FETCH_ADD = 4,
+       IB_UVERBS_WC_BIND_MW = 5,
+       IB_UVERBS_WC_LOCAL_INV = 6,
+       IB_UVERBS_WC_TSO = 7,
+};
+
 struct ib_uverbs_wc {
        __aligned_u64 wr_id;
        __u32 status;
@@ -585,20 +596,6 @@ enum {
        IB_UVERBS_CREATE_QP_SUP_COMP_MASK = IB_UVERBS_CREATE_QP_MASK_IND_TABLE,
 };
 
-enum {
-       /*
-        * This value is equal to IB_QP_DEST_QPN.
-        */
-       IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20,
-};
-
-enum {
-       /*
-        * This value is equal to IB_QP_RATE_LIMIT.
-        */
-       IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25,
-};
-
 struct ib_uverbs_ex_create_qp {
        __aligned_u64 user_handle;
        __u32 pd_handle;

diff --git a/rdma/include/uapi/rdma/rdma_user_cm.h b/rdma/include/uapi/rdma/rdma_user_cm.h
index e42940a215a3058845e3e4971b6b7ea5cdd644e7..ed5a514305c1dc9612ab5f80a71aa5a8bc83d901 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_user_cm.h
+++ b/rdma/include/uapi/rdma/rdma_user_cm.h
@@ -164,6 +164,8 @@ struct rdma_ucm_query_route_resp {
        __u32 num_paths;
        __u8 port_num;
        __u8 reserved[3];
+       __u32 ibdev_index;
+       __u32 reserved1;
 };
 
 struct rdma_ucm_query_addr_resp {
@@ -175,6 +177,8 @@ struct rdma_ucm_query_addr_resp {
        __u16 dst_size;
        struct __kernel_sockaddr_storage src_addr;
        struct __kernel_sockaddr_storage dst_addr;
+       __u32 ibdev_index;
+       __u32 reserved1;
 };
 
 struct rdma_ucm_query_path_resp {
@@ -206,10 +210,16 @@ struct rdma_ucm_ud_param {
        __u8  reserved[7];
 };
 
+struct rdma_ucm_ece {
+       __u32 vendor_id;
+       __u32 attr_mod;
+};
+
 struct rdma_ucm_connect {
        struct rdma_ucm_conn_param conn_param;
        __u32 id;
        __u32 reserved;
+       struct rdma_ucm_ece ece;
 };
 
 struct rdma_ucm_listen {
@@ -222,12 +232,14 @@ struct rdma_ucm_accept {
        struct rdma_ucm_conn_param conn_param;
        __u32 id;
        __u32 reserved;
+       struct rdma_ucm_ece ece;
 };
 
 struct rdma_ucm_reject {
        __u32 id;
        __u8  private_data_len;
-       __u8  reserved[3];
+       __u8  reason;
+       __u8  reserved[2];
        __u8  private_data[RDMA_MAX_PRIVATE_DATA];
 };
 
@@ -287,6 +299,7 @@ struct rdma_ucm_event_resp {
                struct rdma_ucm_ud_param   ud;
        } param;
        __u32 reserved;
+       struct rdma_ucm_ece ece;
 };
 
 /* Option levels */