!66 [sync] PR-63: drop useless guile build dependency

From: @openeuler-sync-bot 
Reviewed-by: @hellotcc 
Signed-off-by: @hellotcc

0012-Perftest-Add-support-for-TD-lock-free-mode.patch

@@ -0,0 +1,266 @@
+From 641ab294a6bc344dffd042019c609d4e9839a2f5 Mon Sep 17 00:00:00 2001
+From: Guofeng Yue <yueguofeng@h-partners.com>
+Date: Tue, 13 Aug 2024 21:48:44 +0800
+Subject: [PATCH] Perftest: Add support for TD lock-free mode
+
+Add support for TD lock-free mode
+New option:  --no_lock
+
+        Usage example:
+        ib_send_bw -d hns_0 --no_lock
+        ib_send_bw -d hns_0 --no_lock 192.168.100.100
+
+Signed-off-by: Guofeng Yue <yueguofeng@h-partners.com>
+Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
+---
+ configure.ac              | 14 +++++++
+ src/perftest_parameters.c | 30 ++++++++++++++-
+ src/perftest_parameters.h |  1 +
+ src/perftest_resources.c  | 81 +++++++++++++++++++++++++++++++++++++++
+ src/perftest_resources.h  |  4 ++
+ 5 files changed, 128 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 54fc2cc..d976663 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -298,6 +298,20 @@ if [test $HAVE_HNSDV = yes]; then
+        AC_SUBST([LIBHNS])
+ fi
+
++AC_TRY_LINK([#include <infiniband/verbs.h>],
++       [ibv_cq_ex_to_cq], [HAVE_CQ_EX=yes], [HAVE_CQ_EX=no])
++AM_CONDITIONAL([HAVE_CQ_EX], [test "x$HAVE_CQ_EX" = "xyes"])
++if [test $HAVE_CQ_EX = yes]; then
++       AC_DEFINE([HAVE_CQ_EX], [1], [Have CQ EX API support])
++fi
++
++AC_TRY_LINK([#include <infiniband/verbs.h>],
++       [ibv_alloc_td], [HAVE_TD_API=yes], [HAVE_TD_API=no])
++AM_CONDITIONAL([HAVE_TD_API], [test "x$HAVE_TD_API" = "xyes"])
++if [test $HAVE_TD_API = yes]; then
++       AC_DEFINE([HAVE_TD_API], [1], [Have TD API support])
++fi
++
+ CFLAGS="-g -Wall -D_GNU_SOURCE -O3 $CFLAGS"
+ LIBS=$LIBS" -lpthread"
+ AC_SUBST([LIBUMAD])
+diff --git a/src/perftest_parameters.c b/src/perftest_parameters.c
+index 16af503..4c6ba4f 100755
+--- a/src/perftest_parameters.c
++++ b/src/perftest_parameters.c
+@@ -464,6 +464,11 @@ static void usage(const char *argv0, VerbType verb, TestType tst, int connection
+ 		printf(" Use a Shared Receive Queue. --rx-depth controls max-wr size of the SRQ \n");
+ 	}
+
++	#ifdef HAVE_TD_API
++	printf("      --no_lock ");
++	printf(" No lock in IO, including post send, post recv, post srq recv and poll cq \n");
++	#endif
++
+ 	if (connection_type != RawEth) {
+ 		printf("      --ipv6 ");
+ 		printf(" Use IPv6 GID. Default is IPv4\n");
+@@ -2225,6 +2230,9 @@ int parser(struct perftest_parameters *user_param,char *argv[], int argc)
+ 	#ifdef HAVE_HNSDV
+ 	static int congest_type_flag = 0;
+ 	#endif
++	#ifdef HAVE_TD_API
++	static int no_lock_flag = 0;
++	#endif
+
+ 	char *server_ip = NULL;
+ 	char *client_ip = NULL;
+@@ -2300,6 +2308,9 @@ int parser(struct perftest_parameters *user_param,char *argv[], int argc)
+ 			{ .name = "run_infinitely",	.has_arg = 0, .flag = &run_inf_flag, .val = 1 },
+ 			{ .name = "report_gbits",	.has_arg = 0, .flag = &report_fmt_flag, .val = 1},
+ 			{ .name = "use-srq",		.has_arg = 0, .flag = &srq_flag, .val = 1},
++			#ifdef HAVE_TD_API
++			{ .name = "no_lock",            .has_arg = 0, .flag = &no_lock_flag, .val = 1},
++			#endif
+ 			{ .name = "report-both",	.has_arg = 0, .flag = &report_both_flag, .val = 1},
+ 			{ .name = "reversed",		.has_arg = 0, .flag = &is_reversed_flag, .val = 1},
+ 			{ .name = "pkey_index",		.has_arg = 1, .flag = &pkey_flag, .val = 1},
+@@ -2944,6 +2955,12 @@ int parser(struct perftest_parameters *user_param,char *argv[], int argc)
+ 		user_param->use_srq = 1;
+ 	}
+
++	#ifdef HAVE_TD_API
++	if (no_lock_flag) {
++		user_param->no_lock = 1;
++	}
++	#endif
++
+ 	if (report_fmt_flag) {
+ 		user_param->report_fmt = GBS;
+ 	}
+@@ -3284,15 +3301,24 @@ void ctx_print_test_info(struct perftest_parameters *user_param)
+ 	printf(" Number of qps   : %d\t\tTransport type : %s\n", user_param->num_of_qps, transport_str(user_param->transport_type));
+ 	printf(" Connection type : %s\t\tUsing SRQ      : %s\n", connStr[user_param->connection_type], user_param->use_srq ? "ON"  : "OFF");
+ 	#ifdef HAVE_RO
+-	printf(" PCIe relax order: %s\n", user_param->disable_pcir ? "OFF"  : "ON");
++	#ifdef HAVE_TD_API
++	printf(" PCIe relax order: %s\t\tLock-free      : %s\n", user_param->disable_pcir ? "OFF"  : "ON", user_param->no_lock ? "ON" : "OFF");
++	#else
++	printf(" PCIe relax order: %s\t\tLock-free      : %s\n", user_param->disable_pcir ? "OFF"  : "ON", "Unsupported");
++	#endif //HAVE_TD_API
+ 	if ((check_pcie_relaxed_ordering_compliant() == false) &&
+ 	    (user_param->disable_pcir == 0)) {
+ 		printf(" WARNING: CPU is not PCIe relaxed ordering compliant.\n");
+ 		printf(" WARNING: You should disable PCIe RO with `--disable_pcie_relaxed` for both server and client.\n");
+ 	}
+ 	#else
+-	printf(" PCIe relax order: %s\n", "Unsupported");
++	#ifdef HAVE_TD_API
++	printf(" PCIe relax order: %s\t\tLock-free      : %s\n", "Unsupported", user_param->no_lock ? "ON" : "OFF");
++	#else
++	printf(" PCIe relax order: %s\t\tLock-free	: %s\n", "Unsupported", "Unsupported");
++	#endif //HAVE_TD_API
+ 	#endif
++
+ 	printf(" ibv_wr* API     : %s\n", user_param->use_old_post_send ? "OFF" : "ON");
+ 	if (user_param->machine == CLIENT || user_param->duplex) {
+ 		printf(" TX depth        : %d\n",user_param->tx_depth);
+diff --git a/src/perftest_parameters.h b/src/perftest_parameters.h
+index ffc19ab..f49fb0f 100755
+--- a/src/perftest_parameters.h
++++ b/src/perftest_parameters.h
+@@ -462,6 +462,7 @@ struct perftest_parameters {
+ 	int 				recv_post_list;
+ 	int				duration;
+ 	int 				use_srq;
++	int 				no_lock;
+ 	int 				congest_type;
+ 	int				use_xrc;
+ 	int				use_rss;
+diff --git a/src/perftest_resources.c b/src/perftest_resources.c
+index 451f11d..0e2b9a3 100755
+--- a/src/perftest_resources.c
++++ b/src/perftest_resources.c
+@@ -1360,6 +1360,20 @@ int destroy_ctx(struct pingpong_context *ctx,
+ 	}
+ 	#endif
+
++	#ifdef HAVE_TD_API
++	if (user_param->no_lock) {
++		if (ibv_dealloc_pd(ctx->pad)) {
++			fprintf(stderr, "Failed to deallocate PAD - %s\n", strerror(errno));
++			test_result = 1;
++		}
++
++		if (ibv_dealloc_td(ctx->td)) {
++			fprintf(stderr, "Failed to deallocate TD - %s\n", strerror(errno));
++			test_result = 1;
++		}
++	}
++	#endif
++
+ 	if (ibv_dealloc_pd(ctx->pd)) {
+ 		fprintf(stderr, "Failed to deallocate PD - %s\n", strerror(errno));
+ 		test_result = 1;
+@@ -1502,6 +1516,47 @@ int create_reg_cqs(struct pingpong_context *ctx,
+ 		   struct perftest_parameters *user_param,
+ 		   int tx_buffer_depth, int need_recv_cq)
+ {
++	#ifdef HAVE_CQ_EX
++        struct ibv_cq_init_attr_ex send_cq_attr = {
++                .cqe = tx_buffer_depth * user_param->num_of_qps,
++                .cq_context = NULL,
++                .channel = ctx->channel,
++                .comp_vector = user_param->eq_num,
++        };
++
++        #ifdef HAVE_TD_API
++        if (user_param->no_lock) {
++                send_cq_attr.parent_domain = ctx->pad;
++                send_cq_attr.comp_mask = IBV_CQ_INIT_ATTR_MASK_PD;
++        }
++        #endif
++        ctx->send_cq = ibv_cq_ex_to_cq(ibv_create_cq_ex(ctx->context, &send_cq_attr));
++        if (!ctx->send_cq) {
++                fprintf(stderr, "Couldn't create CQ\n");
++                return FAILURE;
++        }
++
++        if (need_recv_cq) {
++                struct ibv_cq_init_attr_ex recv_cq_attr = {
++                        .cqe = user_param->rx_depth * user_param->num_of_qps,
++                        .cq_context = NULL,
++                        .channel = ctx->channel,
++                        .comp_vector = user_param->eq_num,
++                };
++                #ifdef HAVE_TD_API
++                if (user_param->no_lock) {
++                        recv_cq_attr.parent_domain = ctx->pad;
++                        recv_cq_attr.comp_mask = IBV_CQ_INIT_ATTR_MASK_PD;
++                }
++                #endif
++                ctx->recv_cq = ibv_cq_ex_to_cq(ibv_create_cq_ex(ctx->context, &recv_cq_attr));
++                if (!ctx->recv_cq) {
++                        fprintf(stderr, "Couldn't create a receiver CQ\n");
++                        return FAILURE;
++                }
++        }
++        return SUCCESS;
++#else
+ 	ctx->send_cq = ibv_create_cq(ctx->context,tx_buffer_depth *
+ 					user_param->num_of_qps, NULL, ctx->channel, user_param->eq_num);
+ 	if (!ctx->send_cq) {
+@@ -1519,6 +1574,7 @@ int create_reg_cqs(struct pingpong_context *ctx,
+ 	}
+
+ 	return SUCCESS;
++#endif
+ }
+
+ /******************************************************************************
+@@ -1906,6 +1962,31 @@ int ctx_init(struct pingpong_context *ctx, struct perftest_parameters *user_para
+ 		fprintf(stderr, "Couldn't allocate PD\n");
+ 		return FAILURE;
+ 	}
++
++	       #ifdef HAVE_TD_API
++        /* Allocating the Thread domain, Parent domain. */
++        if (user_param->no_lock) {
++                struct ibv_td_init_attr td_attr = {0};
++                ctx->td = ibv_alloc_td(ctx->context, &td_attr);
++                if (!ctx->td) {
++                        fprintf(stderr, "Couldn't allocate TD\n");
++                        return FAILURE;
++                }
++
++                struct ibv_parent_domain_init_attr pad_attr = {
++                        .pd = ctx->pd,
++                        .td = ctx->td,
++                        .comp_mask = 0,
++                };
++
++                ctx->pad = ibv_alloc_parent_domain(ctx->context, &pad_attr);
++                if (!ctx->pad) {
++                        fprintf(stderr, "Couldn't allocate PAD\n");
++                        return FAILURE;
++                }
++        }
++        #endif
++
+ 	#ifdef HAVE_AES_XTS
+ 	if(user_param->aes_xts){
+ 		struct mlx5dv_dek_init_attr dek_attr = {};
+diff --git a/src/perftest_resources.h b/src/perftest_resources.h
+index cf0502c..ba8630b 100755
+--- a/src/perftest_resources.h
++++ b/src/perftest_resources.h
+@@ -170,6 +170,10 @@ struct pingpong_context {
+ 	#endif
+ 	struct ibv_comp_channel			*channel;
+ 	struct ibv_pd				*pd;
++	#ifdef HAVE_TD_API
++	struct ibv_td                           *td;
++	struct ibv_pd                           *pad;
++	#endif
+ 	struct ibv_mr				**mr;
+ 	struct ibv_cq				*send_cq;
+ 	struct ibv_cq				*recv_cq;
+--
+2.25.1
+

0013-Perftest-Fix-TD-lock-free-mode-not-working-for-QP.patch

@@ -0,0 +1,34 @@
+From f8f97b189e9af6cff8559b10c749ff289219b754 Mon Sep 17 00:00:00 2001
+From: Xinghai Cen <cenxinghai@h-partners.com>
+Date: Wed, 21 Aug 2024 20:06:50 +0800
+Subject: [PATCH] Perftest: Fix TD lock-free mode not working for QP
+
+Fix TD lock-free mode not working for QP When
+creating QP in TD lock-free mode, set attr_ex.pd with ctx->pad instead of
+ctx->pd, otherwise the lock-free won't work.
+
+Fixes: "Perftest: Add support for TD lock-free mode"
+Signed-off-by: Guofeng Yue <yueguofeng@h-partners.com>
+---
+ src/perftest_resources.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/perftest_resources.c b/src/perftest_resources.c
+index 0e2b9a3..1bdf34e 100755
+--- a/src/perftest_resources.c
++++ b/src/perftest_resources.c
+@@ -2309,7 +2309,11 @@ struct ibv_qp* ctx_qp_create(struct pingpong_context *ctx,
+ 		else if (opcode == IBV_WR_RDMA_READ)
+ 			attr_ex.send_ops_flags |= IBV_QP_EX_WITH_RDMA_READ;
+ 	}
++	#ifdef HAVE_TD_API
++	attr_ex.pd = user_param->no_lock ? ctx->pad : ctx->pd;
++	#else
+ 	attr_ex.pd = ctx->pd;
++	#endif
+ 	attr_ex.comp_mask |= IBV_QP_INIT_ATTR_SEND_OPS_FLAGS | IBV_QP_INIT_ATTR_PD;
+ 	attr_ex.send_cq = attr.send_cq;
+ 	attr_ex.recv_cq = attr.recv_cq;
+-- 
+2.25.1
+

0014-Perftest-Fix-failure-in-creating-cq-when-create-cq-e.patch

@@ -0,0 +1,64 @@
+From 3ea6ea2490eb19e5951201804ab9df525338c799 Mon Sep 17 00:00:00 2001
+From: Ge Hu <huge4@huawei.com>
+Date: Mon, 2 Sep 2024 19:43:09 +0800
+Subject: [PATCH] Perftest: Fix failure in creating cq when create cq ex is not
+ supported by providers
+
+The previous TD lock-free patch introduced ibv_create_cq_ex() to
+perftest, but it breaks the provider devices which do not support
+this API yet. For these devices calling this API leads to an errno
+of EOPNOTSUPP. So add a check of errno, and if it is EOPNOTSUPP,
+use ibv_create_cq() as a fallback.
+
+Fixes: b6f957f6bc6c ("Perftest: Add support for TD lock-free mode")
+Tested-By: Selvin Xavier <selvin.xavier@broadcom.com>
+Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
+Signed-off-by: Xinghai Cen <cenxinghai@h-partners.com>
+---
+ src/perftest_resources.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/perftest_resources.c b/src/perftest_resources.c
+index 58dbdef..843c45f 100755
+--- a/src/perftest_resources.c
++++ b/src/perftest_resources.c
+@@ -1516,7 +1516,7 @@ int create_reg_cqs(struct pingpong_context *ctx,
+ 		   struct perftest_parameters *user_param,
+ 		   int tx_buffer_depth, int need_recv_cq)
+ {
+-	#ifdef HAVE_CQ_EX
++#ifdef HAVE_CQ_EX
+         struct ibv_cq_init_attr_ex send_cq_attr = {
+                 .cqe = tx_buffer_depth * user_param->num_of_qps,
+                 .cq_context = NULL,
+@@ -1532,6 +1532,8 @@ int create_reg_cqs(struct pingpong_context *ctx,
+         #endif
+         ctx->send_cq = ibv_cq_ex_to_cq(ibv_create_cq_ex(ctx->context, &send_cq_attr));
+         if (!ctx->send_cq) {
++		if (!user_param->no_lock && errno == EOPNOTSUPP)
++			goto cq_ex_not_supported;
+                 fprintf(stderr, "Couldn't create CQ\n");
+                 return FAILURE;
+         }
+@@ -1556,7 +1558,9 @@ int create_reg_cqs(struct pingpong_context *ctx,
+                 }
+         }
+         return SUCCESS;
+-#else
++
++cq_ex_not_supported:
++#endif
+ 	ctx->send_cq = ibv_create_cq(ctx->context,tx_buffer_depth *
+ 					user_param->num_of_qps, NULL, ctx->channel, user_param->eq_num);
+ 	if (!ctx->send_cq) {
+@@ -1574,7 +1578,6 @@ int create_reg_cqs(struct pingpong_context *ctx,
+ 	}
+ 
+ 	return SUCCESS;
+-#endif
+ }
+ 
+ /******************************************************************************
+-- 
+2.25.1
+

0015-Perftest-modify-source_ip-to-bind_sounce_ip-to-fix-i.patch

@@ -0,0 +1,52 @@
+From eb0de7de2f7ea8d216f306ad69aaa9fda73dbdb1 Mon Sep 17 00:00:00 2001
+From: "Huai-En, Tseng" <huaien.tseng@shopee.com>
+Date: Thu, 18 May 2023 11:31:31 +0800
+Subject: [PATCH] Perftest: modify --source_ip to --bind_sounce_ip to fix init
+ connection establishment with specific interface
+
+mainline inclusion
+commit ba4580a6c4f16ab7791e4d809eda91d586c1f04f
+category: bugfix
+bugzilla: https://gitee.com/src-openeuler/perftest/issues/IBGXBU
+
+Reference: https://github.com/linux-rdma/perftest/commit/8ff29c1603215c012a886284b7184a0280367cb4
+
+----------------------------
+
+When there are several network interface with different subnet address,
+perftest tools will always choose default route even I add --source_ip
+option to ask perftest to bind an interface.
+I found that there are two options that use the same name "--source_ip".
+Therefore, change --source_ip to --bind_source_ip to fix init connection
+establishment with specific interface.
+
+Signed-off-by: Guofeng Yue <yueguofeng@h-partners.com>
+---
+ src/perftest_parameters.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/perftest_parameters.c b/src/perftest_parameters.c
+index 0a18b2a..73907ca 100755
+--- a/src/perftest_parameters.c
++++ b/src/perftest_parameters.c
+@@ -476,7 +476,7 @@ static void usage(const char *argv0, VerbType verb, TestType tst, int connection
+ 
+ 	// please note it is a different source_ip from raw_ethernet case
+ 	if (connection_type != RawEth) {
+-		printf("      --source_ip ");
++		printf("      --bind_source_ip ");
+ 		printf(" Source IP of the interface used for connection establishment. By default taken from routing table.\n");
+ 	}
+ 
+@@ -2386,7 +2386,7 @@ int parser(struct perftest_parameters *user_param,char *argv[], int argc)
+ 			#ifdef HAVE_HNSDV
+                         { .name = "congest_type", .has_arg = 1, .flag = &congest_type_flag, .val = 1},
+                         #endif
+-			{.name = "source_ip", .has_arg = 1, .flag = &source_ip_flag, .val = 1},
++			{.name = "bind_source_ip", .has_arg = 1, .flag = &source_ip_flag, .val = 1},
+ 			{0}
+ 		};
+ 		c = getopt_long(argc,argv,"w:y:p:d:i:m:s:n:t:u:S:x:c:q:I:o:M:r:Q:A:l:D:f:B:T:L:E:J:j:K:k:X:W:aFegzRvhbNVCHUOZP",long_options,NULL);
+-- 
+2.25.1
+

perftest.spec

@@ -1,7 +1,7 @@
 Name:           perftest
 Version:        4.5
-Release:        8
-License:        GPLv2 or BSD
+Release:        13
+License:        GPL-2.0-only OR BSD-2-Clause
 Summary:        RDMA Performance Testing Tools
 Url:            https://github.com/linux-rdma/perftest
 Source:         https://github.com/linux-rdma/perftest/releases/download/v4.5-0.12/perftest-4.5-0.12.ge93c538.tar.gz
@@ -17,10 +17,13 @@ Patch8: 0008-Get-CPU-MHz-on-RISC-V.patch
 Patch9: 0009-Get-CPU-cycles-on-RISC-V.patch
 Patch10: 0010-Perftest-Support-selecting-congestion-control-algori.patch
 Patch11: 0011-Perftest-Fix-rx_depth-check-for-XRC.patch
+Patch12: 0012-Perftest-Add-support-for-TD-lock-free-mode.patch
+Patch13: 0013-Perftest-Fix-TD-lock-free-mode-not-working-for-QP.patch
+Patch14: 0014-Perftest-Fix-failure-in-creating-cq-when-create-cq-e.patch
+Patch15: 0015-Perftest-modify-source_ip-to-bind_sounce_ip-to-fix-i.patch
 
 BuildRequires:  automake gcc libibverbs-devel >= 1.2.0 librdmacm-devel >= 1.0.21 libibumad-devel >= 1.3.10.2
 BuildRequires:  pciutils-devel libibverbs librdmacm libibumad
-BuildRequires:  guile
 Obsoletes:      openib-perftest < 1.3
 
 %description
@@ -30,6 +33,7 @@ Perftest is a collection of simple tools for testing bandwidth and latency over
 %autosetup -p1
 
 %build
+./autogen.sh
 %configure
 %make_build CFLAGS+="-fPIC -g -Wall -D_GNU_SOURCE -O3"
 
@@ -43,6 +47,36 @@ done
 %_bindir/*
 
 %changelog
+* Wed Mar 12 2025 Funda Wang <fundawang@yeah.net> - 4.5-13
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: drop useless guile build dependency
+
+* Mon Jan 13 2025 Guofeng Yue <yueguofeng@h-partners.com> - 4.5-12
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: modify "--source_ip" to "--bind_source_ip" to fix init connection establishment with specific interface
+
+* Mon Sep 2 2024 Xinghai Cen <cenxinghai@h-partners.com> - 4.5-11
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: Fix failure in creating cq when create cq ex is not
+
+* Wed Aug 21 2024 Xinghai Cen <cenxinghai@h-partners.com> - 4.5-10
+- Type: feature
+- ID: NA
+- SUG: NA
+- DESC: Add support for TD lock-free mode
+
+* Mon Jul 22 2024 liweigang <liweiganga@uniontech.com> - 4.5-9
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: fix build error due to automake update 1.17
+
 * Mon Jul 8 2024 Xinghai Cen <cenxinghai@h-partners.com> - 4.5-8
 - Type: bugfix
 - ID: NA