IB: common handling for marshalling parameters to/from userspace

Provide common handling for marshalling data between userspace clients
and kernel InfiniBand drivers.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

4 files changed, 174 insertions, 100 deletions

diff --git a/include/rdma/ib_marshall.h b/include/rdma/ib_marshall.h
new file mode 100644
index 000000000000..66bf4d7d0dfb
--- /dev/null
+++ b/include/rdma/ib_marshall.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2005 Intel Corporation.  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
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#if !defined(IB_USER_MARSHALL_H)
+#define IB_USER_MARSHALL_H
+
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_sa.h>
+#include <rdma/ib_user_verbs.h>
+#include <rdma/ib_user_sa.h>
+
+void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
+                             struct ib_qp_attr *src);
+
+void ib_copy_path_rec_to_user(struct ib_user_path_rec *dst,
+                              struct ib_sa_path_rec *src);
+
+void ib_copy_path_rec_from_user(struct ib_sa_path_rec *dst,
+                                struct ib_user_path_rec *src);
+
+#endif /* IB_USER_MARSHALL_H */
diff --git a/include/rdma/ib_user_cm.h b/include/rdma/ib_user_cm.h
index 19be116047f6..a9e1b22d245c 100644
--- a/include/rdma/ib_user_cm.h
+++ b/include/rdma/ib_user_cm.h
@@ -30,13 +30,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * $Id: ib_user_cm.h 2576 2005-06-09 17:00:30Z libor $
+ * $Id: ib_user_cm.h 4019 2005-11-11 00:33:09Z sean.hefty $
  */
 
 #ifndef IB_USER_CM_H
 #define IB_USER_CM_H
 
-#include <linux/types.h>
+#include <rdma/ib_user_sa.h>
 
 #define IB_USER_CM_ABI_VERSION 4
 
@@ -110,58 +110,6 @@ struct ib_ucm_init_qp_attr {
         __u32 qp_state;
 };
 
