linux-rdma · dledford · Oct 2, 2016 · Sep 29, 2016 · Sep 29, 2016 · Sep 22, 2016
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -93,8 +93,6 @@ endif()
 # Setup the basic C compiler
 RDMA_BuildType()
 include_directories(${BUILD_INCLUDE})
-# FIXME: Eliminate HAVE_CONFIG_H, we always have it.
-add_definitions(-DHAVE_CONFIG_H)
 
 # Require GNU99 mode
 RDMA_EnableCStd()

diff --git a/COPYING b/COPYING
diff --git a/COPYING.BSD b/COPYING.BSD
diff --git a/COPYING.BSD_FB b/COPYING.BSD_FB
@@ -0,0 +1,22 @@
+		   OpenIB.org BSD license (FreeBSD Variant)
+
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/COPYING.BSD_MIT b/COPYING.BSD_MIT
@@ -0,0 +1,20 @@
+		     OpenIB.org BSD license (MIT variant)
+
+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.
+
diff --git a/COPYING.md b/COPYING.md
@@ -0,0 +1,75 @@
+# Default Dual License
+
+Unless otherwise stated 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 the
+OpenIB.org BSD (MIT variant) license (see COPYING.BSD_MIT) or the GNU General
+Public License (GPL) Version 2 (see COPYING.GPL2), both included in this
+package.
+
+Files marked 'See COPYING file' are licensed under the above Dual License.
+
+# Other Options
+
+Individual source files may use a license different from the above Defaul Dual
+License. If a license is declared in the file then it supersedes the Default
+License.
+
+If a directory contains a COPYING file then the License from that file becomes
+the Default License for files in that directory and below.
+
+# Copyright Holders
+
+Refer to individual files for information on the copyright holders.
+
+# License Catalog (Informative, Non Binding)
+
+## Utilities
+
+Utility source code that may be linked into any binary are available under
+several licenses:
+
+   - MIT license (see ccan/LICENSE.BSD-MIT)
+   - Creative Commons CC0 1.0 Universal License (see ccan/LICENSE.CC0)
+
+## Providers
+
+The following providers use a different license than the Default Dual
+License. Refer to files in each directory for details.
+
+cxbg4
+: A combination of the
+    - Default Dual License
+    - cxgb4/src/queue.h: BSD 3 clause license.
+
+hfi1verbs
+: Dual License: GPLv2 or Intel 3 clause BSD license
+
+ipathverbs
+: Dual License: GPLv2 or PathScale BSD Patent license
+
+ocrdma
+: Dual License: GPLv2 or OpenIB.org BSD (FreeBSD variant), See COPYING.BSD_FB
+
+rxe
+: A combination of the
+    - Default Dual License
+    - GPLv2 or PathScale BSD Patent license
+
+## Libraries
+
+All library compilable source code (.c and .h files) are available under the
+Default Dual License.
+
+Unmarked ancillary files may be available under a Dual License: GPLv2 or
+OpenIB.org BSD (FreeBSD variant).
+
+## Tools (iwpmd, srp_deamon, ibacm)
+
+All compilable source code (.c and .h files) are available under the Default
+Dual License.
+
+Unmarked ancillary files may be available under a Dual License: GPLv2 or
+OpenIB.org BSD (FreeBSD variant).
+
+srp_daemon/srp_daemon/srp_daemon.sh: Any one of the GPLv2, a 2 clause BSD
+license or the CPLv1.
diff --git a/buildlib/config.h.in b/buildlib/config.h.in
@@ -1,12 +1,6 @@
 #ifndef CONFIG_H_IN
 #define CONFIG_H_IN
 
-// FIXME: Remove this, ibverbs is included so we don't need to detect
-#define HAVE_IBV_DOFORK_RANGE 1
-#define HAVE_IBV_DONTFORK_RANGE 1
-#define HAVE_IBV_REGISTER_DRIVER 1
-#define HAVE_IBV_READ_SYSFS_FILE 1
-
 #define HAVE_STATEMENT_EXPR 1
 #define HAVE_BUILTIN_TYPES_COMPATIBLE_P 1
 #define HAVE_TYPEOF 1
