Added new RoCE version choosing mechanism

Signed-off-by: Dmitry Akhmedzhanov <[email protected]>

Author: Dmitry Akhmedzhanov

configure.ac

@@ -29,7 +29,7 @@
 # SOFTWARE.
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([perftest],[5.93],[[email protected]])
+AC_INIT([perftest],[5.94],[[email protected]])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
@@ -142,6 +142,13 @@ AC_TRY_LINK([
         [int x = MLX5DV_QP_INIT_ATTR_MASK_QP_CREATE_FLAGS;],[HAVE_MLX5DV=yes], [HAVE_MLX5DV=no])
 AM_CONDITIONAL([HAVE_MLX5DV],[test "x$HAVE_MLX5DV" = "xyes"])
 
+AC_TRY_LINK([#include <infiniband/verbs.h>],
+        [int c = IBV_GID_TYPE_ROCE_V1;],[HAVE_GID_TYPE_DECLARED=yes], [HAVE_GID_TYPE_DECLARED=no])
+AM_CONDITIONAL([HAVE_GID_TYPE_DECLARED],[test "x$HAVE_GID_TYPE_DECLARED" = "xyes"])
+if [test $HAVE_GID_TYPE_DECLARED = yes]; then
+        AC_DEFINE([HAVE_GID_TYPE_DECLARED], [1], [API GID compatibility])
+fi
+
 AC_TRY_LINK([
 #include <infiniband/verbs.h>],
         [int x = IBV_FLOW_SPEC_IPV6;],[HAVE_IPV6=yes], [HAVE_IPV6=no])

src/perftest_communication.c

@@ -531,7 +531,7 @@ static int rdma_read_keys(struct pingpong_dest *rem_dest,
 }
 
 #ifdef HAVE_GID_TYPE
-// declaration is copied from rdma-core, since it is private there.
+#ifndef HAVE_GID_TYPE_DECLARED
 enum ibv_gid_type
 {
 	IBV_GID_TYPE_IB_ROCE_V1,
@@ -541,6 +541,7 @@ enum ibv_gid_type
 int ibv_query_gid_type(struct ibv_context *context, uint8_t port_num,
 	unsigned int index, enum ibv_gid_type *type);
 
+#endif
 
 enum who_is_better {LEFT_IS_BETTER, EQUAL, RIGHT_IS_BETTER};
 
@@ -550,10 +551,17 @@ struct roce_version_sorted_enum {
 };
 
 /* This struct defines which RoCE version is more important for default usage */
+#ifndef HAVE_GID_TYPE_DECLARED
 struct roce_version_sorted_enum roce_versions_sorted[] = {
 	{IBV_GID_TYPE_IB_ROCE_V1, 1},
 	{IBV_GID_TYPE_ROCE_V2, 2},
 };
+#else
+struct roce_version_sorted_enum roce_versions_sorted[] = {
+	{IBV_GID_TYPE_ROCE_V1, 1},
+	{IBV_GID_TYPE_ROCE_V2, 2},
+};
+#endif
 
 int find_roce_version_rate(enum ibv_gid_type roce_ver) {
 	int i;
@@ -609,6 +617,20 @@ static int get_best_gid_index (struct pingpong_context *ctx,
 			gid_index = i;
 #ifdef HAVE_GID_TYPE
 		else {
+#ifdef HAVE_GID_TYPE_DECLARED
+			struct ibv_gid_entry roce_version, roce_version_rival;
+
+			if (ibv_query_gid_ex(ctx->context, port, gid_index, &roce_version, 0))
+				continue;
+
+			if (ibv_query_gid_ex(ctx->context, port, i, &roce_version_rival, 0))
+				continue;
+
+			if (check_better_roce_version(roce_version.gid_type, roce_version_rival.gid_type) == RIGHT_IS_BETTER) {
+				gid_index = i;
+			}
+
+#else
 			enum ibv_gid_type roce_version, roce_version_rival;
 
 			if (ibv_query_gid_type(ctx->context, port, gid_index, &roce_version))
@@ -617,8 +639,10 @@ static int get_best_gid_index (struct pingpong_context *ctx,
 			if (ibv_query_gid_type(ctx->context, port, i, &roce_version_rival))
 				continue;
 
-			if (check_better_roce_version(roce_version, roce_version_rival) == RIGHT_IS_BETTER)
-			 	gid_index = i;
+			if (check_better_roce_version(roce_version, roce_version_rival) == RIGHT_IS_BETTER) {
+				gid_index = i;
+			}
+#endif
 		}
 #endif
 	}