-struct ib_ucm_ah_attr {
-        __u8    grh_dgid[16];
-        __u32   grh_flow_label;
-        __u16   dlid;
-        __u16   reserved;
-        __u8    grh_sgid_index;
-        __u8    grh_hop_limit;
-        __u8    grh_traffic_class;
-        __u8    sl;
-        __u8    src_path_bits;
-        __u8    static_rate;
-        __u8    is_global;
-        __u8    port_num;
-};
-
-struct ib_ucm_init_qp_attr_resp {
-        __u32   qp_attr_mask;
-        __u32   qp_state;
-        __u32   cur_qp_state;
-        __u32   path_mtu;
-        __u32   path_mig_state;
-        __u32   qkey;
-        __u32   rq_psn;
-        __u32   sq_psn;
-        __u32   dest_qp_num;
-        __u32   qp_access_flags;
-
-        struct ib_ucm_ah_attr   ah_attr;
-        struct ib_ucm_ah_attr   alt_ah_attr;
-
-        /* ib_qp_cap */
-        __u32   max_send_wr;
-        __u32   max_recv_wr;
-        __u32   max_send_sge;
-        __u32   max_recv_sge;
-        __u32   max_inline_data;
-
-        __u16   pkey_index;
-        __u16   alt_pkey_index;
-        __u8    en_sqd_async_notify;
-        __u8    sq_draining;
-        __u8    max_rd_atomic;
-        __u8    max_dest_rd_atomic;
-        __u8    min_rnr_timer;
-        __u8    port_num;
-        __u8    timeout;
-        __u8    retry_cnt;
-        __u8    rnr_retry;
-        __u8    alt_port_num;
-        __u8    alt_timeout;
-};
-
 struct ib_ucm_listen {
         __be64 service_id;
         __be64 service_mask;
@@ -180,28 +128,6 @@ struct ib_ucm_private_data {
         __u8  reserved[3];
 };
 
-struct ib_ucm_path_rec {
-        __u8  dgid[16];
-        __u8  sgid[16];
-        __be16 dlid;
-        __be16 slid;
-        __u32 raw_traffic;
-        __be32 flow_label;
-        __u32 reversible;
-        __u32 mtu;
-        __be16 pkey;
-        __u8  hop_limit;
-        __u8  traffic_class;
-        __u8  numb_path;
-        __u8  sl;
-        __u8  mtu_selector;
-        __u8  rate_selector;
-        __u8  rate;
-        __u8  packet_life_time_selector;
-        __u8  packet_life_time;
-        __u8  preference;
-};
-
 struct ib_ucm_req {
         __u32 id;
         __u32 qpn;
@@ -304,8 +230,8 @@ struct ib_ucm_event_get {
 };
 
 struct ib_ucm_req_event_resp {
-        struct ib_ucm_path_rec primary_path;
-        struct ib_ucm_path_rec alternate_path;
+        struct ib_user_path_rec primary_path;
+        struct ib_user_path_rec alternate_path;
         __be64                 remote_ca_guid;
         __u32                  remote_qkey;
         __u32                  remote_qpn;
@@ -349,7 +275,7 @@ struct ib_ucm_mra_event_resp {
 };
 
 struct ib_ucm_lap_event_resp {
-        struct ib_ucm_path_rec path;
+        struct ib_user_path_rec path;
 };
 
 struct ib_ucm_apr_event_resp {
diff --git a/include/rdma/ib_user_sa.h b/include/rdma/ib_user_sa.h
new file mode 100644
index 000000000000..659120157e14
--- /dev/null
+++ b/include/rdma/ib_user_sa.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2005 Intel Corporation.  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
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef IB_USER_SA_H
+#define IB_USER_SA_H
+
+#include <linux/types.h>
+
+struct ib_user_path_rec {
+        __u8    dgid[16];
+        __u8    sgid[16];
+        __be16  dlid;
+        __be16  slid;
+        __u32   raw_traffic;
+        __be32  flow_label;
+        __u32   reversible;
+        __u32   mtu;
+        __be16  pkey;
+        __u8    hop_limit;
+        __u8    traffic_class;
+        __u8    numb_path;
+        __u8    sl;
+        __u8    mtu_selector;
+        __u8    rate_selector;
+        __u8    rate;
+        __u8    packet_life_time_selector;
+        __u8    packet_life_time;
+        __u8    preference;
+};
+
+#endif /* IB_USER_SA_H */
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h
index 338ed4333063..7b5372010f4b 100644
--- a/include/rdma/ib_user_verbs.h
+++ b/include/rdma/ib_user_verbs.h
@@ -32,7 +32,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * $Id: ib_user_verbs.h 2708 2005-06-24 17:27:21Z roland $
+ * $Id: ib_user_verbs.h 4019 2005-11-11 00:33:09Z sean.hefty $
  */
 
 #ifndef IB_USER_VERBS_H
@@ -323,6 +323,64 @@ struct ib_uverbs_destroy_cq_resp {
         __u32 async_events_reported;
 };
 
+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_qp_attr {
+        __u32   qp_attr_mask;
+        __u32   qp_state;
+        __u32   cur_qp_state;
+        __u32   path_mtu;
+        __u32   path_mig_state;
+        __u32   qkey;
+        __u32   rq_psn;
+        __u32   sq_psn;
+        __u32   dest_qp_num;
+        __u32   qp_access_flags;
+
+        struct ib_uverbs_ah_attr ah_attr;
+        struct ib_uverbs_ah_attr alt_ah_attr;
+
+        /* ib_qp_cap */
+        __u32   max_send_wr;
+        __u32   max_recv_wr;
+        __u32   max_send_sge;
+        __u32   max_recv_sge;
+        __u32   max_inline_data;
+
+        __u16   pkey_index;
+        __u16   alt_pkey_index;
+        __u8    en_sqd_async_notify;
+        __u8    sq_draining;
+        __u8    max_rd_atomic;
+        __u8    max_dest_rd_atomic;
+        __u8    min_rnr_timer;
+        __u8    port_num;
+        __u8    timeout;
+        __u8    retry_cnt;
+        __u8    rnr_retry;
+        __u8    alt_port_num;
+        __u8    alt_timeout;
+        __u8    reserved[5];
+};
+
 struct ib_uverbs_create_qp {
         __u64 response;
         __u64 user_handle;
@@ -541,26 +599,6 @@ 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;