@@ -15,16 +9,9 @@
 // FIXME: Remove this, we provide the netlink kernel headers ibacm needs
 #define HAVE_NETLINK 1
 
-// FIXME: Remove this, The cmake version hard-requires symbol version support
-#define HAVE_SYMVER_SUPPORT 1
-
 // FIXME: Remove this, The cmake version hard-requires new style CLOEXEC support
 #define STREAM_CLOEXEC "e"
 
-// FIXME: Remove this, cmake always provides a valgrind/memcheck.h
-#define HAVE_VALGRIND_MEMCHECK_H 1
-#define INCLUDE_VALGRIND 1
-
 #define IBV_CONFIG_DIR "@CONFIG_DIR@"
 #define RS_CONF_DIR "@CMAKE_INSTALL_FULL_SYSCONFDIR@/rdma/rsocket"
 #define IWPM_CONFIG_FILE "@CMAKE_INSTALL_FULL_SYSCONFDIR@/iwpmd.conf"

diff --git a/ccan/CMakeLists.txt b/ccan/CMakeLists.txt
@@ -9,6 +9,7 @@ publish_internal_headers(ccan
   )
 
 set(C_FILES
+  list.c
   str.c
   )
 add_library(ccan STATIC ${C_FILES})

diff --git a/ccan/BSD-MIT → ccan/LICENSE.BSD-MIT b/ccan/BSD-MIT → ccan/LICENSE.BSD-MIT
diff --git a/ccan/CC0 → ccan/LICENSE.CCO b/ccan/CC0 → ccan/LICENSE.CCO
diff --git a/ccan/build_assert.h b/ccan/build_assert.h
@@ -1,4 +1,4 @@
-/* CC0 (Public domain) - see LICENSE file for details */
+/* CC0 (Public domain) - see LICENSE.CC0 file for details */
 #ifndef CCAN_BUILD_ASSERT_H
 #define CCAN_BUILD_ASSERT_H
 

diff --git a/ccan/check_type.h b/ccan/check_type.h
@@ -1,4 +1,4 @@
-/* CC0 (Public domain) - see LICENSE file for details */
+/* CC0 (Public domain) - see LICENSE.CC0 file for details */
 #ifndef CCAN_CHECK_TYPE_H
 #define CCAN_CHECK_TYPE_H
 #include "config.h"

diff --git a/ccan/container_of.h b/ccan/container_of.h
@@ -1,4 +1,4 @@
-/* CC0 (Public domain) - see LICENSE file for details */
+/* CC0 (Public domain) - see LICENSE.CC0 file for details */
 #ifndef CCAN_CONTAINER_OF_H
 #define CCAN_CONTAINER_OF_H
 #include <stddef.h>

diff --git a/ccan/list.c b/ccan/list.c
@@ -0,0 +1,43 @@
+/* Licensed under BSD-MIT - see LICENSE.BSD-MIT file for details */
+#include <stdio.h>
+#include <stdlib.h>
+#include "list.h"
+
+static void *corrupt(const char *abortstr,
+		     const struct list_node *head,
+		     const struct list_node *node,
+		     unsigned int count)
+{
+	if (abortstr) {
+		fprintf(stderr,
+			"%s: prev corrupt in node %p (%u) of %p\n",
+			abortstr, node, count, head);
+		abort();
+	}
+	return NULL;
+}
+
+struct list_node *list_check_node(const struct list_node *node,
+				  const char *abortstr)
+{
+	const struct list_node *p, *n;
+	int count = 0;
+
+	for (p = node, n = node->next; n != node; p = n, n = n->next) {
+		count++;
+		if (n->prev != p)
+			return corrupt(abortstr, node, n, count);
+	}
+	/* Check prev on head node. */
+	if (node->prev != p)
+		return corrupt(abortstr, node, node, 0);
+
+	return (struct list_node *)node;
+}
+
+struct list_head *list_check(const struct list_head *h, const char *abortstr)
+{
+	if (!list_check_node(&h->n, abortstr))
+		return NULL;
+	return (struct list_head *)h;
+}
diff --git a/ccan/list.h b/ccan/list.h
@@ -1,4 +1,4 @@
-/* Licensed under BSD-MIT - see LICENSE file for details */
+/* Licensed under BSD-MIT - see LICENSE.BSD-MIT file for details */
 #ifndef CCAN_LIST_H
 #define CCAN_LIST_H
 //#define CCAN_LIST_DEBUG 1

