[openib-general] [PATCH v3 1/6] libibverbs include files changes.
Krishna Kumar
krkumar2 at in.ibm.com
Thu Aug 3 00:10:26 PDT 2006
Additions to include files in libibverbs for the new API.
Signed-off-by: Krishna Kumar <krkumar2 at in.ibm.com>
diff -ruNp ORG/libibverbs/include/infiniband/arch.h NEW/libibverbs/include/infiniband/arch.h
--- ORG/libibverbs/include/infiniband/arch.h 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/include/infiniband/arch.h 2006-08-02 18:24:49.000000000 -0700
@@ -32,8 +32,8 @@
* $Id: arch.h 8358 2006-07-04 20:38:54Z roland $
*/
-#ifndef INFINIBAND_ARCH_H
-#define INFINIBAND_ARCH_H
+#ifndef RDMAV_ARCH_H
+#define RDMAV_ARCH_H
#include <endian.h>
#include <byteswap.h>
@@ -92,4 +92,4 @@ static inline uint64_t ntohll(uint64_t x
#endif
-#endif /* INFINIBAND_ARCH_H */
+#endif /* RDMAV_ARCH_H */
diff -ruNp ORG/libibverbs/include/infiniband/deprecate.h NEW/libibverbs/include/infiniband/deprecate.h
--- ORG/libibverbs/include/infiniband/deprecate.h 1969-12-31 16:00:00.000000000 -0800
+++ NEW/libibverbs/include/infiniband/deprecate.h 2006-08-03 17:50:06.000000000 -0700
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 2006 IBM. 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.
+ *
+ * $Id:
+ */
+
+#ifndef RDMAV_DEPRECATE_H
+#define RDMAV_DEPRECATE_H
+
+/*
+ * This header file can be removed once all applications are ported over
+ * to the new API. Till then, this is kept around as a compatibility
+ * header.
+ */
+
+/* All exported IBV_ defines */
+
+#define IBV_NODE_CA RDMAV_NODE_CA
+#define IBV_NODE_SWITCH RDMAV_NODE_SWITCH
+#define IBV_NODE_ROUTER RDMAV_NODE_ROUTER
+#define IBV_DEVICE_RESIZE_MAX_WR RDMAV_DEVICE_RESIZE_MAX_WR
+#define IBV_DEVICE_BAD_PKEY_CNTR RDMAV_DEVICE_BAD_PKEY_CNTR
+#define IBV_DEVICE_BAD_QKEY_CNTR RDMAV_DEVICE_BAD_QKEY_CNTR
+#define IBV_DEVICE_RAW_MULTI RDMAV_DEVICE_RAW_MULTI
+#define IBV_DEVICE_AUTO_PATH_MIG RDMAV_DEVICE_AUTO_PATH_MIG
+#define IBV_DEVICE_CHANGE_PHY_PORT RDMAV_DEVICE_CHANGE_PHY_PORT
+#define IBV_DEVICE_UD_AV_PORT_ENFORCE RDMAV_DEVICE_UD_AV_PORT_ENFORCE
+#define IBV_DEVICE_CURR_QP_STATE_MOD RDMAV_DEVICE_CURR_QP_STATE_MOD
+#define IBV_DEVICE_SHUTDOWN_PORT RDMAV_DEVICE_SHUTDOWN_PORT
+#define IBV_DEVICE_INIT_TYPE RDMAV_DEVICE_INIT_TYPE
+#define IBV_DEVICE_PORT_ACTIVE_EVENT RDMAV_DEVICE_PORT_ACTIVE_EVENT
+#define IBV_DEVICE_SYS_IMAGE_GUID RDMAV_DEVICE_SYS_IMAGE_GUID
+#define IBV_DEVICE_RC_RNR_NAK_GEN RDMAV_DEVICE_RC_RNR_NAK_GEN
+#define IBV_DEVICE_SRQ_RESIZE RDMAV_DEVICE_SRQ_RESIZE
+#define IBV_DEVICE_N_NOTIFY_CQ RDMAV_DEVICE_N_NOTIFY_CQ
+#define IBV_ATOMIC_NONE RDMAV_ATOMIC_NONE
+#define IBV_ATOMIC_HCA RDMAV_ATOMIC_HCA
+#define IBV_ATOMIC_GLOB RDMAV_ATOMIC_GLOB
+#define IBV_MTU_256 RDMAV_MTU_256
+#define IBV_MTU_512 RDMAV_MTU_512
+#define IBV_MTU_1024 RDMAV_MTU_1024
+#define IBV_MTU_2048 RDMAV_MTU_2048
+#define IBV_MTU_4096 RDMAV_MTU_4096
+#define IBV_PORT_NOP RDMAV_PORT_NOP
+#define IBV_PORT_DOWN RDMAV_PORT_DOWN
+#define IBV_PORT_INIT RDMAV_PORT_INIT
+#define IBV_PORT_ARMED RDMAV_PORT_ARMED
+#define IBV_PORT_ACTIVE RDMAV_PORT_ACTIVE
+#define IBV_PORT_ACTIVE_DEFER RDMAV_PORT_ACTIVE_DEFER
+#define IBV_EVENT_CQ_ERR RDMAV_EVENT_CQ_ERR
+#define IBV_EVENT_QP_FATAL RDMAV_EVENT_QP_FATAL
+#define IBV_EVENT_QP_REQ_ERR RDMAV_EVENT_QP_REQ_ERR
+#define IBV_EVENT_QP_ACCESS_ERR RDMAV_EVENT_QP_ACCESS_ERR
+#define IBV_EVENT_COMM_EST RDMAV_EVENT_COMM_EST
+#define IBV_EVENT_SQ_DRAINED RDMAV_EVENT_SQ_DRAINED
+#define IBV_EVENT_PATH_MIG RDMAV_EVENT_PATH_MIG
+#define IBV_EVENT_PATH_MIG_ERR RDMAV_EVENT_PATH_MIG_ERR
+#define IBV_EVENT_DEVICE_FATAL RDMAV_EVENT_DEVICE_FATAL
+#define IBV_EVENT_PORT_ACTIVE RDMAV_EVENT_PORT_ACTIVE
+#define IBV_EVENT_PORT_ERR RDMAV_EVENT_PORT_ERR
+#define IBV_EVENT_LID_CHANGE RDMAV_EVENT_LID_CHANGE
+#define IBV_EVENT_PKEY_CHANGE RDMAV_EVENT_PKEY_CHANGE
+#define IBV_EVENT_SM_CHANGE RDMAV_EVENT_SM_CHANGE
+#define IBV_EVENT_SRQ_ERR RDMAV_EVENT_SRQ_ERR
+#define IBV_EVENT_SRQ_LIMIT_REACHED RDMAV_EVENT_SRQ_LIMIT_REACHED
+#define IBV_EVENT_QP_LAST_WQE_REACHED RDMAV_EVENT_QP_LAST_WQE_REACHED
+#define IBV_EVENT_CLIENT_REREGISTER RDMAV_EVENT_CLIENT_REREGISTER
+#define IBV_WC_SUCCESS RDMAV_WC_SUCCESS
+#define IBV_WC_LOC_LEN_ERR RDMAV_WC_LOC_LEN_ERR
+#define IBV_WC_LOC_QP_OP_ERR RDMAV_WC_LOC_QP_OP_ERR
+#define IBV_WC_LOC_EEC_OP_ERR RDMAV_WC_LOC_EEC_OP_ERR
+#define IBV_WC_LOC_PROT_ERR RDMAV_WC_LOC_PROT_ERR
+#define IBV_WC_WR_FLUSH_ERR RDMAV_WC_WR_FLUSH_ERR
+#define IBV_WC_MW_BIND_ERR RDMAV_WC_MW_BIND_ERR
+#define IBV_WC_BAD_RESP_ERR RDMAV_WC_BAD_RESP_ERR
+#define IBV_WC_LOC_ACCESS_ERR RDMAV_WC_LOC_ACCESS_ERR
+#define IBV_WC_REM_INV_REQ_ERR RDMAV_WC_REM_INV_REQ_ERR
+#define IBV_WC_REM_ACCESS_ERR RDMAV_WC_REM_ACCESS_ERR
+#define IBV_WC_REM_OP_ERR RDMAV_WC_REM_OP_ERR
+#define IBV_WC_RETRY_EXC_ERR RDMAV_WC_RETRY_EXC_ERR
+#define IBV_WC_RNR_RETRY_EXC_ERR RDMAV_WC_RNR_RETRY_EXC_ERR
+#define IBV_WC_LOC_RDD_VIOL_ERR RDMAV_WC_LOC_RDD_VIOL_ERR
+#define IBV_WC_REM_INV_RD_REQ_ERR RDMAV_WC_REM_INV_RD_REQ_ERR
+#define IBV_WC_REM_ABORT_ERR RDMAV_WC_REM_ABORT_ERR
+#define IBV_WC_INV_EECN_ERR RDMAV_WC_INV_EECN_ERR
+#define IBV_WC_INV_EEC_STATE_ERR RDMAV_WC_INV_EEC_STATE_ERR
+#define IBV_WC_FATAL_ERR RDMAV_WC_FATAL_ERR
+#define IBV_WC_RESP_TIMEOUT_ERR RDMAV_WC_RESP_TIMEOUT_ERR
+#define IBV_WC_GENERAL_ERR RDMAV_WC_GENERAL_ERR
+#define IBV_WC_SEND RDMAV_WC_SEND
+#define IBV_WC_RDMA_WRITE RDMAV_WC_RDMA_WRITE
+#define IBV_WC_RDMA_READ RDMAV_WC_RDMA_READ
+#define IBV_WC_COMP_SWAP RDMAV_WC_COMP_SWAP
+#define IBV_WC_FETCH_ADD RDMAV_WC_FETCH_ADD
+#define IBV_WC_BIND_MW RDMAV_WC_BIND_MW
+#define IBV_WC_RECV RDMAV_WC_RECV
+#define IBV_WC_RECV_RDMA_WITH_IMM RDMAV_WC_RECV_RDMA_WITH_IMM
+#define IBV_WC_GRH RDMAV_WC_GRH
+#define IBV_WC_WITH_IMM RDMAV_WC_WITH_IMM
+#define IBV_ACCESS_LOCAL_WRITE RDMAV_ACCESS_LOCAL_WRITE
+#define IBV_ACCESS_REMOTE_WRITE RDMAV_ACCESS_REMOTE_WRITE
+#define IBV_ACCESS_REMOTE_READ RDMAV_ACCESS_REMOTE_READ
+#define IBV_ACCESS_REMOTE_ATOMIC RDMAV_ACCESS_REMOTE_ATOMIC
+#define IBV_ACCESS_MW_BIND RDMAV_ACCESS_MW_BIND
+#define IBV_RATE_MAX RDMAV_RATE_MAX
+#define IBV_RATE_2_5_GBPS RDMAV_RATE_2_5_GBPS
+#define IBV_RATE_5_GBPS RDMAV_RATE_5_GBPS
+#define IBV_RATE_10_GBPS RDMAV_RATE_10_GBPS
+#define IBV_RATE_20_GBPS RDMAV_RATE_20_GBPS
+#define IBV_RATE_30_GBPS RDMAV_RATE_30_GBPS
+#define IBV_RATE_40_GBPS RDMAV_RATE_40_GBPS
+#define IBV_RATE_60_GBPS RDMAV_RATE_60_GBPS
+#define IBV_RATE_80_GBPS RDMAV_RATE_80_GBPS
+#define IBV_RATE_120_GBPS RDMAV_RATE_120_GBPS
+#define IBV_SRQ_MAX_WR RDMAV_SRQ_MAX_WR
+#define IBV_SRQ_LIMIT RDMAV_SRQ_LIMIT
+#define IBV_QPT_RC RDMAV_QPT_RC
+#define IBV_QPT_UC RDMAV_QPT_UC
+#define IBV_QPT_UD RDMAV_QPT_UD
+#define IBV_QP_STATE RDMAV_QP_STATE
+#define IBV_QP_CUR_STATE RDMAV_QP_CUR_STATE
+#define IBV_QP_EN_SQD_ASYNC_NOTIFY RDMAV_QP_EN_SQD_ASYNC_NOTIFY
+#define IBV_QP_ACCESS_FLAGS RDMAV_QP_ACCESS_FLAGS
+#define IBV_QP_PKEY_INDEX RDMAV_QP_PKEY_INDEX
+#define IBV_QP_PORT RDMAV_QP_PORT
+#define IBV_QP_QKEY RDMAV_QP_QKEY
+#define IBV_QP_AV RDMAV_QP_AV
+#define IBV_QP_PATH_MTU RDMAV_QP_PATH_MTU
+#define IBV_QP_TIMEOUT RDMAV_QP_TIMEOUT
+#define IBV_QP_RETRY_CNT RDMAV_QP_RETRY_CNT
+#define IBV_QP_RNR_RETRY RDMAV_QP_RNR_RETRY
+#define IBV_QP_RQ_PSN RDMAV_QP_RQ_PSN
+#define IBV_QP_MAX_QP_RD_ATOMIC RDMAV_QP_MAX_QP_RD_ATOMIC
+#define IBV_QP_ALT_PATH RDMAV_QP_ALT_PATH
+#define IBV_QP_MIN_RNR_TIMER RDMAV_QP_MIN_RNR_TIMER
+#define IBV_QP_SQ_PSN RDMAV_QP_SQ_PSN
+#define IBV_QP_MAX_DEST_RD_ATOMIC RDMAV_QP_MAX_DEST_RD_ATOMIC
+#define IBV_QP_PATH_MIG_STATE RDMAV_QP_PATH_MIG_STATE
+#define IBV_QP_CAP RDMAV_QP_CAP
+#define IBV_QP_DEST_QPN RDMAV_QP_DEST_QPN
+#define IBV_QPS_RESET RDMAV_QPS_RESET
+#define IBV_QPS_INIT RDMAV_QPS_INIT
+#define IBV_QPS_RTR RDMAV_QPS_RTR
+#define IBV_QPS_RTS RDMAV_QPS_RTS
+#define IBV_QPS_SQD RDMAV_QPS_SQD
+#define IBV_QPS_SQE RDMAV_QPS_SQE
+#define IBV_QPS_ERR RDMAV_QPS_ERR
+#define IBV_MIG_MIGRATED RDMAV_MIG_MIGRATED
+#define IBV_MIG_REARM RDMAV_MIG_REARM
+#define IBV_MIG_ARMED RDMAV_MIG_ARMED
+#define IBV_WR_RDMA_WRITE RDMAV_WR_RDMA_WRITE
+#define IBV_WR_RDMA_WRITE_WITH_IMM RDMAV_WR_RDMA_WRITE_WITH_IMM
+#define IBV_WR_SEND RDMAV_WR_SEND
+#define IBV_WR_SEND_WITH_IMM RDMAV_WR_SEND_WITH_IMM
+#define IBV_WR_RDMA_READ RDMAV_WR_RDMA_READ
+#define IBV_WR_ATOMIC_CMP_AND_SWP RDMAV_WR_ATOMIC_CMP_AND_SWP
+#define IBV_WR_ATOMIC_FETCH_AND_ADD RDMAV_WR_ATOMIC_FETCH_AND_ADD
+#define IBV_SEND_FENCE RDMAV_SEND_FENCE
+#define IBV_SEND_SIGNALED RDMAV_SEND_SIGNALED
+#define IBV_SEND_SOLICITED RDMAV_SEND_SOLICITED
+#define IBV_SEND_INLINE RDMAV_SEND_INLINE
+#define IBV_SYSFS_NAME_MAX RDMAV_SYSFS_NAME_MAX
+#define IBV_SYSFS_PATH_MAX RDMAV_SYSFS_PATH_MAX
+
+
+#define IBV_OPCODE_RC RDMAV_OPCODE_RC
+#define IBV_OPCODE_UC RDMAV_OPCODE_UC
+#define IBV_OPCODE_RD RDMAV_OPCODE_RD
+#define IBV_OPCODE_UD RDMAV_OPCODE_UD
+#define IBV_OPCODE_SEND_FIRST RDMAV_OPCODE_SEND_FIRST
+#define IBV_OPCODE_SEND_MIDDLE RDMAV_OPCODE_SEND_MIDDLE
+#define IBV_OPCODE_SEND_LAST RDMAV_OPCODE_SEND_LAST
+#define IBV_OPCODE_SEND_LAST_WITH_IMMEDIATE RDMAV_OPCODE_SEND_LAST_WITH_IMMEDIATE
+#define IBV_OPCODE_SEND_ONLY RDMAV_OPCODE_SEND_ONLY
+#define IBV_OPCODE_SEND_ONLY_WITH_IMMEDIATE RDMAV_OPCODE_SEND_ONLY_WITH_IMMEDIATE
+#define IBV_OPCODE_RDMA_WRITE_FIRST RDMAV_OPCODE_RDMA_WRITE_FIRST
+#define IBV_OPCODE_RDMA_WRITE_MIDDLE RDMAV_OPCODE_RDMA_WRITE_MIDDLE
+#define IBV_OPCODE_RDMA_WRITE_LAST RDMAV_OPCODE_RDMA_WRITE_LAST
+#define IBV_OPCODE_RDMA_WRITE_LAST_WITH_IMMEDIATE RDMAV_OPCODE_RDMA_WRITE_LAST_WITH_IMMEDIATE
+#define IBV_OPCODE_RDMA_WRITE_ONLY RDMAV_OPCODE_RDMA_WRITE_ONLY
+#define IBV_OPCODE_RDMA_WRITE_ONLY_WITH_IMMEDIATE RDMAV_OPCODE_RDMA_WRITE_ONLY_WITH_IMMEDIATE
+#define IBV_OPCODE_RDMA_READ_REQUEST RDMAV_OPCODE_RDMA_READ_REQUEST
+#define IBV_OPCODE_RDMA_READ_RESPONSE_FIRST RDMAV_OPCODE_RDMA_READ_RESPONSE_FIRST
+#define IBV_OPCODE_RDMA_READ_RESPONSE_MIDDLE RDMAV_OPCODE_RDMA_READ_RESPONSE_MIDDLE
+#define IBV_OPCODE_RDMA_READ_RESPONSE_LAST RDMAV_OPCODE_RDMA_READ_RESPONSE_LAST
+#define IBV_OPCODE_RDMA_READ_RESPONSE_ONLY RDMAV_OPCODE_RDMA_READ_RESPONSE_ONLY
+#define IBV_OPCODE_ACKNOWLEDGE RDMAV_OPCODE_ACKNOWLEDGE
+#define IBV_OPCODE_ATOMIC_ACKNOWLEDGE RDMAV_OPCODE_ATOMIC_ACKNOWLEDGE
+#define IBV_OPCODE_COMPARE_SWAP RDMAV_OPCODE_COMPARE_SWAP
+#define IBV_OPCODE_FETCH_ADD RDMAV_OPCODE_FETCH_ADD
+
+/* All exported ibv_ routines */
+
+#define ibv_open_device rdmav_open_device
+#define ibv_get_device_guid rdmav_get_device_guid
+#define ibv_get_device_name rdmav_get_device_name
+#define ibv_ack_async_event rdmav_ack_async_event
+#define ibv_ack_cq_events rdmav_ack_cq_events
+#define ibv_alloc_pd rdmav_alloc_pd
+#define ibv_attach_mcast rdmav_attach_mcast
+#define ibv_close_device rdmav_close_device
+#define ibv_cmd_alloc_pd rdmav_cmd_alloc_pd
+#define ibv_cmd_attach_mcast rdmav_cmd_attach_mcast
+#define ibv_cmd_create_ah rdmav_cmd_create_ah
+#define ibv_cmd_create_cq rdmav_cmd_create_cq
+#define ibv_cmd_create_qp rdmav_cmd_create_qp
+#define ibv_cmd_create_srq rdmav_cmd_create_srq
+#define ibv_cmd_dealloc_pd rdmav_cmd_dealloc_pd
+#define ibv_cmd_dereg_mr rdmav_cmd_dereg_mr
+#define ibv_cmd_destroy_ah rdmav_cmd_destroy_ah
+#define ibv_cmd_destroy_cq rdmav_cmd_destroy_cq
+#define ibv_cmd_destroy_qp rdmav_cmd_destroy_qp
+#define ibv_cmd_destroy_srq rdmav_cmd_destroy_srq
+#define ibv_cmd_detach_mcast rdmav_cmd_detach_mcast
+#define ibv_cmd_get_context rdmav_cmd_get_context
+#define ibv_cmd_modify_qp rdmav_cmd_modify_qp
+#define ibv_cmd_modify_srq rdmav_cmd_modify_srq
+#define ibv_cmd_poll_cq rdmav_cmd_poll_cq
+#define ibv_cmd_post_recv rdmav_cmd_post_recv
+#define ibv_cmd_post_send rdmav_cmd_post_send
+#define ibv_cmd_post_srq_recv rdmav_cmd_post_srq_recv
+#define ibv_cmd_query_device rdmav_cmd_query_device
+#define ibv_cmd_query_port rdmav_cmd_query_port
+#define ibv_cmd_query_qp rdmav_cmd_query_qp
+#define ibv_cmd_query_srq rdmav_cmd_query_srq
+#define ibv_cmd_reg_mr rdmav_cmd_reg_mr
+#define ibv_cmd_req_notify_cq rdmav_cmd_req_notify_cq
+#define ibv_cmd_resize_cq rdmav_cmd_resize_cq
+#define ibv_copy_ah_attr_from_kern rdmav_copy_ah_attr_from_kern
+#define ibv_copy_path_rec_from_kern rdmav_copy_path_rec_from_kern
+#define ibv_copy_path_rec_to_kern rdmav_copy_path_rec_to_kern
+#define ibv_copy_qp_attr_from_kern rdmav_copy_qp_attr_from_kern
+#define ibv_create_ah rdmav_create_ah
+#define ibv_create_comp_channel rdmav_create_comp_channel
+#define ibv_create_cq rdmav_create_cq
+#define ibv_create_qp rdmav_create_qp
+#define ibv_create_srq rdmav_create_srq
+#define ibv_dealloc_pd rdmav_dealloc_pd
+#define ibv_dereg_mr rdmav_dereg_mr
+#define ibv_destroy_ah rdmav_destroy_ah
+#define ibv_destroy_comp_channel rdmav_destroy_comp_channel
+#define ibv_destroy_cq rdmav_destroy_cq
+#define ibv_destroy_qp rdmav_destroy_qp
+#define ibv_destroy_srq rdmav_destroy_srq
+#define ibv_detach_mcast rdmav_detach_mcast
+#define ibv_free_device_list rdmav_free_device_list
+#define ibv_get_async_event rdmav_get_async_event
+#define ibv_get_cq_event rdmav_get_cq_event
+#define ibv_get_device_guid rdmav_get_device_guid
+#define ibv_init_ah_from_wc rdmav_init_ah_from_wc
+#define ibv_modify_qp rdmav_modify_qp
+#define ibv_modify_srq rdmav_modify_srq
+#define ibv_poll_cq rdmav_poll_cq
+#define ibv_post_recv rdmav_post_recv
+#define ibv_post_send rdmav_post_send
+#define ibv_post_srq_recv rdmav_post_srq_recv
+#define ibv_query_device rdmav_query_device
+#define ibv_query_gid rdmav_query_gid
+#define ibv_query_pkey rdmav_query_pkey
+#define ibv_query_port rdmav_query_port
+#define ibv_query_qp rdmav_query_qp
+#define ibv_query_srq rdmav_query_srq
+#define ibv_rate_to_mult rdmav_rate_to_mult
+#define ibv_read_sysfs_file rdmav_read_sysfs_file
+#define ibv_reg_mr rdmav_reg_mr
+#define ibv_req_notify_cq rdmav_req_notify_cq
+#define ibv_resize_cq rdmav_resize_cq
+
+/* All exported ibv_ data structures */
+
+#define ibv_access_flags rdmav_access_flags
+#define ibv_ah rdmav_ah
+#define ibv_ah_attr rdmav_ah_attr
+#define ibv_alloc_pd_resp rdmav_alloc_pd_resp
+#define ibv_async_event rdmav_async_event
+#define ibv_atomic_cap rdmav_atomic_cap
+#define ibv_cmd_query_gid rdmav_cmd_query_gid
+#define ibv_cmd_query_pkey rdmav_cmd_query_pkey
+#define ibv_comp_channel rdmav_comp_channel
+#define ibv_comp_event rdmav_comp_event
+#define ibv_context rdmav_context
+#define ibv_context_ops rdmav_context_ops
+#define ibv_cq rdmav_cq
+#define ibv_create_ah_resp rdmav_create_ah_resp
+#define ibv_create_comp_channel_resp rdmav_create_comp_channel_resp
+#define ibv_create_cq_resp rdmav_create_cq_resp
+#define ibv_create_qp_resp rdmav_create_qp_resp
+#define ibv_create_srq_resp rdmav_create_srq_resp
+#define ibv_destroy_cq_resp rdmav_destroy_cq_resp
+#define ibv_destroy_qp_resp rdmav_destroy_qp_resp
+#define ibv_destroy_srq_resp rdmav_destroy_srq_resp
+#define ibv_device rdmav_device
+#define ibv_device_attr rdmav_device_attr
+#define ibv_device_cap_flags rdmav_device_cap_flags
+#define ibv_device_ops rdmav_device_ops
+#define ibv_driver rdmav_driver
+#define ibv_event_type rdmav_event_type
+#define ibv_get_context rdmav_get_context
+#define ibv_get_context_resp rdmav_get_context_resp
+#define ibv_gid rdmav_gid
+#define ibv_global_route rdmav_global_route
+#define ibv_grh rdmav_grh
+#define ibv_kern_ah_attr rdmav_kern_ah_attr
+#define ibv_kern_async_event rdmav_kern_async_event
+#define ibv_kern_global_route rdmav_kern_global_route
+#define ibv_kern_path_rec rdmav_kern_path_rec
+#define ibv_kern_qp_attr rdmav_kern_qp_attr
+#define ibv_kern_recv_wr rdmav_kern_recv_wr
+#define ibv_kern_send_wr rdmav_kern_send_wr
+#define ibv_kern_wc rdmav_kern_wc
+#define ibv_mig_state rdmav_mig_state
+#define ibv_mr rdmav_mr
+#define ibv_mtu rdmav_mtu
+#define ibv_node_type rdmav_node_type
+#define ibv_pd rdmav_pd
+#define ibv_poll_cq_resp rdmav_poll_cq_resp
+#define ibv_port_attr rdmav_port_attr
+#define ibv_port_state rdmav_port_state
+#define ibv_post_recv_resp rdmav_post_recv_resp
+#define ibv_post_send_resp rdmav_post_send_resp
+#define ibv_post_srq_recv_resp rdmav_post_srq_recv_resp
+#define ibv_qp rdmav_qp
+#define ibv_qp_attr rdmav_qp_attr
+#define ibv_qp_attr_mask rdmav_qp_attr_mask
+#define ibv_qp_cap rdmav_qp_cap
+#define ibv_qp_dest rdmav_qp_dest
+#define ibv_qp_init_attr rdmav_qp_init_attr
+#define ibv_qp_state rdmav_qp_state
+#define ibv_qp_type rdmav_qp_type
+#define ibv_query_device_resp rdmav_query_device_resp
+#define ibv_query_params rdmav_query_params
+#define ibv_query_params_resp rdmav_query_params_resp
+#define ibv_query_port_resp rdmav_query_port_resp
+#define ibv_query_qp_resp rdmav_query_qp_resp
+#define ibv_query_srq_resp rdmav_query_srq_resp
+#define ibv_rate rdmav_rate
+#define ibv_recv_wr rdmav_recv_wr
+#define ibv_reg_mr_resp rdmav_reg_mr_resp
+#define ibv_resize_cq_resp rdmav_resize_cq_resp
+#define ibv_sa_mcmember_rec rdmav_sa_mcmember_rec
+#define ibv_sa_path_rec rdmav_sa_path_rec
+#define ibv_sa_service_rec rdmav_sa_service_rec
+#define ibv_send_flags rdmav_send_flags
+#define ibv_send_wr rdmav_send_wr
+#define ibv_sge rdmav_sge
+#define ibv_srq rdmav_srq
+#define ibv_srq_attr rdmav_srq_attr
+#define ibv_srq_attr_mask rdmav_srq_attr_mask
+#define ibv_srq_init_attr rdmav_srq_init_attr
+#define ibv_wc rdmav_wc
+#define ibv_wc_flags rdmav_wc_flags
+#define ibv_wc_opcode rdmav_wc_opcode
+#define ibv_wc_status rdmav_wc_status
+#define ibv_wr_opcode rdmav_wr_opcode
+
+/* All declarations needed for compiles */
+extern struct rdmav_device **ibv_get_device_list(int *num);
+
+#endif /* RDMAV_DEPRECATE_H */
diff -ruNp ORG/libibverbs/include/infiniband/driver.h NEW/libibverbs/include/infiniband/driver.h
--- ORG/libibverbs/include/infiniband/driver.h 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/include/infiniband/driver.h 2006-08-02 18:24:49.000000000 -0700
@@ -34,8 +34,8 @@
* $Id: driver.h 7484 2006-05-24 21:12:21Z roland $
*/
-#ifndef INFINIBAND_DRIVER_H
-#define INFINIBAND_DRIVER_H
+#ifndef RDMAV_DRIVER_H
+#define RDMAV_DRIVER_H
#include <infiniband/verbs.h>
#include <infiniband/kern-abi.h>
@@ -57,90 +57,90 @@
*
* libibverbs will call each driver's ibv_driver_init() function once
* for each InfiniBand device. If the device is one that the driver
- * can support, it should return a struct ibv_device * with the ops
+ * can support, it should return a struct rdmav_device * with the ops
* member filled in. If the driver does not support the device, it
* should return NULL from openib_driver_init().
*/
-typedef struct ibv_device *(*ibv_driver_init_func)(const char *, int);
+typedef struct rdmav_device *(*rdmav_driver_init_func)(const char *, int);
-int ibv_cmd_get_context(struct ibv_context *context, struct ibv_get_context *cmd,
- size_t cmd_size, struct ibv_get_context_resp *resp,
+int rdmav_cmd_get_context(struct rdmav_context *context, struct rdmav_get_context *cmd,
+ size_t cmd_size, struct rdmav_get_context_resp *resp,
size_t resp_size);
-int ibv_cmd_query_device(struct ibv_context *context,
- struct ibv_device_attr *device_attr,
+int rdmav_cmd_query_device(struct rdmav_context *context,
+ struct rdmav_device_attr *device_attr,
uint64_t *raw_fw_ver,
- struct ibv_query_device *cmd, size_t cmd_size);
-int ibv_cmd_query_port(struct ibv_context *context, uint8_t port_num,
- struct ibv_port_attr *port_attr,
- struct ibv_query_port *cmd, size_t cmd_size);
-int ibv_cmd_query_gid(struct ibv_context *context, uint8_t port_num,
- int index, union ibv_gid *gid);
-int ibv_cmd_query_pkey(struct ibv_context *context, uint8_t port_num,
+ struct rdmav_query_device *cmd, size_t cmd_size);
+int rdmav_cmd_query_port(struct rdmav_context *context, uint8_t port_num,
+ struct rdmav_port_attr *port_attr,
+ struct rdmav_query_port *cmd, size_t cmd_size);
+int rdmav_cmd_query_gid(struct rdmav_context *context, uint8_t port_num,
+ int index, union rdmav_gid *gid);
+int rdmav_cmd_query_pkey(struct rdmav_context *context, uint8_t port_num,
int index, uint16_t *pkey);
-int ibv_cmd_alloc_pd(struct ibv_context *context, struct ibv_pd *pd,
- struct ibv_alloc_pd *cmd, size_t cmd_size,
- struct ibv_alloc_pd_resp *resp, size_t resp_size);
-int ibv_cmd_dealloc_pd(struct ibv_pd *pd);
-int ibv_cmd_reg_mr(struct ibv_pd *pd, void *addr, size_t length,
- uint64_t hca_va, enum ibv_access_flags access,
- struct ibv_mr *mr, struct ibv_reg_mr *cmd,
+int rdmav_cmd_alloc_pd(struct rdmav_context *context, struct rdmav_pd *pd,
+ struct rdmav_alloc_pd *cmd, size_t cmd_size,
+ struct rdmav_alloc_pd_resp *resp, size_t resp_size);
+int rdmav_cmd_dealloc_pd(struct rdmav_pd *pd);
+int rdmav_cmd_reg_mr(struct rdmav_pd *pd, void *addr, size_t length,
+ uint64_t hca_va, enum rdmav_access_flags access,
+ struct rdmav_mr *mr, struct rdmav_reg_mr *cmd,
size_t cmd_size);
-int ibv_cmd_dereg_mr(struct ibv_mr *mr);
-int ibv_cmd_create_cq(struct ibv_context *context, int cqe,
- struct ibv_comp_channel *channel,
- int comp_vector, struct ibv_cq *cq,
- struct ibv_create_cq *cmd, size_t cmd_size,
- struct ibv_create_cq_resp *resp, size_t resp_size);
-int ibv_cmd_poll_cq(struct ibv_cq *cq, int ne, struct ibv_wc *wc);
-int ibv_cmd_req_notify_cq(struct ibv_cq *cq, int solicited_only);
-int ibv_cmd_resize_cq(struct ibv_cq *cq, int cqe,
- struct ibv_resize_cq *cmd, size_t cmd_size);
-int ibv_cmd_destroy_cq(struct ibv_cq *cq);
-
-int ibv_cmd_create_srq(struct ibv_pd *pd,
- struct ibv_srq *srq, struct ibv_srq_init_attr *attr,
- struct ibv_create_srq *cmd, size_t cmd_size,
- struct ibv_create_srq_resp *resp, size_t resp_size);
-int ibv_cmd_modify_srq(struct ibv_srq *srq,
- struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask,
- struct ibv_modify_srq *cmd, size_t cmd_size);
-int ibv_cmd_query_srq(struct ibv_srq *srq,
- struct ibv_srq_attr *srq_attr,
- struct ibv_query_srq *cmd, size_t cmd_size);
-int ibv_cmd_destroy_srq(struct ibv_srq *srq);
-
-int ibv_cmd_create_qp(struct ibv_pd *pd,
- struct ibv_qp *qp, struct ibv_qp_init_attr *attr,
- struct ibv_create_qp *cmd, size_t cmd_size,
- struct ibv_create_qp_resp *resp, size_t resp_size);
-int ibv_cmd_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *qp_attr,
- enum ibv_qp_attr_mask attr_mask,
- struct ibv_qp_init_attr *qp_init_attr,
- struct ibv_query_qp *cmd, size_t cmd_size);
-int ibv_cmd_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
- struct ibv_modify_qp *cmd, size_t cmd_size);
-int ibv_cmd_destroy_qp(struct ibv_qp *qp);
-int ibv_cmd_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr,
- struct ibv_send_wr **bad_wr);
-int ibv_cmd_post_recv(struct ibv_qp *ibqp, struct ibv_recv_wr *wr,
- struct ibv_recv_wr **bad_wr);
-int ibv_cmd_post_srq_recv(struct ibv_srq *srq, struct ibv_recv_wr *wr,
- struct ibv_recv_wr **bad_wr);
-int ibv_cmd_create_ah(struct ibv_pd *pd, struct ibv_ah *ah,
- struct ibv_ah_attr *attr);
-int ibv_cmd_destroy_ah(struct ibv_ah *ah);
-int ibv_cmd_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
-int ibv_cmd_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
+int rdmav_cmd_dereg_mr(struct rdmav_mr *mr);
+int rdmav_cmd_create_cq(struct rdmav_context *context, int cqe,
+ struct rdmav_comp_channel *channel,
+ int comp_vector, struct rdmav_cq *cq,
+ struct rdmav_create_cq *cmd, size_t cmd_size,
+ struct rdmav_create_cq_resp *resp, size_t resp_size);
+int rdmav_cmd_poll_cq(struct rdmav_cq *cq, int ne, struct rdmav_wc *wc);
+int rdmav_cmd_req_notify_cq(struct rdmav_cq *cq, int solicited_only);
+int rdmav_cmd_resize_cq(struct rdmav_cq *cq, int cqe,
+ struct rdmav_resize_cq *cmd, size_t cmd_size);
+int rdmav_cmd_destroy_cq(struct rdmav_cq *cq);
+
+int rdmav_cmd_create_srq(struct rdmav_pd *pd,
+ struct rdmav_srq *srq, struct rdmav_srq_init_attr *attr,
+ struct rdmav_create_srq *cmd, size_t cmd_size,
+ struct rdmav_create_srq_resp *resp, size_t resp_size);
+int rdmav_cmd_modify_srq(struct rdmav_srq *srq,
+ struct rdmav_srq_attr *srq_attr,
+ enum rdmav_srq_attr_mask srq_attr_mask,
+ struct rdmav_modify_srq *cmd, size_t cmd_size);
+int rdmav_cmd_query_srq(struct rdmav_srq *srq,
+ struct rdmav_srq_attr *srq_attr,
+ struct rdmav_query_srq *cmd, size_t cmd_size);
+int rdmav_cmd_destroy_srq(struct rdmav_srq *srq);
+
+int rdmav_cmd_create_qp(struct rdmav_pd *pd,
+ struct rdmav_qp *qp, struct rdmav_qp_init_attr *attr,
+ struct rdmav_create_qp *cmd, size_t cmd_size,
+ struct rdmav_create_qp_resp *resp, size_t resp_size);
+int rdmav_cmd_query_qp(struct rdmav_qp *qp, struct rdmav_qp_attr *qp_attr,
+ enum rdmav_qp_attr_mask attr_mask,
+ struct rdmav_qp_init_attr *qp_init_attr,
+ struct rdmav_query_qp *cmd, size_t cmd_size);
+int rdmav_cmd_modify_qp(struct rdmav_qp *qp, struct rdmav_qp_attr *attr,
+ enum rdmav_qp_attr_mask attr_mask,
+ struct rdmav_modify_qp *cmd, size_t cmd_size);
+int rdmav_cmd_destroy_qp(struct rdmav_qp *qp);
+int rdmav_cmd_post_send(struct rdmav_qp *ibqp, struct rdmav_send_wr *wr,
+ struct rdmav_send_wr **bad_wr);
+int rdmav_cmd_post_recv(struct rdmav_qp *ibqp, struct rdmav_recv_wr *wr,
+ struct rdmav_recv_wr **bad_wr);
+int rdmav_cmd_post_srq_recv(struct rdmav_srq *srq, struct rdmav_recv_wr *wr,
+ struct rdmav_recv_wr **bad_wr);
+int rdmav_cmd_create_ah(struct rdmav_pd *pd, struct rdmav_ah *ah,
+ struct rdmav_ah_attr *attr);
+int rdmav_cmd_destroy_ah(struct rdmav_ah *ah);
+int rdmav_cmd_attach_mcast(struct rdmav_qp *qp, union rdmav_gid *gid, uint16_t lid);
+int rdmav_cmd_detach_mcast(struct rdmav_qp *qp, union rdmav_gid *gid, uint16_t lid);
/*
* sysfs helper functions
*/
-const char *ibv_get_sysfs_path(void);
+const char *rdmav_get_sysfs_path(void);
-int ibv_read_sysfs_file(const char *dir, const char *file,
+int rdmav_read_sysfs_file(const char *dir, const char *file,
char *buf, size_t size);
-#endif /* INFINIBAND_DRIVER_H */
+#endif /* RDMAV_DRIVER_H */
diff -ruNp ORG/libibverbs/include/infiniband/kern-abi.h NEW/libibverbs/include/infiniband/kern-abi.h
--- ORG/libibverbs/include/infiniband/kern-abi.h 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/include/infiniband/kern-abi.h 2006-08-02 18:24:49.000000000 -0700
@@ -47,47 +47,47 @@
/*
* The minimum and maximum kernel ABI that we can handle.
*/
-#define IB_USER_VERBS_MIN_ABI_VERSION 1
-#define IB_USER_VERBS_MAX_ABI_VERSION 6
+#define RDMAV_USER_VERBS_MIN_ABI_VERSION 1
+#define RDMAV_USER_VERBS_MAX_ABI_VERSION 6
enum {
- IB_USER_VERBS_CMD_GET_CONTEXT,
- IB_USER_VERBS_CMD_QUERY_DEVICE,
- IB_USER_VERBS_CMD_QUERY_PORT,
- IB_USER_VERBS_CMD_ALLOC_PD,
- IB_USER_VERBS_CMD_DEALLOC_PD,
- IB_USER_VERBS_CMD_CREATE_AH,
- IB_USER_VERBS_CMD_MODIFY_AH,
- IB_USER_VERBS_CMD_QUERY_AH,
- IB_USER_VERBS_CMD_DESTROY_AH,
- IB_USER_VERBS_CMD_REG_MR,
- IB_USER_VERBS_CMD_REG_SMR,
- IB_USER_VERBS_CMD_REREG_MR,
- IB_USER_VERBS_CMD_QUERY_MR,
- IB_USER_VERBS_CMD_DEREG_MR,
- 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,
- IB_USER_VERBS_CMD_POLL_CQ,
- IB_USER_VERBS_CMD_PEEK_CQ,
- IB_USER_VERBS_CMD_REQ_NOTIFY_CQ,
- IB_USER_VERBS_CMD_CREATE_QP,
- IB_USER_VERBS_CMD_QUERY_QP,
- IB_USER_VERBS_CMD_MODIFY_QP,
- IB_USER_VERBS_CMD_DESTROY_QP,
- IB_USER_VERBS_CMD_POST_SEND,
- IB_USER_VERBS_CMD_POST_RECV,
- IB_USER_VERBS_CMD_ATTACH_MCAST,
- IB_USER_VERBS_CMD_DETACH_MCAST,
- IB_USER_VERBS_CMD_CREATE_SRQ,
- IB_USER_VERBS_CMD_MODIFY_SRQ,
- IB_USER_VERBS_CMD_QUERY_SRQ,
- IB_USER_VERBS_CMD_DESTROY_SRQ,
- IB_USER_VERBS_CMD_POST_SRQ_RECV
+ RDMAV_USER_VERBS_CMD_GET_CONTEXT,
+ RDMAV_USER_VERBS_CMD_QUERY_DEVICE,
+ RDMAV_USER_VERBS_CMD_QUERY_PORT,
+ RDMAV_USER_VERBS_CMD_ALLOC_PD,
+ RDMAV_USER_VERBS_CMD_DEALLOC_PD,
+ RDMAV_USER_VERBS_CMD_CREATE_AH,
+ RDMAV_USER_VERBS_CMD_MODIFY_AH,
+ RDMAV_USER_VERBS_CMD_QUERY_AH,
+ RDMAV_USER_VERBS_CMD_DESTROY_AH,
+ RDMAV_USER_VERBS_CMD_REG_MR,
+ RDMAV_USER_VERBS_CMD_REG_SMR,
+ RDMAV_USER_VERBS_CMD_REREG_MR,
+ RDMAV_USER_VERBS_CMD_QUERY_MR,
+ RDMAV_USER_VERBS_CMD_DEREG_MR,
+ RDMAV_USER_VERBS_CMD_ALLOC_MW,
+ RDMAV_USER_VERBS_CMD_BIND_MW,
+ RDMAV_USER_VERBS_CMD_DEALLOC_MW,
+ RDMAV_USER_VERBS_CMD_CREATE_COMP_CHANNEL,
+ RDMAV_USER_VERBS_CMD_CREATE_CQ,
+ RDMAV_USER_VERBS_CMD_RESIZE_CQ,
+ RDMAV_USER_VERBS_CMD_DESTROY_CQ,
+ RDMAV_USER_VERBS_CMD_POLL_CQ,
+ RDMAV_USER_VERBS_CMD_PEEK_CQ,
+ RDMAV_USER_VERBS_CMD_REQ_NOTIFY_CQ,
+ RDMAV_USER_VERBS_CMD_CREATE_QP,
+ RDMAV_USER_VERBS_CMD_QUERY_QP,
+ RDMAV_USER_VERBS_CMD_MODIFY_QP,
+ RDMAV_USER_VERBS_CMD_DESTROY_QP,
+ RDMAV_USER_VERBS_CMD_POST_SEND,
+ RDMAV_USER_VERBS_CMD_POST_RECV,
+ RDMAV_USER_VERBS_CMD_ATTACH_MCAST,
+ RDMAV_USER_VERBS_CMD_DETACH_MCAST,
+ RDMAV_USER_VERBS_CMD_CREATE_SRQ,
+ RDMAV_USER_VERBS_CMD_MODIFY_SRQ,
+ RDMAV_USER_VERBS_CMD_QUERY_SRQ,
+ RDMAV_USER_VERBS_CMD_DESTROY_SRQ,
+ RDMAV_USER_VERBS_CMD_POST_SRQ_RECV
};
/*
@@ -101,13 +101,13 @@ enum {
* different between 32-bit and 64-bit architectures.
*/
-struct ibv_kern_async_event {
+struct rdmav_kern_async_event {
__u64 element;
__u32 event_type;
__u32 reserved;
};
-struct ibv_comp_event {
+struct rdmav_comp_event {
__u64 cq_handle;
};
@@ -119,18 +119,18 @@ struct ibv_comp_event {
* the rest of the command struct based on these value.
*/
-struct ibv_query_params {
+struct rdmav_query_params {
__u32 command;
__u16 in_words;
__u16 out_words;
__u64 response;
};
-struct ibv_query_params_resp {
+struct rdmav_query_params_resp {
__u32 num_cq_events;
};
-struct ibv_get_context {
+struct rdmav_get_context {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -138,12 +138,12 @@ struct ibv_get_context {
__u64 driver_data[0];
};
-struct ibv_get_context_resp {
+struct rdmav_get_context_resp {
__u32 async_fd;
__u32 num_comp_vectors;
};
-struct ibv_query_device {
+struct rdmav_query_device {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -151,7 +151,7 @@ struct ibv_query_device {
__u64 driver_data[0];
};
-struct ibv_query_device_resp {
+struct rdmav_query_device_resp {
__u64 fw_ver;
__u64 node_guid;
__u64 sys_image_guid;
@@ -195,7 +195,7 @@ struct ibv_query_device_resp {
__u8 reserved[4];
};
-struct ibv_query_port {
+struct rdmav_query_port {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -205,7 +205,7 @@ struct ibv_query_port {
__u64 driver_data[0];
};
-struct ibv_query_port_resp {
+struct rdmav_query_port_resp {
__u32 port_cap_flags;
__u32 max_msg_sz;
__u32 bad_pkey_cntr;
@@ -228,7 +228,7 @@ struct ibv_query_port_resp {
__u8 reserved[3];
};
-struct ibv_alloc_pd {
+struct rdmav_alloc_pd {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -236,18 +236,18 @@ struct ibv_alloc_pd {
__u64 driver_data[0];
};
-struct ibv_alloc_pd_resp {
+struct rdmav_alloc_pd_resp {
__u32 pd_handle;
};
-struct ibv_dealloc_pd {
+struct rdmav_dealloc_pd {
__u32 command;
__u16 in_words;
__u16 out_words;
__u32 pd_handle;
};
-struct ibv_reg_mr {
+struct rdmav_reg_mr {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -260,31 +260,31 @@ struct ibv_reg_mr {
__u64 driver_data[0];
};
-struct ibv_reg_mr_resp {
+struct rdmav_reg_mr_resp {
__u32 mr_handle;
__u32 lkey;
__u32 rkey;
};
-struct ibv_dereg_mr {
+struct rdmav_dereg_mr {
__u32 command;
__u16 in_words;
__u16 out_words;
__u32 mr_handle;
};
-struct ibv_create_comp_channel {
+struct rdmav_create_comp_channel {
__u32 command;
__u16 in_words;
__u16 out_words;
__u64 response;
};
-struct ibv_create_comp_channel_resp {
+struct rdmav_create_comp_channel_resp {
__u32 fd;
};
-struct ibv_create_cq {
+struct rdmav_create_cq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -297,12 +297,12 @@ struct ibv_create_cq {
__u64 driver_data[0];
};
-struct ibv_create_cq_resp {
+struct rdmav_create_cq_resp {
__u32 cq_handle;
__u32 cqe;
};
-struct ibv_kern_wc {
+struct rdmav_kern_wc {
__u64 wr_id;
__u32 status;
__u32 opcode;
@@ -320,7 +320,7 @@ struct ibv_kern_wc {
__u8 reserved;
};
-struct ibv_poll_cq {
+struct rdmav_poll_cq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -329,13 +329,13 @@ struct ibv_poll_cq {
__u32 ne;
};
-struct ibv_poll_cq_resp {
+struct rdmav_poll_cq_resp {
__u32 count;
__u32 reserved;
- struct ibv_kern_wc wc[0];
+ struct rdmav_kern_wc wc[0];
};
-struct ibv_req_notify_cq {
+struct rdmav_req_notify_cq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -343,7 +343,7 @@ struct ibv_req_notify_cq {
__u32 solicited;
};
-struct ibv_resize_cq {
+struct rdmav_resize_cq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -353,11 +353,11 @@ struct ibv_resize_cq {
__u64 driver_data[0];
};
-struct ibv_resize_cq_resp {
+struct rdmav_resize_cq_resp {
__u32 cqe;
};
-struct ibv_destroy_cq {
+struct rdmav_destroy_cq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -366,12 +366,12 @@ struct ibv_destroy_cq {
__u32 reserved;
};
-struct ibv_destroy_cq_resp {
+struct rdmav_destroy_cq_resp {
__u32 comp_events_reported;
__u32 async_events_reported;
};
-struct ibv_kern_global_route {
+struct rdmav_kern_global_route {
__u8 dgid[16];
__u32 flow_label;
__u8 sgid_index;
@@ -380,8 +380,8 @@ struct ibv_kern_global_route {
__u8 reserved;
};
-struct ibv_kern_ah_attr {
- struct ibv_kern_global_route grh;
+struct rdmav_kern_ah_attr {
+ struct rdmav_kern_global_route grh;
__u16 dlid;
__u8 sl;
__u8 src_path_bits;
@@ -391,7 +391,7 @@ struct ibv_kern_ah_attr {
__u8 reserved;
};
-struct ibv_kern_qp_attr {
+struct rdmav_kern_qp_attr {
__u32 qp_attr_mask;
__u32 qp_state;
__u32 cur_qp_state;
@@ -403,8 +403,8 @@ struct ibv_kern_qp_attr {
__u32 dest_qp_num;
__u32 qp_access_flags;
- struct ibv_kern_ah_attr ah_attr;
- struct ibv_kern_ah_attr alt_ah_attr;
+ struct rdmav_kern_ah_attr ah_attr;
+ struct rdmav_kern_ah_attr alt_ah_attr;
/* ib_qp_cap */
__u32 max_send_wr;
@@ -429,7 +429,7 @@ struct ibv_kern_qp_attr {
__u8 reserved[5];
};
-struct ibv_create_qp {
+struct rdmav_create_qp {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -451,7 +451,7 @@ struct ibv_create_qp {
__u64 driver_data[0];
};
-struct ibv_create_qp_resp {
+struct rdmav_create_qp_resp {
__u32 qp_handle;
__u32 qpn;
__u32 max_send_wr;
@@ -462,7 +462,7 @@ struct ibv_create_qp_resp {
__u32 reserved;
};
-struct ibv_qp_dest {
+struct rdmav_qp_dest {
__u8 dgid[16];
__u32 flow_label;
__u16 dlid;
@@ -477,7 +477,7 @@ struct ibv_qp_dest {
__u8 port_num;
};
-struct ibv_query_qp {
+struct rdmav_query_qp {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -487,9 +487,9 @@ struct ibv_query_qp {
__u64 driver_data[0];
};
-struct ibv_query_qp_resp {
- struct ibv_qp_dest dest;
- struct ibv_qp_dest alt_dest;
+struct rdmav_query_qp_resp {
+ struct rdmav_qp_dest dest;
+ struct rdmav_qp_dest alt_dest;
__u32 max_send_wr;
__u32 max_recv_wr;
__u32 max_send_sge;
@@ -521,12 +521,12 @@ struct ibv_query_qp_resp {
__u64 driver_data[0];
};
-struct ibv_modify_qp {
+struct rdmav_modify_qp {
__u32 command;
__u16 in_words;
__u16 out_words;
- struct ibv_qp_dest dest;
- struct ibv_qp_dest alt_dest;
+ struct rdmav_qp_dest dest;
+ struct rdmav_qp_dest alt_dest;
__u32 qp_handle;
__u32 attr_mask;
__u32 qkey;
@@ -554,7 +554,7 @@ struct ibv_modify_qp {
__u64 driver_data[0];
};
-struct ibv_destroy_qp {
+struct rdmav_destroy_qp {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -563,11 +563,11 @@ struct ibv_destroy_qp {
__u32 reserved;
};
-struct ibv_destroy_qp_resp {
+struct rdmav_destroy_qp_resp {
__u32 events_reported;
};
-struct ibv_kern_send_wr {
+struct rdmav_kern_send_wr {
__u64 wr_id;
__u32 num_sge;
__u32 opcode;
@@ -595,7 +595,7 @@ struct ibv_kern_send_wr {
} wr;
};
-struct ibv_post_send {
+struct rdmav_post_send {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -604,20 +604,20 @@ struct ibv_post_send {
__u32 wr_count;
__u32 sge_count;
__u32 wqe_size;
- struct ibv_kern_send_wr send_wr[0];
+ struct rdmav_kern_send_wr send_wr[0];
};
-struct ibv_post_send_resp {
+struct rdmav_post_send_resp {
__u32 bad_wr;
};
-struct ibv_kern_recv_wr {
+struct rdmav_kern_recv_wr {
__u64 wr_id;
__u32 num_sge;
__u32 reserved;
};
-struct ibv_post_recv {
+struct rdmav_post_recv {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -626,14 +626,14 @@ struct ibv_post_recv {
__u32 wr_count;
__u32 sge_count;
__u32 wqe_size;
- struct ibv_kern_recv_wr recv_wr[0];
+ struct rdmav_kern_recv_wr recv_wr[0];
};
-struct ibv_post_recv_resp {
+struct rdmav_post_recv_resp {
__u32 bad_wr;
};
-struct ibv_post_srq_recv {
+struct rdmav_post_srq_recv {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -642,14 +642,14 @@ struct ibv_post_srq_recv {
__u32 wr_count;
__u32 sge_count;
__u32 wqe_size;
- struct ibv_kern_recv_wr recv_wr[0];
+ struct rdmav_kern_recv_wr recv_wr[0];
};
-struct ibv_post_srq_recv_resp {
+struct rdmav_post_srq_recv_resp {
__u32 bad_wr;
};
-struct ibv_create_ah {
+struct rdmav_create_ah {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -657,21 +657,21 @@ struct ibv_create_ah {
__u64 user_handle;
__u32 pd_handle;
__u32 reserved;
- struct ibv_kern_ah_attr attr;
+ struct rdmav_kern_ah_attr attr;
};
-struct ibv_create_ah_resp {
+struct rdmav_create_ah_resp {
__u32 handle;
};
-struct ibv_destroy_ah {
+struct rdmav_destroy_ah {
__u32 command;
__u16 in_words;
__u16 out_words;
__u32 ah_handle;
};
-struct ibv_attach_mcast {
+struct rdmav_attach_mcast {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -682,7 +682,7 @@ struct ibv_attach_mcast {
__u64 driver_data[0];
};
-struct ibv_detach_mcast {
+struct rdmav_detach_mcast {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -693,7 +693,7 @@ struct ibv_detach_mcast {
__u64 driver_data[0];
};
-struct ibv_create_srq {
+struct rdmav_create_srq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -706,14 +706,14 @@ struct ibv_create_srq {
__u64 driver_data[0];
};
-struct ibv_create_srq_resp {
+struct rdmav_create_srq_resp {
__u32 srq_handle;
__u32 max_wr;
__u32 max_sge;
__u32 reserved;
};
-struct ibv_modify_srq {
+struct rdmav_modify_srq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -724,7 +724,7 @@ struct ibv_modify_srq {
__u64 driver_data[0];
};
-struct ibv_query_srq {
+struct rdmav_query_srq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -734,14 +734,14 @@ struct ibv_query_srq {
__u64 driver_data[0];
};
-struct ibv_query_srq_resp {
+struct rdmav_query_srq_resp {
__u32 max_wr;
__u32 max_sge;
__u32 srq_limit;
__u32 reserved;
};
-struct ibv_destroy_srq {
+struct rdmav_destroy_srq {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -750,7 +750,7 @@ struct ibv_destroy_srq {
__u32 reserved;
};
-struct ibv_destroy_srq_resp {
+struct rdmav_destroy_srq_resp {
__u32 events_reported;
};
@@ -759,74 +759,74 @@ struct ibv_destroy_srq_resp {
*/
enum {
- IB_USER_VERBS_CMD_QUERY_PARAMS_V2,
- IB_USER_VERBS_CMD_GET_CONTEXT_V2,
- IB_USER_VERBS_CMD_QUERY_DEVICE_V2,
- IB_USER_VERBS_CMD_QUERY_PORT_V2,
- IB_USER_VERBS_CMD_QUERY_GID_V2,
- IB_USER_VERBS_CMD_QUERY_PKEY_V2,
- IB_USER_VERBS_CMD_ALLOC_PD_V2,
- IB_USER_VERBS_CMD_DEALLOC_PD_V2,
- IB_USER_VERBS_CMD_CREATE_AH_V2,
- IB_USER_VERBS_CMD_MODIFY_AH_V2,
- IB_USER_VERBS_CMD_QUERY_AH_V2,
- IB_USER_VERBS_CMD_DESTROY_AH_V2,
- IB_USER_VERBS_CMD_REG_MR_V2,
- IB_USER_VERBS_CMD_REG_SMR_V2,
- IB_USER_VERBS_CMD_REREG_MR_V2,
- IB_USER_VERBS_CMD_QUERY_MR_V2,
- IB_USER_VERBS_CMD_DEREG_MR_V2,
- IB_USER_VERBS_CMD_ALLOC_MW_V2,
- IB_USER_VERBS_CMD_BIND_MW_V2,
- IB_USER_VERBS_CMD_DEALLOC_MW_V2,
- IB_USER_VERBS_CMD_CREATE_CQ_V2,
- IB_USER_VERBS_CMD_RESIZE_CQ_V2,
- IB_USER_VERBS_CMD_DESTROY_CQ_V2,
- IB_USER_VERBS_CMD_POLL_CQ_V2,
- IB_USER_VERBS_CMD_PEEK_CQ_V2,
- IB_USER_VERBS_CMD_REQ_NOTIFY_CQ_V2,
- IB_USER_VERBS_CMD_CREATE_QP_V2,
- IB_USER_VERBS_CMD_QUERY_QP_V2,
- IB_USER_VERBS_CMD_MODIFY_QP_V2,
- IB_USER_VERBS_CMD_DESTROY_QP_V2,
- IB_USER_VERBS_CMD_POST_SEND_V2,
- IB_USER_VERBS_CMD_POST_RECV_V2,
- IB_USER_VERBS_CMD_ATTACH_MCAST_V2,
- IB_USER_VERBS_CMD_DETACH_MCAST_V2,
- IB_USER_VERBS_CMD_CREATE_SRQ_V2,
- IB_USER_VERBS_CMD_MODIFY_SRQ_V2,
- IB_USER_VERBS_CMD_QUERY_SRQ_V2,
- IB_USER_VERBS_CMD_DESTROY_SRQ_V2,
- IB_USER_VERBS_CMD_POST_SRQ_RECV_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_PARAMS_V2,
+ RDMAV_USER_VERBS_CMD_GET_CONTEXT_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_DEVICE_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_PORT_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_GID_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_PKEY_V2,
+ RDMAV_USER_VERBS_CMD_ALLOC_PD_V2,
+ RDMAV_USER_VERBS_CMD_DEALLOC_PD_V2,
+ RDMAV_USER_VERBS_CMD_CREATE_AH_V2,
+ RDMAV_USER_VERBS_CMD_MODIFY_AH_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_AH_V2,
+ RDMAV_USER_VERBS_CMD_DESTROY_AH_V2,
+ RDMAV_USER_VERBS_CMD_REG_MR_V2,
+ RDMAV_USER_VERBS_CMD_REG_SMR_V2,
+ RDMAV_USER_VERBS_CMD_REREG_MR_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_MR_V2,
+ RDMAV_USER_VERBS_CMD_DEREG_MR_V2,
+ RDMAV_USER_VERBS_CMD_ALLOC_MW_V2,
+ RDMAV_USER_VERBS_CMD_BIND_MW_V2,
+ RDMAV_USER_VERBS_CMD_DEALLOC_MW_V2,
+ RDMAV_USER_VERBS_CMD_CREATE_CQ_V2,
+ RDMAV_USER_VERBS_CMD_RESIZE_CQ_V2,
+ RDMAV_USER_VERBS_CMD_DESTROY_CQ_V2,
+ RDMAV_USER_VERBS_CMD_POLL_CQ_V2,
+ RDMAV_USER_VERBS_CMD_PEEK_CQ_V2,
+ RDMAV_USER_VERBS_CMD_REQ_NOTIFY_CQ_V2,
+ RDMAV_USER_VERBS_CMD_CREATE_QP_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_QP_V2,
+ RDMAV_USER_VERBS_CMD_MODIFY_QP_V2,
+ RDMAV_USER_VERBS_CMD_DESTROY_QP_V2,
+ RDMAV_USER_VERBS_CMD_POST_SEND_V2,
+ RDMAV_USER_VERBS_CMD_POST_RECV_V2,
+ RDMAV_USER_VERBS_CMD_ATTACH_MCAST_V2,
+ RDMAV_USER_VERBS_CMD_DETACH_MCAST_V2,
+ RDMAV_USER_VERBS_CMD_CREATE_SRQ_V2,
+ RDMAV_USER_VERBS_CMD_MODIFY_SRQ_V2,
+ RDMAV_USER_VERBS_CMD_QUERY_SRQ_V2,
+ RDMAV_USER_VERBS_CMD_DESTROY_SRQ_V2,
+ RDMAV_USER_VERBS_CMD_POST_SRQ_RECV_V2,
/*
* Set commands that didn't exist to -1 so our compile-time
* trick opcodes in IBV_INIT_CMD() doesn't break.
*/
- IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL_V2 = -1,
+ RDMAV_USER_VERBS_CMD_CREATE_COMP_CHANNEL_V2 = -1,
};
-struct ibv_destroy_cq_v1 {
+struct rdmav_destroy_cq_v1 {
__u32 command;
__u16 in_words;
__u16 out_words;
__u32 cq_handle;
};
-struct ibv_destroy_qp_v1 {
+struct rdmav_destroy_qp_v1 {
__u32 command;
__u16 in_words;
__u16 out_words;
__u32 qp_handle;
};
-struct ibv_destroy_srq_v1 {
+struct rdmav_destroy_srq_v1 {
__u32 command;
__u16 in_words;
__u16 out_words;
__u32 srq_handle;
};
-struct ibv_get_context_v2 {
+struct rdmav_get_context_v2 {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -835,7 +835,7 @@ struct ibv_get_context_v2 {
__u64 driver_data[0];
};
-struct ibv_create_cq_v2 {
+struct rdmav_create_cq_v2 {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -846,7 +846,7 @@ struct ibv_create_cq_v2 {
__u64 driver_data[0];
};
-struct ibv_modify_srq_v3 {
+struct rdmav_modify_srq_v3 {
__u32 command;
__u16 in_words;
__u16 out_words;
@@ -859,12 +859,12 @@ struct ibv_modify_srq_v3 {
__u64 driver_data[0];
};
-struct ibv_create_qp_resp_v3 {
+struct rdmav_create_qp_resp_v3 {
__u32 qp_handle;
__u32 qpn;
};
-struct ibv_create_qp_resp_v4 {
+struct rdmav_create_qp_resp_v4 {
__u32 qp_handle;
__u32 qpn;
__u32 max_send_wr;
@@ -874,7 +874,7 @@ struct ibv_create_qp_resp_v4 {
__u32 max_inline_data;
};
-struct ibv_create_srq_resp_v5 {
+struct rdmav_create_srq_resp_v5 {
__u32 srq_handle;
};
diff -ruNp ORG/libibverbs/include/infiniband/marshall.h NEW/libibverbs/include/infiniband/marshall.h
--- ORG/libibverbs/include/infiniband/marshall.h 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/include/infiniband/marshall.h 2006-08-02 18:24:49.000000000 -0700
@@ -30,8 +30,8 @@
* SOFTWARE.
*/
-#ifndef INFINIBAND_MARSHALL_H
-#define INFINIBAND_MARSHALL_H
+#ifndef RDMAV_MARSHALL_H
+#define RDMAV_MARSHALL_H
#include <infiniband/verbs.h>
#include <infiniband/sa.h>
@@ -48,18 +48,18 @@
BEGIN_C_DECLS
-void ibv_copy_qp_attr_from_kern(struct ibv_qp_attr *dst,
- struct ibv_kern_qp_attr *src);
+void rdmav_copy_qp_attr_from_kern(struct rdmav_qp_attr *dst,
+ struct rdmav_kern_qp_attr *src);
-void ibv_copy_ah_attr_from_kern(struct ibv_ah_attr *dst,
- struct ibv_kern_ah_attr *src);
+void rdmav_copy_ah_attr_from_kern(struct rdmav_ah_attr *dst,
+ struct rdmav_kern_ah_attr *src);
-void ibv_copy_path_rec_from_kern(struct ibv_sa_path_rec *dst,
- struct ibv_kern_path_rec *src);
+void rdmav_copy_path_rec_from_kern(struct rdmav_sa_path_rec *dst,
+ struct rdmav_kern_path_rec *src);
-void ibv_copy_path_rec_to_kern(struct ibv_kern_path_rec *dst,
- struct ibv_sa_path_rec *src);
+void rdmav_copy_path_rec_to_kern(struct rdmav_kern_path_rec *dst,
+ struct rdmav_sa_path_rec *src);
END_C_DECLS
-#endif /* INFINIBAND_MARSHALL_H */
+#endif /* RDMAV_MARSHALL_H */
diff -ruNp ORG/libibverbs/include/infiniband/opcode.h NEW/libibverbs/include/infiniband/opcode.h
--- ORG/libibverbs/include/infiniband/opcode.h 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/include/infiniband/opcode.h 2006-08-03 17:42:30.000000000 -0700
@@ -32,118 +32,119 @@
* $Id: opcode.h 1989 2005-03-14 20:25:13Z roland $
*/
-#ifndef INFINIBAND_OPCODE_H
-#define INFINIBAND_OPCODE_H
+#ifndef RDMAV_OPCODE_H
+#define RDMAV_OPCODE_H
/*
* This macro cleans up the definitions of constants for BTH opcodes.
- * It is used to define constants such as IBV_OPCODE_UD_SEND_ONLY,
- * which becomes IBV_OPCODE_UD + IBV_OPCODE_SEND_ONLY, and this gives
+ * It is used to define constants such as RDMAV_OPCODE_UD_SEND_ONLY,
+ * which becomes RDMAV_OPCODE_UD + RDMAV_OPCODE_SEND_ONLY, and this gives
* the correct value.
*
* In short, user code should use the constants defined using the
* macro rather than worrying about adding together other constants.
*/
-#define IBV_OPCODE(transport, op) \
- IBV_OPCODE_ ## transport ## _ ## op = \
- IBV_OPCODE_ ## transport + IBV_OPCODE_ ## op
+
+#define RDMAV_OPCODE(transport, op) \
+ RDMAV_OPCODE_ ## transport ## _ ## op = \
+ RDMAV_OPCODE_ ## transport + RDMAV_OPCODE_ ## op
enum {
/* transport types -- just used to define real constants */
- IBV_OPCODE_RC = 0x00,
- IBV_OPCODE_UC = 0x20,
- IBV_OPCODE_RD = 0x40,
- IBV_OPCODE_UD = 0x60,
+ RDMAV_OPCODE_RC = 0x00,
+ RDMAV_OPCODE_UC = 0x20,
+ RDMAV_OPCODE_RD = 0x40,
+ RDMAV_OPCODE_UD = 0x60,
/* operations -- just used to define real constants */
- IBV_OPCODE_SEND_FIRST = 0x00,
- IBV_OPCODE_SEND_MIDDLE = 0x01,
- IBV_OPCODE_SEND_LAST = 0x02,
- IBV_OPCODE_SEND_LAST_WITH_IMMEDIATE = 0x03,
- IBV_OPCODE_SEND_ONLY = 0x04,
- IBV_OPCODE_SEND_ONLY_WITH_IMMEDIATE = 0x05,
- IBV_OPCODE_RDMA_WRITE_FIRST = 0x06,
- IBV_OPCODE_RDMA_WRITE_MIDDLE = 0x07,
- IBV_OPCODE_RDMA_WRITE_LAST = 0x08,
- IBV_OPCODE_RDMA_WRITE_LAST_WITH_IMMEDIATE = 0x09,
- IBV_OPCODE_RDMA_WRITE_ONLY = 0x0a,
- IBV_OPCODE_RDMA_WRITE_ONLY_WITH_IMMEDIATE = 0x0b,
- IBV_OPCODE_RDMA_READ_REQUEST = 0x0c,
- IBV_OPCODE_RDMA_READ_RESPONSE_FIRST = 0x0d,
- IBV_OPCODE_RDMA_READ_RESPONSE_MIDDLE = 0x0e,
- IBV_OPCODE_RDMA_READ_RESPONSE_LAST = 0x0f,
- IBV_OPCODE_RDMA_READ_RESPONSE_ONLY = 0x10,
- IBV_OPCODE_ACKNOWLEDGE = 0x11,
- IBV_OPCODE_ATOMIC_ACKNOWLEDGE = 0x12,
- IBV_OPCODE_COMPARE_SWAP = 0x13,
- IBV_OPCODE_FETCH_ADD = 0x14,
+ RDMAV_OPCODE_SEND_FIRST = 0x00,
+ RDMAV_OPCODE_SEND_MIDDLE = 0x01,
+ RDMAV_OPCODE_SEND_LAST = 0x02,
+ RDMAV_OPCODE_SEND_LAST_WITH_IMMEDIATE = 0x03,
+ RDMAV_OPCODE_SEND_ONLY = 0x04,
+ RDMAV_OPCODE_SEND_ONLY_WITH_IMMEDIATE = 0x05,
+ RDMAV_OPCODE_RDMA_WRITE_FIRST = 0x06,
+ RDMAV_OPCODE_RDMA_WRITE_MIDDLE = 0x07,
+ RDMAV_OPCODE_RDMA_WRITE_LAST = 0x08,
+ RDMAV_OPCODE_RDMA_WRITE_LAST_WITH_IMMEDIATE = 0x09,
+ RDMAV_OPCODE_RDMA_WRITE_ONLY = 0x0a,
+ RDMAV_OPCODE_RDMA_WRITE_ONLY_WITH_IMMEDIATE = 0x0b,
+ RDMAV_OPCODE_RDMA_READ_REQUEST = 0x0c,
+ RDMAV_OPCODE_RDMA_READ_RESPONSE_FIRST = 0x0d,
+ RDMAV_OPCODE_RDMA_READ_RESPONSE_MIDDLE = 0x0e,
+ RDMAV_OPCODE_RDMA_READ_RESPONSE_LAST = 0x0f,
+ RDMAV_OPCODE_RDMA_READ_RESPONSE_ONLY = 0x10,
+ RDMAV_OPCODE_ACKNOWLEDGE = 0x11,
+ RDMAV_OPCODE_ATOMIC_ACKNOWLEDGE = 0x12,
+ RDMAV_OPCODE_COMPARE_SWAP = 0x13,
+ RDMAV_OPCODE_FETCH_ADD = 0x14,
- /* real constants follow -- see comment about above IBV_OPCODE()
+ /* real constants follow -- see comment about above RDMAV_OPCODE()
macro for more details */
/* RC */
- IBV_OPCODE(RC, SEND_FIRST),
- IBV_OPCODE(RC, SEND_MIDDLE),
- IBV_OPCODE(RC, SEND_LAST),
- IBV_OPCODE(RC, SEND_LAST_WITH_IMMEDIATE),
- IBV_OPCODE(RC, SEND_ONLY),
- IBV_OPCODE(RC, SEND_ONLY_WITH_IMMEDIATE),
- IBV_OPCODE(RC, RDMA_WRITE_FIRST),
- IBV_OPCODE(RC, RDMA_WRITE_MIDDLE),
- IBV_OPCODE(RC, RDMA_WRITE_LAST),
- IBV_OPCODE(RC, RDMA_WRITE_LAST_WITH_IMMEDIATE),
- IBV_OPCODE(RC, RDMA_WRITE_ONLY),
- IBV_OPCODE(RC, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
- IBV_OPCODE(RC, RDMA_READ_REQUEST),
- IBV_OPCODE(RC, RDMA_READ_RESPONSE_FIRST),
- IBV_OPCODE(RC, RDMA_READ_RESPONSE_MIDDLE),
- IBV_OPCODE(RC, RDMA_READ_RESPONSE_LAST),
- IBV_OPCODE(RC, RDMA_READ_RESPONSE_ONLY),
- IBV_OPCODE(RC, ACKNOWLEDGE),
- IBV_OPCODE(RC, ATOMIC_ACKNOWLEDGE),
- IBV_OPCODE(RC, COMPARE_SWAP),
- IBV_OPCODE(RC, FETCH_ADD),
+ RDMAV_OPCODE(RC, SEND_FIRST),
+ RDMAV_OPCODE(RC, SEND_MIDDLE),
+ RDMAV_OPCODE(RC, SEND_LAST),
+ RDMAV_OPCODE(RC, SEND_LAST_WITH_IMMEDIATE),
+ RDMAV_OPCODE(RC, SEND_ONLY),
+ RDMAV_OPCODE(RC, SEND_ONLY_WITH_IMMEDIATE),
+ RDMAV_OPCODE(RC, RDMA_WRITE_FIRST),
+ RDMAV_OPCODE(RC, RDMA_WRITE_MIDDLE),
+ RDMAV_OPCODE(RC, RDMA_WRITE_LAST),
+ RDMAV_OPCODE(RC, RDMA_WRITE_LAST_WITH_IMMEDIATE),
+ RDMAV_OPCODE(RC, RDMA_WRITE_ONLY),
+ RDMAV_OPCODE(RC, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
+ RDMAV_OPCODE(RC, RDMA_READ_REQUEST),
+ RDMAV_OPCODE(RC, RDMA_READ_RESPONSE_FIRST),
+ RDMAV_OPCODE(RC, RDMA_READ_RESPONSE_MIDDLE),
+ RDMAV_OPCODE(RC, RDMA_READ_RESPONSE_LAST),
+ RDMAV_OPCODE(RC, RDMA_READ_RESPONSE_ONLY),
+ RDMAV_OPCODE(RC, ACKNOWLEDGE),
+ RDMAV_OPCODE(RC, ATOMIC_ACKNOWLEDGE),
+ RDMAV_OPCODE(RC, COMPARE_SWAP),
+ RDMAV_OPCODE(RC, FETCH_ADD),
/* UC */
- IBV_OPCODE(UC, SEND_FIRST),
- IBV_OPCODE(UC, SEND_MIDDLE),
- IBV_OPCODE(UC, SEND_LAST),
- IBV_OPCODE(UC, SEND_LAST_WITH_IMMEDIATE),
- IBV_OPCODE(UC, SEND_ONLY),
- IBV_OPCODE(UC, SEND_ONLY_WITH_IMMEDIATE),
- IBV_OPCODE(UC, RDMA_WRITE_FIRST),
- IBV_OPCODE(UC, RDMA_WRITE_MIDDLE),
- IBV_OPCODE(UC, RDMA_WRITE_LAST),
- IBV_OPCODE(UC, RDMA_WRITE_LAST_WITH_IMMEDIATE),
- IBV_OPCODE(UC, RDMA_WRITE_ONLY),
- IBV_OPCODE(UC, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
+ RDMAV_OPCODE(UC, SEND_FIRST),
+ RDMAV_OPCODE(UC, SEND_MIDDLE),
+ RDMAV_OPCODE(UC, SEND_LAST),
+ RDMAV_OPCODE(UC, SEND_LAST_WITH_IMMEDIATE),
+ RDMAV_OPCODE(UC, SEND_ONLY),
+ RDMAV_OPCODE(UC, SEND_ONLY_WITH_IMMEDIATE),
+ RDMAV_OPCODE(UC, RDMA_WRITE_FIRST),
+ RDMAV_OPCODE(UC, RDMA_WRITE_MIDDLE),
+ RDMAV_OPCODE(UC, RDMA_WRITE_LAST),
+ RDMAV_OPCODE(UC, RDMA_WRITE_LAST_WITH_IMMEDIATE),
+ RDMAV_OPCODE(UC, RDMA_WRITE_ONLY),
+ RDMAV_OPCODE(UC, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
/* RD */
- IBV_OPCODE(RD, SEND_FIRST),
- IBV_OPCODE(RD, SEND_MIDDLE),
- IBV_OPCODE(RD, SEND_LAST),
- IBV_OPCODE(RD, SEND_LAST_WITH_IMMEDIATE),
- IBV_OPCODE(RD, SEND_ONLY),
- IBV_OPCODE(RD, SEND_ONLY_WITH_IMMEDIATE),
- IBV_OPCODE(RD, RDMA_WRITE_FIRST),
- IBV_OPCODE(RD, RDMA_WRITE_MIDDLE),
- IBV_OPCODE(RD, RDMA_WRITE_LAST),
- IBV_OPCODE(RD, RDMA_WRITE_LAST_WITH_IMMEDIATE),
- IBV_OPCODE(RD, RDMA_WRITE_ONLY),
- IBV_OPCODE(RD, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
- IBV_OPCODE(RD, RDMA_READ_REQUEST),
- IBV_OPCODE(RD, RDMA_READ_RESPONSE_FIRST),
- IBV_OPCODE(RD, RDMA_READ_RESPONSE_MIDDLE),
- IBV_OPCODE(RD, RDMA_READ_RESPONSE_LAST),
- IBV_OPCODE(RD, RDMA_READ_RESPONSE_ONLY),
- IBV_OPCODE(RD, ACKNOWLEDGE),
- IBV_OPCODE(RD, ATOMIC_ACKNOWLEDGE),
- IBV_OPCODE(RD, COMPARE_SWAP),
- IBV_OPCODE(RD, FETCH_ADD),
+ RDMAV_OPCODE(RD, SEND_FIRST),
+ RDMAV_OPCODE(RD, SEND_MIDDLE),
+ RDMAV_OPCODE(RD, SEND_LAST),
+ RDMAV_OPCODE(RD, SEND_LAST_WITH_IMMEDIATE),
+ RDMAV_OPCODE(RD, SEND_ONLY),
+ RDMAV_OPCODE(RD, SEND_ONLY_WITH_IMMEDIATE),
+ RDMAV_OPCODE(RD, RDMA_WRITE_FIRST),
+ RDMAV_OPCODE(RD, RDMA_WRITE_MIDDLE),
+ RDMAV_OPCODE(RD, RDMA_WRITE_LAST),
+ RDMAV_OPCODE(RD, RDMA_WRITE_LAST_WITH_IMMEDIATE),
+ RDMAV_OPCODE(RD, RDMA_WRITE_ONLY),
+ RDMAV_OPCODE(RD, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
+ RDMAV_OPCODE(RD, RDMA_READ_REQUEST),
+ RDMAV_OPCODE(RD, RDMA_READ_RESPONSE_FIRST),
+ RDMAV_OPCODE(RD, RDMA_READ_RESPONSE_MIDDLE),
+ RDMAV_OPCODE(RD, RDMA_READ_RESPONSE_LAST),
+ RDMAV_OPCODE(RD, RDMA_READ_RESPONSE_ONLY),
+ RDMAV_OPCODE(RD, ACKNOWLEDGE),
+ RDMAV_OPCODE(RD, ATOMIC_ACKNOWLEDGE),
+ RDMAV_OPCODE(RD, COMPARE_SWAP),
+ RDMAV_OPCODE(RD, FETCH_ADD),
/* UD */
- IBV_OPCODE(UD, SEND_ONLY),
- IBV_OPCODE(UD, SEND_ONLY_WITH_IMMEDIATE)
+ RDMAV_OPCODE(UD, SEND_ONLY),
+ RDMAV_OPCODE(UD, SEND_ONLY_WITH_IMMEDIATE)
};
-#endif /* INFINIBAND_OPCODE_H */
+#endif /* RDMAV_OPCODE_H */
diff -ruNp ORG/libibverbs/include/infiniband/sa-kern-abi.h NEW/libibverbs/include/infiniband/sa-kern-abi.h
--- ORG/libibverbs/include/infiniband/sa-kern-abi.h 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/include/infiniband/sa-kern-abi.h 2006-08-02 18:24:49.000000000 -0700
@@ -30,8 +30,8 @@
* SOFTWARE.
*/
-#ifndef INFINIBAND_SA_KERN_ABI_H
-#define INFINIBAND_SA_KERN_ABI_H
+#ifndef RDMAV_SA_KERN_ABI_H
+#define RDMAV_SA_KERN_ABI_H
#include <linux/types.h>
@@ -40,7 +40,7 @@
*/
#define ib_kern_path_rec ibv_kern_path_rec
-struct ibv_kern_path_rec {
+struct rdmav_kern_path_rec {
__u8 dgid[16];
__u8 sgid[16];
__u16 dlid;
@@ -62,4 +62,4 @@ struct ibv_kern_path_rec {
__u8 preference;
};
-#endif /* INFINIBAND_SA_KERN_ABI_H */
+#endif /* RDMAV_SA_KERN_ABI_H */
diff -ruNp ORG/libibverbs/include/infiniband/sa.h NEW/libibverbs/include/infiniband/sa.h
--- ORG/libibverbs/include/infiniband/sa.h 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/include/infiniband/sa.h 2006-08-02 18:24:49.000000000 -0700
@@ -33,16 +33,16 @@
* $Id: sa.h 2616 2005-06-15 15:22:39Z halr $
*/
-#ifndef INFINIBAND_SA_H
-#define INFINIBAND_SA_H
+#ifndef RDMAV_SA_H
+#define RDMAV_SA_H
#include <infiniband/verbs.h>
-struct ibv_sa_path_rec {
+struct rdmav_sa_path_rec {
/* reserved */
/* reserved */
- union ibv_gid dgid;
- union ibv_gid sgid;
+ union rdmav_gid dgid;
+ union rdmav_gid sgid;
uint16_t dlid;
uint16_t slid;
int raw_traffic;
@@ -64,9 +64,9 @@ struct ibv_sa_path_rec {
uint8_t preference;
};
-struct ibv_sa_mcmember_rec {
- union ibv_gid mgid;
- union ibv_gid port_gid;
+struct rdmav_sa_mcmember_rec {
+ union rdmav_gid mgid;
+ union rdmav_gid port_gid;
uint32_t qkey;
uint16_t mlid;
uint8_t mtu_selector;
@@ -85,9 +85,9 @@ struct ibv_sa_mcmember_rec {
int proxy_join;
};
-struct ibv_sa_service_rec {
+struct rdmav_sa_service_rec {
uint64_t id;
- union ibv_gid gid;
+ union rdmav_gid gid;
uint16_t pkey;
/* uint16_t resv; */
uint32_t lease;
@@ -99,4 +99,4 @@ struct ibv_sa_service_rec {
uint64_t data64[2];
};
-#endif /* INFINIBAND_SA_H */
+#endif /* RDMAV_SA_H */
diff -ruNp ORG/libibverbs/include/infiniband/verbs.h NEW/libibverbs/include/infiniband/verbs.h
--- ORG/libibverbs/include/infiniband/verbs.h 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/include/infiniband/verbs.h 2006-08-03 17:29:08.000000000 -0700
@@ -35,11 +35,12 @@
* $Id: verbs.h 8076 2006-06-16 18:26:34Z sean.hefty $
*/
-#ifndef INFINIBAND_VERBS_H
-#define INFINIBAND_VERBS_H
+#ifndef RDMAV_VERBS_H
+#define RDMAV_VERBS_H
#include <stdint.h>
#include <pthread.h>
+#include "deprecate.h"
#ifdef __cplusplus
# define BEGIN_C_DECLS extern "C" {
@@ -57,7 +58,7 @@
BEGIN_C_DECLS
-union ibv_gid {
+union rdmav_gid {
uint8_t raw[16];
struct {
uint64_t subnet_prefix;
@@ -65,37 +66,37 @@ union ibv_gid {
} global;
};
-enum ibv_node_type {
- IBV_NODE_CA = 1,
- IBV_NODE_SWITCH,
- IBV_NODE_ROUTER
-};
-
-enum ibv_device_cap_flags {
- IBV_DEVICE_RESIZE_MAX_WR = 1,
- IBV_DEVICE_BAD_PKEY_CNTR = 1 << 1,
- IBV_DEVICE_BAD_QKEY_CNTR = 1 << 2,
- IBV_DEVICE_RAW_MULTI = 1 << 3,
- IBV_DEVICE_AUTO_PATH_MIG = 1 << 4,
- IBV_DEVICE_CHANGE_PHY_PORT = 1 << 5,
- IBV_DEVICE_UD_AV_PORT_ENFORCE = 1 << 6,
- IBV_DEVICE_CURR_QP_STATE_MOD = 1 << 7,
- IBV_DEVICE_SHUTDOWN_PORT = 1 << 8,
- IBV_DEVICE_INIT_TYPE = 1 << 9,
- IBV_DEVICE_PORT_ACTIVE_EVENT = 1 << 10,
- IBV_DEVICE_SYS_IMAGE_GUID = 1 << 11,
- IBV_DEVICE_RC_RNR_NAK_GEN = 1 << 12,
- IBV_DEVICE_SRQ_RESIZE = 1 << 13,
- IBV_DEVICE_N_NOTIFY_CQ = 1 << 14
-};
-
-enum ibv_atomic_cap {
- IBV_ATOMIC_NONE,
- IBV_ATOMIC_HCA,
- IBV_ATOMIC_GLOB
+enum rdmav_node_type {
+ RDMAV_NODE_CA = 1,
+ RDMAV_NODE_SWITCH,
+ RDMAV_NODE_ROUTER
+};
+
+enum rdmav_device_cap_flags {
+ RDMAV_DEVICE_RESIZE_MAX_WR = 1,
+ RDMAV_DEVICE_BAD_PKEY_CNTR = 1 << 1,
+ RDMAV_DEVICE_BAD_QKEY_CNTR = 1 << 2,
+ RDMAV_DEVICE_RAW_MULTI = 1 << 3,
+ RDMAV_DEVICE_AUTO_PATH_MIG = 1 << 4,
+ RDMAV_DEVICE_CHANGE_PHY_PORT = 1 << 5,
+ RDMAV_DEVICE_UD_AV_PORT_ENFORCE = 1 << 6,
+ RDMAV_DEVICE_CURR_QP_STATE_MOD = 1 << 7,
+ RDMAV_DEVICE_SHUTDOWN_PORT = 1 << 8,
+ RDMAV_DEVICE_INIT_TYPE = 1 << 9,
+ RDMAV_DEVICE_PORT_ACTIVE_EVENT = 1 << 10,
+ RDMAV_DEVICE_SYS_IMAGE_GUID = 1 << 11,
+ RDMAV_DEVICE_RC_RNR_NAK_GEN = 1 << 12,
+ RDMAV_DEVICE_SRQ_RESIZE = 1 << 13,
+ RDMAV_DEVICE_N_NOTIFY_CQ = 1 << 14
+};
+
+enum rdmav_atomic_cap {
+ RDMAV_ATOMIC_NONE,
+ RDMAV_ATOMIC_HCA,
+ RDMAV_ATOMIC_GLOB
};
-struct ibv_device_attr {
+struct rdmav_device_attr {
char fw_ver[64];
uint64_t node_guid;
uint64_t sys_image_guid;
@@ -118,7 +119,7 @@ struct ibv_device_attr {
int max_res_rd_atom;
int max_qp_init_rd_atom;
int max_ee_init_rd_atom;
- enum ibv_atomic_cap atomic_cap;
+ enum rdmav_atomic_cap atomic_cap;
int max_ee;
int max_rdd;
int max_mw;
@@ -138,27 +139,27 @@ struct ibv_device_attr {
uint8_t phys_port_cnt;
};
-enum ibv_mtu {
- IBV_MTU_256 = 1,
- IBV_MTU_512 = 2,
- IBV_MTU_1024 = 3,
- IBV_MTU_2048 = 4,
- IBV_MTU_4096 = 5
-};
-
-enum ibv_port_state {
- IBV_PORT_NOP = 0,
- IBV_PORT_DOWN = 1,
- IBV_PORT_INIT = 2,
- IBV_PORT_ARMED = 3,
- IBV_PORT_ACTIVE = 4,
- IBV_PORT_ACTIVE_DEFER = 5
-};
-
-struct ibv_port_attr {
- enum ibv_port_state state;
- enum ibv_mtu max_mtu;
- enum ibv_mtu active_mtu;
+enum rdmav_mtu {
+ RDMAV_MTU_256 = 1,
+ RDMAV_MTU_512 = 2,
+ RDMAV_MTU_1024 = 3,
+ RDMAV_MTU_2048 = 4,
+ RDMAV_MTU_4096 = 5
+};
+
+enum rdmav_port_state {
+ RDMAV_PORT_NOP = 0,
+ RDMAV_PORT_DOWN = 1,
+ RDMAV_PORT_INIT = 2,
+ RDMAV_PORT_ARMED = 3,
+ RDMAV_PORT_ACTIVE = 4,
+ RDMAV_PORT_ACTIVE_DEFER = 5
+};
+
+struct rdmav_port_attr {
+ enum rdmav_port_state state;
+ enum rdmav_mtu max_mtu;
+ enum rdmav_mtu active_mtu;
int gid_tbl_len;
uint32_t port_cap_flags;
uint32_t max_msg_sz;
@@ -177,165 +178,165 @@ struct ibv_port_attr {
uint8_t phys_state;
};
-enum ibv_event_type {
- IBV_EVENT_CQ_ERR,
- IBV_EVENT_QP_FATAL,
- IBV_EVENT_QP_REQ_ERR,
- IBV_EVENT_QP_ACCESS_ERR,
- IBV_EVENT_COMM_EST,
- IBV_EVENT_SQ_DRAINED,
- IBV_EVENT_PATH_MIG,
- IBV_EVENT_PATH_MIG_ERR,
- IBV_EVENT_DEVICE_FATAL,
- IBV_EVENT_PORT_ACTIVE,
- IBV_EVENT_PORT_ERR,
- IBV_EVENT_LID_CHANGE,
- IBV_EVENT_PKEY_CHANGE,
- IBV_EVENT_SM_CHANGE,
- IBV_EVENT_SRQ_ERR,
- IBV_EVENT_SRQ_LIMIT_REACHED,
- IBV_EVENT_QP_LAST_WQE_REACHED,
- IBV_EVENT_CLIENT_REREGISTER
+enum rdmav_event_type {
+ RDMAV_EVENT_CQ_ERR,
+ RDMAV_EVENT_QP_FATAL,
+ RDMAV_EVENT_QP_REQ_ERR,
+ RDMAV_EVENT_QP_ACCESS_ERR,
+ RDMAV_EVENT_COMM_EST,
+ RDMAV_EVENT_SQ_DRAINED,
+ RDMAV_EVENT_PATH_MIG,
+ RDMAV_EVENT_PATH_MIG_ERR,
+ RDMAV_EVENT_DEVICE_FATAL,
+ RDMAV_EVENT_PORT_ACTIVE,
+ RDMAV_EVENT_PORT_ERR,
+ RDMAV_EVENT_LID_CHANGE,
+ RDMAV_EVENT_PKEY_CHANGE,
+ RDMAV_EVENT_SM_CHANGE,
+ RDMAV_EVENT_SRQ_ERR,
+ RDMAV_EVENT_SRQ_LIMIT_REACHED,
+ RDMAV_EVENT_QP_LAST_WQE_REACHED,
+ RDMAV_EVENT_CLIENT_REREGISTER
};
-struct ibv_async_event {
+struct rdmav_async_event {
union {
- struct ibv_cq *cq;
- struct ibv_qp *qp;
- struct ibv_srq *srq;
+ struct rdmav_cq *cq;
+ struct rdmav_qp *qp;
+ struct rdmav_srq *srq;
int port_num;
} element;
- enum ibv_event_type event_type;
+ enum rdmav_event_type event_type;
};
-enum ibv_wc_status {
- IBV_WC_SUCCESS,
- IBV_WC_LOC_LEN_ERR,
- IBV_WC_LOC_QP_OP_ERR,
- IBV_WC_LOC_EEC_OP_ERR,
- IBV_WC_LOC_PROT_ERR,
- IBV_WC_WR_FLUSH_ERR,
- IBV_WC_MW_BIND_ERR,
- IBV_WC_BAD_RESP_ERR,
- IBV_WC_LOC_ACCESS_ERR,
- IBV_WC_REM_INV_REQ_ERR,
- IBV_WC_REM_ACCESS_ERR,
- IBV_WC_REM_OP_ERR,
- IBV_WC_RETRY_EXC_ERR,
- IBV_WC_RNR_RETRY_EXC_ERR,
- IBV_WC_LOC_RDD_VIOL_ERR,
- IBV_WC_REM_INV_RD_REQ_ERR,
- IBV_WC_REM_ABORT_ERR,
- IBV_WC_INV_EECN_ERR,
- IBV_WC_INV_EEC_STATE_ERR,
- IBV_WC_FATAL_ERR,
- IBV_WC_RESP_TIMEOUT_ERR,
- IBV_WC_GENERAL_ERR
-};
-
-enum ibv_wc_opcode {
- IBV_WC_SEND,
- IBV_WC_RDMA_WRITE,
- IBV_WC_RDMA_READ,
- IBV_WC_COMP_SWAP,
- IBV_WC_FETCH_ADD,
- IBV_WC_BIND_MW,
+enum rdmav_wc_status {
+ RDMAV_WC_SUCCESS,
+ RDMAV_WC_LOC_LEN_ERR,
+ RDMAV_WC_LOC_QP_OP_ERR,
+ RDMAV_WC_LOC_EEC_OP_ERR,
+ RDMAV_WC_LOC_PROT_ERR,
+ RDMAV_WC_WR_FLUSH_ERR,
+ RDMAV_WC_MW_BIND_ERR,
+ RDMAV_WC_BAD_RESP_ERR,
+ RDMAV_WC_LOC_ACCESS_ERR,
+ RDMAV_WC_REM_INV_REQ_ERR,
+ RDMAV_WC_REM_ACCESS_ERR,
+ RDMAV_WC_REM_OP_ERR,
+ RDMAV_WC_RETRY_EXC_ERR,
+ RDMAV_WC_RNR_RETRY_EXC_ERR,
+ RDMAV_WC_LOC_RDD_VIOL_ERR,
+ RDMAV_WC_REM_INV_RD_REQ_ERR,
+ RDMAV_WC_REM_ABORT_ERR,
+ RDMAV_WC_INV_EECN_ERR,
+ RDMAV_WC_INV_EEC_STATE_ERR,
+ RDMAV_WC_FATAL_ERR,
+ RDMAV_WC_RESP_TIMEOUT_ERR,
+ RDMAV_WC_GENERAL_ERR
+};
+
+enum rdmav_wc_opcode {
+ RDMAV_WC_SEND,
+ RDMAV_WC_RDMA_WRITE,
+ RDMAV_WC_RDMA_READ,
+ RDMAV_WC_COMP_SWAP,
+ RDMAV_WC_FETCH_ADD,
+ RDMAV_WC_BIND_MW,
/*
- * Set value of IBV_WC_RECV so consumers can test if a completion is a
- * receive by testing (opcode & IBV_WC_RECV).
+ * Set value of RDMAV_WC_RECV so consumers can test if a completion is a
+ * receive by testing (opcode & RDMAV_WC_RECV).
*/
- IBV_WC_RECV = 1 << 7,
- IBV_WC_RECV_RDMA_WITH_IMM
+ RDMAV_WC_RECV = 1 << 7,
+ RDMAV_WC_RECV_RDMA_WITH_IMM
};
-enum ibv_wc_flags {
- IBV_WC_GRH = 1 << 0,
- IBV_WC_WITH_IMM = 1 << 1
+enum rdmav_wc_flags {
+ RDMAV_WC_GRH = 1 << 0,
+ RDMAV_WC_WITH_IMM = 1 << 1
};
-struct ibv_wc {
+struct rdmav_wc {
uint64_t wr_id;
- enum ibv_wc_status status;
- enum ibv_wc_opcode opcode;
+ enum rdmav_wc_status status;
+ enum rdmav_wc_opcode opcode;
uint32_t vendor_err;
uint32_t byte_len;
uint32_t imm_data; /* in network byte order */
uint32_t qp_num;
uint32_t src_qp;
- enum ibv_wc_flags wc_flags;
+ enum rdmav_wc_flags wc_flags;
uint16_t pkey_index;
uint16_t slid;
uint8_t sl;
uint8_t dlid_path_bits;
};
-enum ibv_access_flags {
- IBV_ACCESS_LOCAL_WRITE = 1,
- IBV_ACCESS_REMOTE_WRITE = (1<<1),
- IBV_ACCESS_REMOTE_READ = (1<<2),
- IBV_ACCESS_REMOTE_ATOMIC = (1<<3),
- IBV_ACCESS_MW_BIND = (1<<4)
+enum rdmav_access_flags {
+ RDMAV_ACCESS_LOCAL_WRITE = 1,
+ RDMAV_ACCESS_REMOTE_WRITE = (1<<1),
+ RDMAV_ACCESS_REMOTE_READ = (1<<2),
+ RDMAV_ACCESS_REMOTE_ATOMIC = (1<<3),
+ RDMAV_ACCESS_MW_BIND = (1<<4)
};
-struct ibv_pd {
- struct ibv_context *context;
+struct rdmav_pd {
+ struct rdmav_context *context;
uint32_t handle;
};
-struct ibv_mr {
- struct ibv_context *context;
- struct ibv_pd *pd;
+struct rdmav_mr {
+ struct rdmav_context *context;
+ struct rdmav_pd *pd;
uint32_t handle;
uint32_t lkey;
uint32_t rkey;
};
-struct ibv_global_route {
- union ibv_gid dgid;
+struct rdmav_global_route {
+ union rdmav_gid dgid;
uint32_t flow_label;
uint8_t sgid_index;
uint8_t hop_limit;
uint8_t traffic_class;
};
-struct ibv_grh {
+struct rdmav_grh {
uint32_t version_tclass_flow;
uint16_t paylen;
uint8_t next_hdr;
uint8_t hop_limit;
- union ibv_gid sgid;
- union ibv_gid dgid;
+ union rdmav_gid sgid;
+ union rdmav_gid dgid;
};
-enum ibv_rate {
- IBV_RATE_MAX = 0,
- IBV_RATE_2_5_GBPS = 2,
- IBV_RATE_5_GBPS = 5,
- IBV_RATE_10_GBPS = 3,
- IBV_RATE_20_GBPS = 6,
- IBV_RATE_30_GBPS = 4,
- IBV_RATE_40_GBPS = 7,
- IBV_RATE_60_GBPS = 8,
- IBV_RATE_80_GBPS = 9,
- IBV_RATE_120_GBPS = 10
+enum rdmav_rate {
+ RDMAV_RATE_MAX = 0,
+ RDMAV_RATE_2_5_GBPS = 2,
+ RDMAV_RATE_5_GBPS = 5,
+ RDMAV_RATE_10_GBPS = 3,
+ RDMAV_RATE_20_GBPS = 6,
+ RDMAV_RATE_30_GBPS = 4,
+ RDMAV_RATE_40_GBPS = 7,
+ RDMAV_RATE_60_GBPS = 8,
+ RDMAV_RATE_80_GBPS = 9,
+ RDMAV_RATE_120_GBPS = 10
};
/**
- * ibv_rate_to_mult - Convert the IB rate enum to a multiple of the
- * base rate of 2.5 Gbit/sec. For example, IBV_RATE_5_GBPS will be
+ * rdmav_rate_to_mult - Convert the IB rate enum to a multiple of the
+ * base rate of 2.5 Gbit/sec. For example, RDMAV_RATE_5_GBPS will be
* converted to 2, since 5 Gbit/sec is 2 * 2.5 Gbit/sec.
* @rate: rate to convert.
*/
-int ibv_rate_to_mult(enum ibv_rate rate) __attribute_const;
+int rdmav_rate_to_mult(enum rdmav_rate rate) __attribute_const;
/**
- * mult_to_ibv_rate - Convert a multiple of 2.5 Gbit/sec to an IB rate enum.
+ * mult_to_rdmav_rate - Convert a multiple of 2.5 Gbit/sec to an IB rate enum.
* @mult: multiple to convert.
*/
-enum ibv_rate mult_to_ibv_rate(int mult) __attribute_const;
+enum rdmav_rate mult_to_rdmav_rate(int mult) __attribute_const;
-struct ibv_ah_attr {
- struct ibv_global_route grh;
+struct rdmav_ah_attr {
+ struct rdmav_global_route grh;
uint16_t dlid;
uint8_t sl;
uint8_t src_path_bits;
@@ -344,29 +345,29 @@ struct ibv_ah_attr {
uint8_t port_num;
};
-enum ibv_srq_attr_mask {
- IBV_SRQ_MAX_WR = 1 << 0,
- IBV_SRQ_LIMIT = 1 << 1
+enum rdmav_srq_attr_mask {
+ RDMAV_SRQ_MAX_WR = 1 << 0,
+ RDMAV_SRQ_LIMIT = 1 << 1
};
-struct ibv_srq_attr {
+struct rdmav_srq_attr {
uint32_t max_wr;
uint32_t max_sge;
uint32_t srq_limit;
};
-struct ibv_srq_init_attr {
+struct rdmav_srq_init_attr {
void *srq_context;
- struct ibv_srq_attr attr;
+ struct rdmav_srq_attr attr;
};
-enum ibv_qp_type {
- IBV_QPT_RC = 2,
- IBV_QPT_UC,
- IBV_QPT_UD
+enum rdmav_qp_type {
+ RDMAV_QPT_RC = 2,
+ RDMAV_QPT_UC,
+ RDMAV_QPT_UD
};
-struct ibv_qp_cap {
+struct rdmav_qp_cap {
uint32_t max_send_wr;
uint32_t max_recv_wr;
uint32_t max_send_sge;
@@ -374,69 +375,69 @@ struct ibv_qp_cap {
uint32_t max_inline_data;
};
-struct ibv_qp_init_attr {
+struct rdmav_qp_init_attr {
void *qp_context;
- struct ibv_cq *send_cq;
- struct ibv_cq *recv_cq;
- struct ibv_srq *srq;
- struct ibv_qp_cap cap;
- enum ibv_qp_type qp_type;
+ struct rdmav_cq *send_cq;
+ struct rdmav_cq *recv_cq;
+ struct rdmav_srq *srq;
+ struct rdmav_qp_cap cap;
+ enum rdmav_qp_type qp_type;
int sq_sig_all;
};
-enum ibv_qp_attr_mask {
- IBV_QP_STATE = 1 << 0,
- IBV_QP_CUR_STATE = 1 << 1,
- IBV_QP_EN_SQD_ASYNC_NOTIFY = 1 << 2,
- IBV_QP_ACCESS_FLAGS = 1 << 3,
- IBV_QP_PKEY_INDEX = 1 << 4,
- IBV_QP_PORT = 1 << 5,
- IBV_QP_QKEY = 1 << 6,
- IBV_QP_AV = 1 << 7,
- IBV_QP_PATH_MTU = 1 << 8,
- IBV_QP_TIMEOUT = 1 << 9,
- IBV_QP_RETRY_CNT = 1 << 10,
- IBV_QP_RNR_RETRY = 1 << 11,
- IBV_QP_RQ_PSN = 1 << 12,
- IBV_QP_MAX_QP_RD_ATOMIC = 1 << 13,
- IBV_QP_ALT_PATH = 1 << 14,
- IBV_QP_MIN_RNR_TIMER = 1 << 15,
- IBV_QP_SQ_PSN = 1 << 16,
- IBV_QP_MAX_DEST_RD_ATOMIC = 1 << 17,
- IBV_QP_PATH_MIG_STATE = 1 << 18,
- IBV_QP_CAP = 1 << 19,
- IBV_QP_DEST_QPN = 1 << 20
-};
-
-enum ibv_qp_state {
- IBV_QPS_RESET,
- IBV_QPS_INIT,
- IBV_QPS_RTR,
- IBV_QPS_RTS,
- IBV_QPS_SQD,
- IBV_QPS_SQE,
- IBV_QPS_ERR
-};
-
-enum ibv_mig_state {
- IBV_MIG_MIGRATED,
- IBV_MIG_REARM,
- IBV_MIG_ARMED
-};
-
-struct ibv_qp_attr {
- enum ibv_qp_state qp_state;
- enum ibv_qp_state cur_qp_state;
- enum ibv_mtu path_mtu;
- enum ibv_mig_state path_mig_state;
+enum rdmav_qp_attr_mask {
+ RDMAV_QP_STATE = 1 << 0,
+ RDMAV_QP_CUR_STATE = 1 << 1,
+ RDMAV_QP_EN_SQD_ASYNC_NOTIFY = 1 << 2,
+ RDMAV_QP_ACCESS_FLAGS = 1 << 3,
+ RDMAV_QP_PKEY_INDEX = 1 << 4,
+ RDMAV_QP_PORT = 1 << 5,
+ RDMAV_QP_QKEY = 1 << 6,
+ RDMAV_QP_AV = 1 << 7,
+ RDMAV_QP_PATH_MTU = 1 << 8,
+ RDMAV_QP_TIMEOUT = 1 << 9,
+ RDMAV_QP_RETRY_CNT = 1 << 10,
+ RDMAV_QP_RNR_RETRY = 1 << 11,
+ RDMAV_QP_RQ_PSN = 1 << 12,
+ RDMAV_QP_MAX_QP_RD_ATOMIC = 1 << 13,
+ RDMAV_QP_ALT_PATH = 1 << 14,
+ RDMAV_QP_MIN_RNR_TIMER = 1 << 15,
+ RDMAV_QP_SQ_PSN = 1 << 16,
+ RDMAV_QP_MAX_DEST_RD_ATOMIC = 1 << 17,
+ RDMAV_QP_PATH_MIG_STATE = 1 << 18,
+ RDMAV_QP_CAP = 1 << 19,
+ RDMAV_QP_DEST_QPN = 1 << 20
+};
+
+enum rdmav_qp_state {
+ RDMAV_QPS_RESET,
+ RDMAV_QPS_INIT,
+ RDMAV_QPS_RTR,
+ RDMAV_QPS_RTS,
+ RDMAV_QPS_SQD,
+ RDMAV_QPS_SQE,
+ RDMAV_QPS_ERR
+};
+
+enum rdmav_mig_state {
+ RDMAV_MIG_MIGRATED,
+ RDMAV_MIG_REARM,
+ RDMAV_MIG_ARMED
+};
+
+struct rdmav_qp_attr {
+ enum rdmav_qp_state qp_state;
+ enum rdmav_qp_state cur_qp_state;
+ enum rdmav_mtu path_mtu;
+ enum rdmav_mig_state path_mig_state;
uint32_t qkey;
uint32_t rq_psn;
uint32_t sq_psn;
uint32_t dest_qp_num;
int qp_access_flags;
- struct ibv_qp_cap cap;
- struct ibv_ah_attr ah_attr;
- struct ibv_ah_attr alt_ah_attr;
+ struct rdmav_qp_cap cap;
+ struct rdmav_ah_attr ah_attr;
+ struct rdmav_ah_attr alt_ah_attr;
uint16_t pkey_index;
uint16_t alt_pkey_index;
uint8_t en_sqd_async_notify;
@@ -452,36 +453,36 @@ struct ibv_qp_attr {
uint8_t alt_timeout;
};
-enum ibv_wr_opcode {
- IBV_WR_RDMA_WRITE,
- IBV_WR_RDMA_WRITE_WITH_IMM,
- IBV_WR_SEND,
- IBV_WR_SEND_WITH_IMM,
- IBV_WR_RDMA_READ,
- IBV_WR_ATOMIC_CMP_AND_SWP,
- IBV_WR_ATOMIC_FETCH_AND_ADD
-};
-
-enum ibv_send_flags {
- IBV_SEND_FENCE = 1 << 0,
- IBV_SEND_SIGNALED = 1 << 1,
- IBV_SEND_SOLICITED = 1 << 2,
- IBV_SEND_INLINE = 1 << 3
+enum rdmav_wr_opcode {
+ RDMAV_WR_RDMA_WRITE,
+ RDMAV_WR_RDMA_WRITE_WITH_IMM,
+ RDMAV_WR_SEND,
+ RDMAV_WR_SEND_WITH_IMM,
+ RDMAV_WR_RDMA_READ,
+ RDMAV_WR_ATOMIC_CMP_AND_SWP,
+ RDMAV_WR_ATOMIC_FETCH_AND_ADD
+};
+
+enum rdmav_send_flags {
+ RDMAV_SEND_FENCE = 1 << 0,
+ RDMAV_SEND_SIGNALED = 1 << 1,
+ RDMAV_SEND_SOLICITED = 1 << 2,
+ RDMAV_SEND_INLINE = 1 << 3
};
-struct ibv_sge {
+struct rdmav_sge {
uint64_t addr;
uint32_t length;
uint32_t lkey;
};
-struct ibv_send_wr {
- struct ibv_send_wr *next;
+struct rdmav_send_wr {
+ struct rdmav_send_wr *next;
uint64_t wr_id;
- struct ibv_sge *sg_list;
+ struct rdmav_sge *sg_list;
int num_sge;
- enum ibv_wr_opcode opcode;
- enum ibv_send_flags send_flags;
+ enum rdmav_wr_opcode opcode;
+ enum rdmav_send_flags send_flags;
uint32_t imm_data; /* in network byte order */
union {
struct {
@@ -495,24 +496,24 @@ struct ibv_send_wr {
uint32_t rkey;
} atomic;
struct {
- struct ibv_ah *ah;
+ struct rdmav_ah *ah;
uint32_t remote_qpn;
uint32_t remote_qkey;
} ud;
} wr;
};
-struct ibv_recv_wr {
- struct ibv_recv_wr *next;
+struct rdmav_recv_wr {
+ struct rdmav_recv_wr *next;
uint64_t wr_id;
- struct ibv_sge *sg_list;
+ struct rdmav_sge *sg_list;
int num_sge;
};
-struct ibv_srq {
- struct ibv_context *context;
+struct rdmav_srq {
+ struct rdmav_context *context;
void *srq_context;
- struct ibv_pd *pd;
+ struct rdmav_pd *pd;
uint32_t handle;
pthread_mutex_t mutex;
@@ -520,29 +521,29 @@ struct ibv_srq {
uint32_t events_completed;
};
-struct ibv_qp {
- struct ibv_context *context;
+struct rdmav_qp {
+ struct rdmav_context *context;
void *qp_context;
- struct ibv_pd *pd;
- struct ibv_cq *send_cq;
- struct ibv_cq *recv_cq;
- struct ibv_srq *srq;
+ struct rdmav_pd *pd;
+ struct rdmav_cq *send_cq;
+ struct rdmav_cq *recv_cq;
+ struct rdmav_srq *srq;
uint32_t handle;
uint32_t qp_num;
- enum ibv_qp_state state;
- enum ibv_qp_type qp_type;
+ enum rdmav_qp_state state;
+ enum rdmav_qp_type qp_type;
pthread_mutex_t mutex;
pthread_cond_t cond;
uint32_t events_completed;
};
-struct ibv_comp_channel {
+struct rdmav_comp_channel {
int fd;
};
-struct ibv_cq {
- struct ibv_context *context;
+struct rdmav_cq {
+ struct rdmav_context *context;
void *cq_context;
uint32_t handle;
int cqe;
@@ -553,89 +554,89 @@ struct ibv_cq {
uint32_t async_events_completed;
};
-struct ibv_ah {
- struct ibv_context *context;
- struct ibv_pd *pd;
+struct rdmav_ah {
+ struct rdmav_context *context;
+ struct rdmav_pd *pd;
uint32_t handle;
};
-struct ibv_device;
-struct ibv_context;
+struct rdmav_device;
+struct rdmav_context;
-struct ibv_device_ops {
- struct ibv_context * (*alloc_context)(struct ibv_device *device, int cmd_fd);
- void (*free_context)(struct ibv_context *context);
+struct rdmav_device_ops {
+ struct rdmav_context * (*alloc_context)(struct rdmav_device *device, int cmd_fd);
+ void (*free_context)(struct rdmav_context *context);
};
enum {
- IBV_SYSFS_NAME_MAX = 64,
- IBV_SYSFS_PATH_MAX = 256
+ RDMAV_SYSFS_NAME_MAX = 64,
+ RDMAV_SYSFS_PATH_MAX = 256
};
-struct ibv_device {
- struct ibv_driver *driver;
- struct ibv_device_ops ops;
+struct rdmav_device {
+ struct rdmav_driver *driver;
+ struct rdmav_device_ops ops;
/* Name of underlying kernel IB device, eg "mthca0" */
- char name[IBV_SYSFS_NAME_MAX];
+ char name[RDMAV_SYSFS_NAME_MAX];
/* Name of uverbs device, eg "uverbs0" */
- char dev_name[IBV_SYSFS_NAME_MAX];
+ char dev_name[RDMAV_SYSFS_NAME_MAX];
/* Path to infiniband_verbs class device in sysfs */
- char dev_path[IBV_SYSFS_PATH_MAX];
+ char dev_path[RDMAV_SYSFS_PATH_MAX];
/* Path to infiniband class device in sysfs */
- char ibdev_path[IBV_SYSFS_PATH_MAX];
+ char ibdev_path[RDMAV_SYSFS_PATH_MAX];
};
-struct ibv_context_ops {
- int (*query_device)(struct ibv_context *context,
- struct ibv_device_attr *device_attr);
- int (*query_port)(struct ibv_context *context, uint8_t port_num,
- struct ibv_port_attr *port_attr);
- struct ibv_pd * (*alloc_pd)(struct ibv_context *context);
- int (*dealloc_pd)(struct ibv_pd *pd);
- struct ibv_mr * (*reg_mr)(struct ibv_pd *pd, void *addr, size_t length,
- enum ibv_access_flags access);
- int (*dereg_mr)(struct ibv_mr *mr);
- struct ibv_cq * (*create_cq)(struct ibv_context *context, int cqe,
- struct ibv_comp_channel *channel,
+struct rdmav_context_ops {
+ int (*query_device)(struct rdmav_context *context,
+ struct rdmav_device_attr *device_attr);
+ int (*query_port)(struct rdmav_context *context, uint8_t port_num,
+ struct rdmav_port_attr *port_attr);
+ struct rdmav_pd * (*alloc_pd)(struct rdmav_context *context);
+ int (*dealloc_pd)(struct rdmav_pd *pd);
+ struct rdmav_mr * (*reg_mr)(struct rdmav_pd *pd, void *addr, size_t length,
+ enum rdmav_access_flags access);
+ int (*dereg_mr)(struct rdmav_mr *mr);
+ struct rdmav_cq * (*create_cq)(struct rdmav_context *context, int cqe,
+ struct rdmav_comp_channel *channel,
int comp_vector);
- int (*poll_cq)(struct ibv_cq *cq, int num_entries, struct ibv_wc *wc);
- int (*req_notify_cq)(struct ibv_cq *cq, int solicited_only);
- void (*cq_event)(struct ibv_cq *cq);
- int (*resize_cq)(struct ibv_cq *cq, int cqe);
- int (*destroy_cq)(struct ibv_cq *cq);
- struct ibv_srq * (*create_srq)(struct ibv_pd *pd,
- struct ibv_srq_init_attr *srq_init_attr);
- int (*modify_srq)(struct ibv_srq *srq,
- struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask);
- int (*query_srq)(struct ibv_srq *srq,
- struct ibv_srq_attr *srq_attr);
- int (*destroy_srq)(struct ibv_srq *srq);
- int (*post_srq_recv)(struct ibv_srq *srq,
- struct ibv_recv_wr *recv_wr,
- struct ibv_recv_wr **bad_recv_wr);
- struct ibv_qp * (*create_qp)(struct ibv_pd *pd, struct ibv_qp_init_attr *attr);
- int (*query_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
- struct ibv_qp_init_attr *init_attr);
- int (*modify_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask);
- int (*destroy_qp)(struct ibv_qp *qp);
- int (*post_send)(struct ibv_qp *qp, struct ibv_send_wr *wr,
- struct ibv_send_wr **bad_wr);
- int (*post_recv)(struct ibv_qp *qp, struct ibv_recv_wr *wr,
- struct ibv_recv_wr **bad_wr);
- struct ibv_ah * (*create_ah)(struct ibv_pd *pd, struct ibv_ah_attr *attr);
- int (*destroy_ah)(struct ibv_ah *ah);
- int (*attach_mcast)(struct ibv_qp *qp, union ibv_gid *gid,
+ int (*poll_cq)(struct rdmav_cq *cq, int num_entries, struct rdmav_wc *wc);
+ int (*req_notify_cq)(struct rdmav_cq *cq, int solicited_only);
+ void (*cq_event)(struct rdmav_cq *cq);
+ int (*resize_cq)(struct rdmav_cq *cq, int cqe);
+ int (*destroy_cq)(struct rdmav_cq *cq);
+ struct rdmav_srq * (*create_srq)(struct rdmav_pd *pd,
+ struct rdmav_srq_init_attr *srq_init_attr);
+ int (*modify_srq)(struct rdmav_srq *srq,
+ struct rdmav_srq_attr *srq_attr,
+ enum rdmav_srq_attr_mask srq_attr_mask);
+ int (*query_srq)(struct rdmav_srq *srq,
+ struct rdmav_srq_attr *srq_attr);
+ int (*destroy_srq)(struct rdmav_srq *srq);
+ int (*post_srq_recv)(struct rdmav_srq *srq,
+ struct rdmav_recv_wr *recv_wr,
+ struct rdmav_recv_wr **bad_recv_wr);
+ struct rdmav_qp * (*create_qp)(struct rdmav_pd *pd, struct rdmav_qp_init_attr *attr);
+ int (*query_qp)(struct rdmav_qp *qp, struct rdmav_qp_attr *attr,
+ enum rdmav_qp_attr_mask attr_mask,
+ struct rdmav_qp_init_attr *init_attr);
+ int (*modify_qp)(struct rdmav_qp *qp, struct rdmav_qp_attr *attr,
+ enum rdmav_qp_attr_mask attr_mask);
+ int (*destroy_qp)(struct rdmav_qp *qp);
+ int (*post_send)(struct rdmav_qp *qp, struct rdmav_send_wr *wr,
+ struct rdmav_send_wr **bad_wr);
+ int (*post_recv)(struct rdmav_qp *qp, struct rdmav_recv_wr *wr,
+ struct rdmav_recv_wr **bad_wr);
+ struct rdmav_ah * (*create_ah)(struct rdmav_pd *pd, struct rdmav_ah_attr *attr);
+ int (*destroy_ah)(struct rdmav_ah *ah);
+ int (*attach_mcast)(struct rdmav_qp *qp, union rdmav_gid *gid,
uint16_t lid);
- int (*detach_mcast)(struct ibv_qp *qp, union ibv_gid *gid,
+ int (*detach_mcast)(struct rdmav_qp *qp, union rdmav_gid *gid,
uint16_t lid);
};
-struct ibv_context {
- struct ibv_device *device;
- struct ibv_context_ops ops;
+struct rdmav_context {
+ struct rdmav_device *device;
+ struct rdmav_context_ops ops;
int cmd_fd;
int async_fd;
int num_comp_vectors;
@@ -643,124 +644,124 @@ struct ibv_context {
};
/**
- * ibv_get_device_list - Get list of IB devices currently available
+ * rdmav_get_device_list - Get list of IB devices currently available
* @num_devices: optional. if non-NULL, set to the number of devices
* returned in the array.
*
* Return a NULL-terminated array of IB devices. The array can be
- * released with ibv_free_device_list().
+ * released with rdmav_free_device_list().
*/
-struct ibv_device **ibv_get_device_list(int *num_devices);
+struct rdmav_device **rdmav_get_device_list(int *num_devices);
/**
- * ibv_free_device_list - Free list from ibv_get_device_list()
+ * rdmav_free_device_list - Free list from rdmav_get_device_list()
*
- * Free an array of devices returned from ibv_get_device_list(). Once
+ * Free an array of devices returned from rdmav_get_device_list(). Once
* the array is freed, pointers to devices that were not opened with
- * ibv_open_device() are no longer valid. Client code must open all
- * devices it intends to use before calling ibv_free_device_list().
+ * rdmav_open_device() are no longer valid. Client code must open all
+ * devices it intends to use before calling rdmav_free_device_list().
*/
-void ibv_free_device_list(struct ibv_device **list);
+void rdmav_free_device_list(struct rdmav_device **list);
/**
- * ibv_get_device_name - Return kernel device name
+ * rdmav_get_device_name - Return kernel device name
*/
-const char *ibv_get_device_name(struct ibv_device *device);
+const char *rdmav_get_device_name(struct rdmav_device *device);
/**
- * ibv_get_device_guid - Return device's node GUID
+ * rdmav_get_device_guid - Return device's node GUID
*/
-uint64_t ibv_get_device_guid(struct ibv_device *device);
+uint64_t rdmav_get_device_guid(struct rdmav_device *device);
/**
- * ibv_open_device - Initialize device for use
+ * rdmav_open_device - Initialize device for use
*/
-struct ibv_context *ibv_open_device(struct ibv_device *device);
+struct rdmav_context *rdmav_open_device(struct rdmav_device *device);
/**
- * ibv_close_device - Release device
+ * rdmav_close_device - Release device
*/
-int ibv_close_device(struct ibv_context *context);
+int rdmav_close_device(struct rdmav_context *context);
/**
- * ibv_get_async_event - Get next async event
+ * rdmav_get_async_event - Get next async event
* @event: Pointer to use to return async event
*
- * All async events returned by ibv_get_async_event() must eventually
- * be acknowledged with ibv_ack_async_event().
+ * All async events returned by rdmav_get_async_event() must eventually
+ * be acknowledged with rdmav_ack_async_event().
*/
-int ibv_get_async_event(struct ibv_context *context,
- struct ibv_async_event *event);
+int rdmav_get_async_event(struct rdmav_context *context,
+ struct rdmav_async_event *event);
/**
- * ibv_ack_async_event - Acknowledge an async event
+ * rdmav_ack_async_event - Acknowledge an async event
* @event: Event to be acknowledged.
*
- * All async events which are returned by ibv_get_async_event() must
+ * All async events which are returned by rdmav_get_async_event() must
* be acknowledged. To avoid races, destroying an object (CQ, SRQ or
* QP) will wait for all affiliated events to be acknowledged, so
* there should be a one-to-one correspondence between acks and
* successful gets.
*/
-void ibv_ack_async_event(struct ibv_async_event *event);
+void rdmav_ack_async_event(struct rdmav_async_event *event);
/**
- * ibv_query_device - Get device properties
+ * rdmav_query_device - Get device properties
*/
-int ibv_query_device(struct ibv_context *context,
- struct ibv_device_attr *device_attr);
+int rdmav_query_device(struct rdmav_context *context,
+ struct rdmav_device_attr *device_attr);
/**
- * ibv_query_port - Get port properties
+ * rdmav_query_port - Get port properties
*/
-int ibv_query_port(struct ibv_context *context, uint8_t port_num,
- struct ibv_port_attr *port_attr);
+int rdmav_query_port(struct rdmav_context *context, uint8_t port_num,
+ struct rdmav_port_attr *port_attr);
/**
- * ibv_query_gid - Get a GID table entry
+ * rdmav_query_gid - Get a GID table entry
*/
-int ibv_query_gid(struct ibv_context *context, uint8_t port_num,
- int index, union ibv_gid *gid);
+int rdmav_query_gid(struct rdmav_context *context, uint8_t port_num,
+ int index, union rdmav_gid *gid);
/**
- * ibv_query_pkey - Get a P_Key table entry
+ * rdmav_query_pkey - Get a P_Key table entry
*/
-int ibv_query_pkey(struct ibv_context *context, uint8_t port_num,
+int rdmav_query_pkey(struct rdmav_context *context, uint8_t port_num,
int index, uint16_t *pkey);
/**
- * ibv_alloc_pd - Allocate a protection domain
+ * rdmav_alloc_pd - Allocate a protection domain
*/
-struct ibv_pd *ibv_alloc_pd(struct ibv_context *context);
+struct rdmav_pd *rdmav_alloc_pd(struct rdmav_context *context);
/**
- * ibv_dealloc_pd - Free a protection domain
+ * rdmav_dealloc_pd - Free a protection domain
*/
-int ibv_dealloc_pd(struct ibv_pd *pd);
+int rdmav_dealloc_pd(struct rdmav_pd *pd);
/**
- * ibv_reg_mr - Register a memory region
+ * rdmav_reg_mr - Register a memory region
*/
-struct ibv_mr *ibv_reg_mr(struct ibv_pd *pd, void *addr,
- size_t length, enum ibv_access_flags access);
+struct rdmav_mr *rdmav_reg_mr(struct rdmav_pd *pd, void *addr,
+ size_t length, enum rdmav_access_flags access);
/**
- * ibv_dereg_mr - Deregister a memory region
+ * rdmav_dereg_mr - Deregister a memory region
*/
-int ibv_dereg_mr(struct ibv_mr *mr);
+int rdmav_dereg_mr(struct rdmav_mr *mr);
/**
- * ibv_create_comp_channel - Create a completion event channel
+ * rdmav_create_comp_channel - Create a completion event channel
*/
-struct ibv_comp_channel *ibv_create_comp_channel(struct ibv_context *context);
+struct rdmav_comp_channel *rdmav_create_comp_channel(struct rdmav_context *context);
/**
- * ibv_destroy_comp_channel - Destroy a completion event channel
+ * rdmav_destroy_comp_channel - Destroy a completion event channel
*/
-int ibv_destroy_comp_channel(struct ibv_comp_channel *channel);
+int rdmav_destroy_comp_channel(struct rdmav_comp_channel *channel);
/**
- * ibv_create_cq - Create a completion queue
+ * rdmav_create_cq - Create a completion queue
* @context - Context CQ will be attached to
* @cqe - Minimum number of entries required for CQ
* @cq_context - Consumer-supplied context returned for completion events
@@ -769,57 +770,57 @@ int ibv_destroy_comp_channel(struct ibv_
* @comp_vector - Completion vector used to signal completion events.
* Must be >= 0 and < context->num_comp_vectors.
*/
-struct ibv_cq *ibv_create_cq(struct ibv_context *context, int cqe,
+struct rdmav_cq *rdmav_create_cq(struct rdmav_context *context, int cqe,
void *cq_context,
- struct ibv_comp_channel *channel,
+ struct rdmav_comp_channel *channel,
int comp_vector);
/**
- * ibv_resize_cq - Modifies the capacity of the CQ.
+ * rdmav_resize_cq - Modifies the capacity of the CQ.
* @cq: The CQ to resize.
* @cqe: The minimum size of the CQ.
*
* Users can examine the cq structure to determine the actual CQ size.
*/
-int ibv_resize_cq(struct ibv_cq *cq, int cqe);
+int rdmav_resize_cq(struct rdmav_cq *cq, int cqe);
/**
- * ibv_destroy_cq - Destroy a completion queue
+ * rdmav_destroy_cq - Destroy a completion queue
*/
-int ibv_destroy_cq(struct ibv_cq *cq);
+int rdmav_destroy_cq(struct rdmav_cq *cq);
/**
- * ibv_get_cq_event - Read next CQ event
+ * rdmav_get_cq_event - Read next CQ event
* @channel: Channel to get next event from.
* @cq: Used to return pointer to CQ.
* @cq_context: Used to return consumer-supplied CQ context.
*
- * All completion events returned by ibv_get_cq_event() must
- * eventually be acknowledged with ibv_ack_cq_events().
+ * All completion events returned by rdmav_get_cq_event() must
+ * eventually be acknowledged with rdmav_ack_cq_events().
*/
-int ibv_get_cq_event(struct ibv_comp_channel *channel,
- struct ibv_cq **cq, void **cq_context);
+int rdmav_get_cq_event(struct rdmav_comp_channel *channel,
+ struct rdmav_cq **cq, void **cq_context);
/**
- * ibv_ack_cq_events - Acknowledge CQ completion events
+ * rdmav_ack_cq_events - Acknowledge CQ completion events
* @cq: CQ to acknowledge events for
* @nevents: Number of events to acknowledge.
*
- * All completion events which are returned by ibv_get_cq_event() must
- * be acknowledged. To avoid races, ibv_destroy_cq() will wait for
+ * All completion events which are returned by rdmav_get_cq_event() must
+ * be acknowledged. To avoid races, rdmav_destroy_cq() will wait for
* all completion events to be acknowledged, so there should be a
* one-to-one correspondence between acks and successful gets. An
* application may accumulate multiple completion events and
- * acknowledge them in a single call to ibv_ack_cq_events() by passing
+ * acknowledge them in a single call to rdmav_ack_cq_events() by passing
* the number of events to ack in @nevents.
*/
-void ibv_ack_cq_events(struct ibv_cq *cq, unsigned int nevents);
+void rdmav_ack_cq_events(struct rdmav_cq *cq, unsigned int nevents);
/**
- * ibv_poll_cq - Poll a CQ for work completions
+ * rdmav_poll_cq - Poll a CQ for work completions
* @cq:the CQ being polled
* @num_entries:maximum number of completions to return
- * @wc:array of at least @num_entries of &struct ibv_wc where completions
+ * @wc:array of at least @num_entries of &struct rdmav_wc where completions
* will be returned
*
* Poll a CQ for (possibly multiple) completions. If the return value
@@ -828,13 +829,13 @@ void ibv_ack_cq_events(struct ibv_cq *cq
* non-negative and strictly less than num_entries, then the CQ was
* emptied.
*/
-static inline int ibv_poll_cq(struct ibv_cq *cq, int num_entries, struct ibv_wc *wc)
+static inline int rdmav_poll_cq(struct rdmav_cq *cq, int num_entries, struct rdmav_wc *wc)
{
return cq->context->ops.poll_cq(cq, num_entries, wc);
}
/**
- * ibv_req_notify_cq - Request completion notification on a CQ. An
+ * rdmav_req_notify_cq - Request completion notification on a CQ. An
* event will be added to the completion channel associated with the
* CQ when an entry is added to the CQ.
* @cq: The completion queue to request notification for.
@@ -842,83 +843,83 @@ static inline int ibv_poll_cq(struct ibv
* the next solicited CQ entry. If zero, any CQ entry, solicited or
* not, will generate an event.
*/
-static inline int ibv_req_notify_cq(struct ibv_cq *cq, int solicited_only)
+static inline int rdmav_req_notify_cq(struct rdmav_cq *cq, int solicited_only)
{
return cq->context->ops.req_notify_cq(cq, solicited_only);
}
/**
- * ibv_create_srq - Creates a SRQ associated with the specified protection
+ * rdmav_create_srq - Creates a SRQ associated with the specified protection
* domain.
* @pd: The protection domain associated with the SRQ.
* @srq_init_attr: A list of initial attributes required to create the SRQ.
*
* srq_attr->max_wr and srq_attr->max_sge are read the determine the
* requested size of the SRQ, and set to the actual values allocated
- * on return. If ibv_create_srq() succeeds, then max_wr and max_sge
+ * on return. If rdmav_create_srq() succeeds, then max_wr and max_sge
* will always be at least as large as the requested values.
*/
-struct ibv_srq *ibv_create_srq(struct ibv_pd *pd,
- struct ibv_srq_init_attr *srq_init_attr);
+struct rdmav_srq *rdmav_create_srq(struct rdmav_pd *pd,
+ struct rdmav_srq_init_attr *srq_init_attr);
/**
- * ibv_modify_srq - Modifies the attributes for the specified SRQ.
+ * rdmav_modify_srq - Modifies the attributes for the specified SRQ.
* @srq: The SRQ to modify.
* @srq_attr: On input, specifies the SRQ attributes to modify. On output,
* the current values of selected SRQ attributes are returned.
* @srq_attr_mask: A bit-mask used to specify which attributes of the SRQ
* are being modified.
*
- * The mask may contain IBV_SRQ_MAX_WR to resize the SRQ and/or
- * IBV_SRQ_LIMIT to set the SRQ's limit and request notification when
+ * The mask may contain RDMAV_SRQ_MAX_WR to resize the SRQ and/or
+ * RDMAV_SRQ_LIMIT to set the SRQ's limit and request notification when
* the number of receives queued drops below the limit.
*/
-int ibv_modify_srq(struct ibv_srq *srq,
- struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask);
+int rdmav_modify_srq(struct rdmav_srq *srq,
+ struct rdmav_srq_attr *srq_attr,
+ enum rdmav_srq_attr_mask srq_attr_mask);
/**
- * ibv_query_srq - Returns the attribute list and current values for the
+ * rdmav_query_srq - Returns the attribute list and current values for the
* specified SRQ.
* @srq: The SRQ to query.
* @srq_attr: The attributes of the specified SRQ.
*/
-int ibv_query_srq(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr);
+int rdmav_query_srq(struct rdmav_srq *srq, struct rdmav_srq_attr *srq_attr);
/**
- * ibv_destroy_srq - Destroys the specified SRQ.
+ * rdmav_destroy_srq - Destroys the specified SRQ.
* @srq: The SRQ to destroy.
*/
-int ibv_destroy_srq(struct ibv_srq *srq);
+int rdmav_destroy_srq(struct rdmav_srq *srq);
/**
- * ibv_post_srq_recv - Posts a list of work requests to the specified SRQ.
+ * rdmav_post_srq_recv - Posts a list of work requests to the specified SRQ.
* @srq: The SRQ to post the work request on.
* @recv_wr: A list of work requests to post on the receive queue.
* @bad_recv_wr: On an immediate failure, this parameter will reference
* the work request that failed to be posted on the QP.
*/
-static inline int ibv_post_srq_recv(struct ibv_srq *srq,
- struct ibv_recv_wr *recv_wr,
- struct ibv_recv_wr **bad_recv_wr)
+static inline int rdmav_post_srq_recv(struct rdmav_srq *srq,
+ struct rdmav_recv_wr *recv_wr,
+ struct rdmav_recv_wr **bad_recv_wr)
{
return srq->context->ops.post_srq_recv(srq, recv_wr, bad_recv_wr);
}
/**
- * ibv_create_qp - Create a queue pair.
+ * rdmav_create_qp - Create a queue pair.
*/
-struct ibv_qp *ibv_create_qp(struct ibv_pd *pd,
- struct ibv_qp_init_attr *qp_init_attr);
+struct rdmav_qp *rdmav_create_qp(struct rdmav_pd *pd,
+ struct rdmav_qp_init_attr *qp_init_attr);
/**
- * ibv_modify_qp - Modify a queue pair.
+ * rdmav_modify_qp - Modify a queue pair.
*/
-int ibv_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask);
+int rdmav_modify_qp(struct rdmav_qp *qp, struct rdmav_qp_attr *attr,
+ enum rdmav_qp_attr_mask attr_mask);
/**
- * ibv_query_qp - Returns the attribute list and current values for the
+ * rdmav_query_qp - Returns the attribute list and current values for the
* specified QP.
* @qp: The QP to query.
* @attr: The attributes of the specified QP.
@@ -928,40 +929,40 @@ int ibv_modify_qp(struct ibv_qp *qp, str
* The qp_attr_mask may be used to limit the query to gathering only the
* selected attributes.
*/
-int ibv_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
- struct ibv_qp_init_attr *init_attr);
+int rdmav_query_qp(struct rdmav_qp *qp, struct rdmav_qp_attr *attr,
+ enum rdmav_qp_attr_mask attr_mask,
+ struct rdmav_qp_init_attr *init_attr);
/**
- * ibv_destroy_qp - Destroy a queue pair.
+ * rdmav_destroy_qp - Destroy a queue pair.
*/
-int ibv_destroy_qp(struct ibv_qp *qp);
+int rdmav_destroy_qp(struct rdmav_qp *qp);
/**
- * ibv_post_send - Post a list of work requests to a send queue.
+ * rdmav_post_send - Post a list of work requests to a send queue.
*/
-static inline int ibv_post_send(struct ibv_qp *qp, struct ibv_send_wr *wr,
- struct ibv_send_wr **bad_wr)
+static inline int rdmav_post_send(struct rdmav_qp *qp, struct rdmav_send_wr *wr,
+ struct rdmav_send_wr **bad_wr)
{
return qp->context->ops.post_send(qp, wr, bad_wr);
}
/**
- * ibv_post_recv - Post a list of work requests to a receive queue.
+ * rdmav_post_recv - Post a list of work requests to a receive queue.
*/
-static inline int ibv_post_recv(struct ibv_qp *qp, struct ibv_recv_wr *wr,
- struct ibv_recv_wr **bad_wr)
+static inline int rdmav_post_recv(struct rdmav_qp *qp, struct rdmav_recv_wr *wr,
+ struct rdmav_recv_wr **bad_wr)
{
return qp->context->ops.post_recv(qp, wr, bad_wr);
}
/**
- * ibv_create_ah - Create an address handle.
+ * rdmav_create_ah - Create an address handle.
*/
-struct ibv_ah *ibv_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr);
+struct rdmav_ah *rdmav_create_ah(struct rdmav_pd *pd, struct rdmav_ah_attr *attr);
/**
- * ibv_init_ah_from_wc - Initializes address handle attributes from a
+ * rdmav_init_ah_from_wc - Initializes address handle attributes from a
* work completion.
* @context: Device context on which the received message arrived.
* @port_num: Port on which the received message arrived.
@@ -971,12 +972,12 @@ struct ibv_ah *ibv_create_ah(struct ibv_
* @ah_attr: Returned attributes that can be used when creating an address
* handle for replying to the message.
*/
-int ibv_init_ah_from_wc(struct ibv_context *context, uint8_t port_num,
- struct ibv_wc *wc, struct ibv_grh *grh,
- struct ibv_ah_attr *ah_attr);
+int rdmav_init_ah_from_wc(struct rdmav_context *context, uint8_t port_num,
+ struct rdmav_wc *wc, struct rdmav_grh *grh,
+ struct rdmav_ah_attr *ah_attr);
/**
- * ibv_create_ah_from_wc - Creates an address handle associated with the
+ * rdmav_create_ah_from_wc - Creates an address handle associated with the
* sender of the specified work completion.
* @pd: The protection domain associated with the address handle.
* @wc: Work completion information associated with a received message.
@@ -987,16 +988,16 @@ int ibv_init_ah_from_wc(struct ibv_conte
* The address handle is used to reference a local or global destination
* in all UD QP post sends.
*/
-struct ibv_ah *ibv_create_ah_from_wc(struct ibv_pd *pd, struct ibv_wc *wc,
- struct ibv_grh *grh, uint8_t port_num);
+struct rdmav_ah *rdmav_create_ah_from_wc(struct rdmav_pd *pd, struct rdmav_wc *wc,
+ struct rdmav_grh *grh, uint8_t port_num);
/**
- * ibv_destroy_ah - Destroy an address handle.
+ * rdmav_destroy_ah - Destroy an address handle.
*/
-int ibv_destroy_ah(struct ibv_ah *ah);
+int rdmav_destroy_ah(struct rdmav_ah *ah);
/**
- * ibv_attach_mcast - Attaches the specified QP to a multicast group.
+ * rdmav_attach_mcast - Attaches the specified QP to a multicast group.
* @qp: QP to attach to the multicast group. The QP must be a UD QP.
* @gid: Multicast group GID.
* @lid: Multicast group LID in host byte order.
@@ -1006,18 +1007,18 @@ int ibv_destroy_ah(struct ibv_ah *ah);
* the fabric appropriately. The port associated with the specified
* QP must also be a member of the multicast group.
*/
-int ibv_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
+int rdmav_attach_mcast(struct rdmav_qp *qp, union rdmav_gid *gid, uint16_t lid);
/**
- * ibv_detach_mcast - Detaches the specified QP from a multicast group.
+ * rdmav_detach_mcast - Detaches the specified QP from a multicast group.
* @qp: QP to detach from the multicast group.
* @gid: Multicast group GID.
* @lid: Multicast group LID in host byte order.
*/
-int ibv_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
+int rdmav_detach_mcast(struct rdmav_qp *qp, union rdmav_gid *gid, uint16_t lid);
END_C_DECLS
# undef __attribute_const
-#endif /* INFINIBAND_VERBS_H */
+#endif /* RDMAV_VERBS_H */
More information about the general
mailing list