Perftest: modify --source_ip to --bind_source_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: 8ff29c1603

----------------------------

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>
(cherry picked from commit 7fa54f81bfd69faf7d7aac57311ca0ea0063aaf7)
This commit is contained in:
Guofeng Yue 2025-01-10 13:52:21 +08:00 committed by openeuler-sync-bot
parent f7b6fd71b4
commit 21e04c5ddf
2 changed files with 60 additions and 1 deletions

View File

@ -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

View File

@ -1,6 +1,6 @@
Name: perftest Name: perftest
Version: 4.5 Version: 4.5
Release: 11 Release: 12
License: GPLv2 or BSD License: GPLv2 or BSD
Summary: RDMA Performance Testing Tools Summary: RDMA Performance Testing Tools
Url: https://github.com/linux-rdma/perftest Url: https://github.com/linux-rdma/perftest
@ -20,6 +20,7 @@ Patch11: 0011-Perftest-Fix-rx_depth-check-for-XRC.patch
Patch12: 0012-Perftest-Add-support-for-TD-lock-free-mode.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 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 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: 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: pciutils-devel libibverbs librdmacm libibumad
@ -47,6 +48,12 @@ done
%_bindir/* %_bindir/*
%changelog %changelog
* 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 * Mon Sep 2 2024 Xinghai Cen <cenxinghai@h-partners.com> - 4.5-11
- Type: bugfix - Type: bugfix
- ID: NA - ID: NA