diff --git a/ccan/minmax.h b/ccan/minmax.h
@@ -1,4 +1,4 @@
-/* CC0 (Public domain) - see LICENSE file for details */
+/* CC0 (Public domain) - see LICENSE.CC0 file for details */
 #ifndef CCAN_MINMAX_H
 #define CCAN_MINMAX_H
 

diff --git a/ccan/str.c b/ccan/str.c
@@ -1,4 +1,4 @@
-/* CC0 (Public domain) - see LICENSE file for details */
+/* CC0 (Public domain) - see LICENSE.CC0 file for details */
 #include <ccan/str.h>
 
 size_t strcount(const char *haystack, const char *needle)

diff --git a/ccan/str.h b/ccan/str.h
@@ -1,4 +1,4 @@
-/* CC0 (Public domain) - see LICENSE file for details */
+/* CC0 (Public domain) - see LICENSE.CC0 file for details */
 #ifndef CCAN_STR_H
 #define CCAN_STR_H
 #include "config.h"

diff --git a/ccan/str_debug.h b/ccan/str_debug.h
@@ -1,4 +1,4 @@
-/* CC0 (Public domain) - see LICENSE file for details */
+/* CC0 (Public domain) - see LICENSE.CC0 file for details */
 #ifndef CCAN_STR_DEBUG_H
 #define CCAN_STR_DEBUG_H
 

diff --git a/ibacm/linux/osd.h b/ibacm/linux/osd.h
@@ -46,6 +46,7 @@
 #include <arpa/inet.h>
 #include <sys/time.h>
 #include <netinet/in.h>
+#include <infiniband/arch.h>
 
 #include <ccan/minmax.h>
 
@@ -55,13 +56,6 @@
 #define LIB_DESTRUCTOR __attribute__((destructor))
 #define CDECL_FUNC
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define htonll(x) bswap_64(x)
-#else
-#define htonll(x) (x)
-#endif
-#define ntohll(x) htonll(x)
-
 #if DEFINE_ATOMICS
 typedef struct { pthread_mutex_t mut; int val; } atomic_t;
 static inline int atomic_inc(atomic_t *atomic)

diff --git a/ibacm/prov/acmp/src/acmp.c b/ibacm/prov/acmp/src/acmp.c
@@ -28,9 +28,7 @@
  * SOFTWARE.
  */
 
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/ibacm/src/acm.c b/ibacm/src/acm.c
@@ -28,9 +28,7 @@
  * SOFTWARE.
  */
 
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/ibacm/src/acme.c b/ibacm/src/acme.c
@@ -28,9 +28,7 @@
  * SOFTWARE.
  */
 
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ibacm/src/libacm.c b/ibacm/src/libacm.c
@@ -28,9 +28,7 @@
  * SOFTWARE.
  */
 
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include <config.h>
 
 #include <osd.h>
 #include "libacm.h"

diff --git a/libcxgb3/COPYING b/libcxgb3/COPYING
diff --git a/libcxgb3/src/cq.c b/libcxgb3/src/cq.c
@@ -29,9 +29,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif				/* HAVE_CONFIG_H */
+#include <config.h>
 
 #include <stdio.h>
 #include <netinet/in.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ publish_internal_headers(ccan @@
       )
     set(C_FILES
+      list.c
       str.c
       )
     add_library(ccan STATIC ${C_FILES})
@@ Expand Down @@