1 files changed, 176 insertions, 46 deletions

diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h
index fd85725391a4..072f3a2edace 100644
--- a/include/rdma/ib_user_verbs.h
+++ b/include/rdma/ib_user_verbs.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Cisco Systems.  All rights reserved.
+ * Copyright (c) 2005 PathScale, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -42,15 +43,12 @@
  * Increment this value if any changes that break userspace ABI
  * compatibility are made.
  */
-#define IB_USER_VERBS_ABI_VERSION       2
+#define IB_USER_VERBS_ABI_VERSION       3
 
 enum {
-        IB_USER_VERBS_CMD_QUERY_PARAMS,
         IB_USER_VERBS_CMD_GET_CONTEXT,
         IB_USER_VERBS_CMD_QUERY_DEVICE,
         IB_USER_VERBS_CMD_QUERY_PORT,
-        IB_USER_VERBS_CMD_QUERY_GID,
-        IB_USER_VERBS_CMD_QUERY_PKEY,
         IB_USER_VERBS_CMD_ALLOC_PD,
         IB_USER_VERBS_CMD_DEALLOC_PD,
         IB_USER_VERBS_CMD_CREATE_AH,
@@ -65,6 +63,7 @@ enum {
         IB_USER_VERBS_CMD_ALLOC_MW,
         IB_USER_VERBS_CMD_BIND_MW,
         IB_USER_VERBS_CMD_DEALLOC_MW,
+        IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL,
         IB_USER_VERBS_CMD_CREATE_CQ,
         IB_USER_VERBS_CMD_RESIZE_CQ,
         IB_USER_VERBS_CMD_DESTROY_CQ,
@@ -90,8 +89,11 @@ enum {
  * Make sure that all structs defined in this file remain laid out so
  * that they pack the same way on 32-bit and 64-bit architectures (to
  * avoid incompatibility between 32-bit userspace and 64-bit kernels).
- * In particular do not use pointer types -- pass pointers in __u64
- * instead.
+ * Specifically:
+ *  - Do not use pointer types -- pass pointers in __u64 instead.
+ *  - Make sure that any structure larger than 4 bytes is padded to a
+ *    multiple of 8 bytes.  Otherwise the structure size will be
+ *    different between 32-bit and 64-bit architectures.
  */
 
 struct ib_uverbs_async_event_desc {
@@ -118,27 +120,14 @@ struct ib_uverbs_cmd_hdr {
         __u16 out_words;
 };
 
-/*
- * No driver_data for "query params" command, since this is intended
- * to be a core function with no possible device dependence.
- */
-struct ib_uverbs_query_params {
-        __u64 response;
-};
-
-struct ib_uverbs_query_params_resp {
-        __u32 num_cq_events;
-};
-
 struct ib_uverbs_get_context {
         __u64 response;
-        __u64 cq_fd_tab;
         __u64 driver_data[0];
 };
 
 struct ib_uverbs_get_context_resp {
         __u32 async_fd;
-        __u32 reserved;
+        __u32 num_comp_vectors;
 };
 
 struct ib_uverbs_query_device {
@@ -220,31 +209,6 @@ struct ib_uverbs_query_port_resp {
         __u8  reserved[3];
 };
 
-struct ib_uverbs_query_gid {
-        __u64 response;
-        __u8  port_num;
-        __u8  index;
-        __u8  reserved[6];
-        __u64 driver_data[0];
-};
-
-struct ib_uverbs_query_gid_resp {
-        __u8  gid[16];
-};
-
-struct ib_uverbs_query_pkey {
-        __u64 response;
-        __u8  port_num;
-        __u8  index;
-        __u8  reserved[6];
-        __u64 driver_data[0];
-};
-
-struct ib_uverbs_query_pkey_resp {
-        __u16 pkey;
-        __u16 reserved;
-};
-
 struct ib_uverbs_alloc_pd {
         __u64 response;
         __u64 driver_data[0];
@@ -278,11 +242,21 @@ struct ib_uverbs_dereg_mr {
         __u32 mr_handle;
 };
 
+struct ib_uverbs_create_comp_channel {
+        __u64 response;
+};
+
+struct ib_uverbs_create_comp_channel_resp {
+        __u32 fd;
+};
+
 struct ib_uverbs_create_cq {
         __u64 response;
         __u64 user_handle;
         __u32 cqe;
-        __u32 event_handler;
+        __u32 comp_vector;
+        __s32 comp_channel;
+        __u32 reserved;
         __u64 driver_data[0];
 };
 
@@ -291,6 +265,41 @@ struct ib_uverbs_create_cq_resp {
         __u32 cqe;
 };
 
+struct ib_uverbs_poll_cq {
+        __u64 response;
+        __u32 cq_handle;
+        __u32 ne;
+};
+
+struct ib_uverbs_wc {
+        __u64 wr_id;
+        __u32 status;
+        __u32 opcode;
+        __u32 vendor_err;
+        __u32 byte_len;
+        __u32 imm_data;
+        __u32 qp_num;
+        __u32 src_qp;
+        __u32 wc_flags;
+        __u16 pkey_index;
+        __u16 slid;
+        __u8 sl;
+        __u8 dlid_path_bits;
+        __u8 port_num;
+        __u8 reserved;
+};
+
+struct ib_uverbs_poll_cq_resp {
+        __u32 count;
+        __u32 reserved;
+        struct ib_uverbs_wc wc[0];
+};
+
+struct ib_uverbs_req_notify_cq {
+        __u32 cq_handle;
+        __u32 solicited_only;
+};
+
 struct ib_uverbs_destroy_cq {
         __u64 response;
         __u32 cq_handle;
@@ -388,6 +397,127 @@ struct ib_uverbs_destroy_qp_resp {
         __u32 events_reported;
 };
 
+/*
+ * The ib_uverbs_sge structure isn't used anywhere, since we assume
+ * the ib_sge structure is packed the same way on 32-bit and 64-bit
+ * architectures in both kernel and user space.  It's just here to
+ * document the ABI.
+ */
+struct ib_uverbs_sge {
+        __u64 addr;
+        __u32 length;
+        __u32 lkey;
+};
+
+struct ib_uverbs_send_wr {
+        __u64 wr_id; 
+        __u32 num_sge;
+        __u32 opcode;
+        __u32 send_flags;
+        __u32 imm_data;
+        union {
+                struct {
+                        __u64 remote_addr;
+                        __u32 rkey;
+                        __u32 reserved;
+                } rdma;
+                struct {
+                        __u64 remote_addr;
+                        __u64 compare_add;
+                        __u64 swap;
+                        __u32 rkey;
+                        __u32 reserved;
+                } atomic;
+                struct {
+                        __u32 ah;
+                        __u32 remote_qpn;
+                        __u32 remote_qkey;
+                        __u32 reserved;
+                } ud;
+        } wr;
+};
+
+struct ib_uverbs_post_send {
+        __u64 response;
+        __u32 qp_handle;
+        __u32 wr_count;
+        __u32 sge_count;
+        __u32 wqe_size;
+        struct ib_uverbs_send_wr send_wr[0];
+};
+
+struct ib_uverbs_post_send_resp {
+        __u32 bad_wr;
+};
+
+struct ib_uverbs_recv_wr {
+        __u64 wr_id;
+        __u32 num_sge;
+        __u32 reserved;
+};
+
+struct ib_uverbs_post_recv {
+        __u64 response;
+        __u32 qp_handle;
+        __u32 wr_count;
+        __u32 sge_count;
+        __u32 wqe_size;
+        struct ib_uverbs_recv_wr recv_wr[0];
+};
+
+struct ib_uverbs_post_recv_resp {
+        __u32 bad_wr;
+};
+
+struct ib_uverbs_post_srq_recv {
+        __u64 response;
+        __u32 srq_handle;
+        __u32 wr_count;
+        __u32 sge_count;
+        __u32 wqe_size;
+        struct ib_uverbs_recv_wr recv[0];
+};
+
+struct ib_uverbs_post_srq_recv_resp {
+        __u32 bad_wr;
+};
+
+struct ib_uverbs_global_route {
+        __u8  dgid[16];
+        __u32 flow_label;    
+        __u8  sgid_index;
+        __u8  hop_limit;
+        __u8  traffic_class;
+        __u8  reserved;
+};
+
+struct ib_uverbs_ah_attr {
+        struct ib_uverbs_global_route grh;
+        __u16 dlid;
+        __u8  sl;
+        __u8  src_path_bits;
+        __u8  static_rate;
+        __u8  is_global;
+        __u8  port_num;
+        __u8  reserved;
+};
+
+struct ib_uverbs_create_ah {
+        __u64 response;
+        __u64 user_handle;
+        __u32 pd_handle;
+        __u32 reserved;
+        struct ib_uverbs_ah_attr attr;
+};
+
+struct ib_uverbs_create_ah_resp {
+        __u32 ah_handle;
+};
+
+struct ib_uverbs_destroy_ah {
+        __u32 ah_handle;
+};
+
 struct ib_uverbs_attach_mcast {
         __u8  gid[16];
         __u32 qp_handle;