[openib-general] [PATCH 2/2] librdmacm: allow user to set IB CM timeout and retries

[Sean Hefty]

Userspace support to allow overriding the default timeout and retry used
by the RDMA CM when connecting over Infiniband.

This patch moves the Infiniband specific options into their own header file.

Signed-off-by: Sean Hefty <sean.hefty at intel.com>
---
Index: include/rdma/rdma_cma_ib.h
===================================================================
--- include/rdma/rdma_cma_ib.h	(revision 0)
+++ include/rdma/rdma_cma_ib.h	(revision 0)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006 Intel Corporation.  All rights reserved.
+ *
+ * This Software is licensed under one of the following licenses:
+ *
+ * 1) under the terms of the "Common Public License 1.0" a copy of which is
+ *    available from the Open Source Initiative, see
+ *    http://www.opensource.org/licenses/cpl.php.
+ *
+ * 2) under the terms of the "The BSD License" a copy of which is
+ *    available from the Open Source Initiative, see
+ *    http://www.opensource.org/licenses/bsd-license.php.
+ *
+ * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
+ *    copy of which is available from the Open Source Initiative, see
+ *    http://www.opensource.org/licenses/gpl-license.php.
+ *
+ * Licensee has the right to choose one of the above licenses.
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice and one of the license notices.
+ *
+ * Redistributions in binary form must reproduce both the above copyright
+ * notice, one of the license notices in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ */
+
+#if !defined(RDMA_CMA_IB_H)
+#define RDMA_CMA_IB_H
+
+#include <rdma/rdma_cma.h>
+
+
+/* IB specific option names for get/set. */
+enum {
+	IB_PATH_OPTIONS = 1,	/* struct ibv_kern_path_rec */
+	IB_CM_REQ_OPTIONS = 2	/* struct ib_cm_req_opt */
+};
+
+struct ib_cm_req_opt {
+	uint8_t		remote_cm_response_timeout;
+	uint8_t		local_cm_response_timeout;
+	uint8_t		max_cm_retries;
+};
+
+#endif /* RDMA_CMA_IB_H */
Index: include/rdma/rdma_cma.h
===================================================================
--- include/rdma/rdma_cma.h	(revision 7636)
+++ include/rdma/rdma_cma.h	(working copy)
@@ -60,11 +60,6 @@ enum {
 	RDMA_PROTO_IB = 1,
 };
 
-/* IB specific option names for get/set. */
-enum {
-	IB_PATH_OPTIONS = 1,
-};
-
 struct ib_addr {
 	union ibv_gid	sgid;
 	union ibv_gid	dgid;
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 7636)
+++ Makefile.am	(working copy)
@@ -27,10 +27,12 @@ examples_rping_LDADD = $(top_builddir)/s
 librdmacmincludedir = $(includedir)/rdma
 
 librdmacminclude_HEADERS = include/rdma/rdma_cma_abi.h \
-			   include/rdma/rdma_cma.h
+			   include/rdma/rdma_cma.h \
+			   include/rdma/rdma_cma_ib.h
 
 EXTRA_DIST = include/rdma/rdma_cma_abi.h \
 	     include/rdma/rdma_cma.h \
+	     include/rdma/rdma_cma_ib.h \
 	     src/librdmacm.map \
 	     librdmacm.spec.in