qtest/migration/rdma: Add test for rdma migration with ipv6

Recently, we removed ipv6 restriction[0] from RDMA migration, add a
test for it.

[0] https://lore.kernel.org/qemu-devel/20250326095224.9918-1-jinpu.wang@ionos.com/

Cc: Jack Wang <jinpu.wang@ionos.com>
Cc: Michael R. Galaxy <mrgalaxy@nvidia.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Yu Zhang <yu.zhang@ionos.com>
Reviewed-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
Link: https://lore.kernel.org/r/20250513012207.2867069-1-lizhijian@fujitsu.com
[peterx: Fix over long lines]
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Li Zhijian 2025-05-13 09:22:07 +08:00 committed by Peter Xu
parent 7b2e4f788d
commit 6b84c46e8e
2 changed files with 65 additions and 13 deletions

View File

@ -8,23 +8,44 @@ get_ipv4_addr()
head -1 | tr -d '\n' head -1 | tr -d '\n'
} }
get_ipv6_addr() {
ipv6=$(ip -6 -o addr show dev "$1" |
sed -n 's/.*[[:blank:]]inet6[[:blank:]]*\([^[:blank:]/]*\).*/\1/p' |
head -1 | tr -d '\n')
[ $? -eq 0 ] || return
if [[ "$ipv6" =~ ^fe80: ]]; then
echo -n "[$ipv6%$1]"
else
echo -n "[$ipv6]"
fi
}
# existing rdma interfaces # existing rdma interfaces
rdma_interfaces() rdma_interfaces()
{ {
rdma link show | sed -nE 's/^link .* netdev ([^ ]+).*$/\1 /p' rdma link show | sed -nE 's/^link .* netdev ([^ ]+).*$/\1 /p' |
grep -Ev '^(lo|tun|tap)'
} }
# existing valid ipv4 interfaces # existing valid ipv4 interfaces
ipv4_interfaces() ipv4_interfaces()
{ {
ip -o addr show | awk '/inet / {print $2}' | grep -v -w lo ip -o addr show | awk '/inet / {print $2}' | grep -Ev '^(lo|tun|tap)'
}
ipv6_interfaces()
{
ip -o addr show | awk '/inet6 / {print $2}' | grep -Ev '^(lo|tun|tap)'
} }
rdma_rxe_detect() rdma_rxe_detect()
{ {
family=$1
for r in $(rdma_interfaces) for r in $(rdma_interfaces)
do do
ipv4_interfaces | grep -qw $r && get_ipv4_addr $r && return "$family"_interfaces | grep -qw $r && get_"$family"_addr $r && return
done done
return 1 return 1
@ -32,16 +53,23 @@ rdma_rxe_detect()
rdma_rxe_setup() rdma_rxe_setup()
{ {
for i in $(ipv4_interfaces) family=$1
for i in $("$family"_interfaces)
do do
rdma_interfaces | grep -qw $i && continue if rdma_interfaces | grep -qw $i; then
echo "$family: Reuse the existing rdma/rxe ${i}_rxe" \
"for $i with $(get_"$family"_addr $i)"
return
fi
rdma link add "${i}_rxe" type rxe netdev "$i" && { rdma link add "${i}_rxe" type rxe netdev "$i" && {
echo "Setup new rdma/rxe ${i}_rxe for $i with $(get_ipv4_addr $i)" echo "$family: Setup new rdma/rxe ${i}_rxe" \
"for $i with $(get_"$family"_addr $i)"
return return
} }
done done
echo "Failed to setup any new rdma/rxe link" >&2 echo "$family: Failed to setup any new rdma/rxe link" >&2
return 1 return 1
} }
@ -50,6 +78,12 @@ rdma_rxe_clean()
modprobe -r rdma_rxe modprobe -r rdma_rxe
} }
IP_FAMILY=${IP_FAMILY:-ipv4}
if [ "$IP_FAMILY" != "ipv6" ] && [ "$IP_FAMILY" != "ipv4" ]; then
echo "Unknown ip family '$IP_FAMILY', only ipv4 or ipv6 is supported." >&2
exit 1
fi
operation=${1:-detect} operation=${1:-detect}
command -v rdma >/dev/null || { command -v rdma >/dev/null || {
@ -62,9 +96,14 @@ if [ "$operation" == "setup" ] || [ "$operation" == "clean" ]; then
echo "Root privilege is required to setup/clean a rdma/rxe link" >&2 echo "Root privilege is required to setup/clean a rdma/rxe link" >&2
exit 1 exit 1
} }
rdma_rxe_"$operation" if [ "$operation" == "setup" ]; then
rdma_rxe_setup ipv4
rdma_rxe_setup ipv6
else
rdma_rxe_clean
fi
elif [ "$operation" == "detect" ]; then elif [ "$operation" == "detect" ]; then
rdma_rxe_detect rdma_rxe_detect "$IP_FAMILY"
else else
echo "Usage: $0 [setup | detect | clean]" echo "Usage: $0 [setup | detect | clean]"
fi fi

View File

@ -131,12 +131,13 @@ static bool mlock_check(void)
} }
#define RDMA_MIGRATION_HELPER "scripts/rdma-migration-helper.sh" #define RDMA_MIGRATION_HELPER "scripts/rdma-migration-helper.sh"
static int new_rdma_link(char *buffer) static int new_rdma_link(char *buffer, bool ipv6)
{ {
char cmd[256]; char cmd[256];
bool verbose = g_getenv("QTEST_LOG"); bool verbose = g_getenv("QTEST_LOG");
snprintf(cmd, sizeof(cmd), "%s detect %s", RDMA_MIGRATION_HELPER, snprintf(cmd, sizeof(cmd), "IP_FAMILY=%s %s detect %s",
ipv6 ? "ipv6" : "ipv4", RDMA_MIGRATION_HELPER,
verbose ? "" : "2>/dev/null"); verbose ? "" : "2>/dev/null");
FILE *pipe = popen(cmd, "r"); FILE *pipe = popen(cmd, "r");
@ -161,7 +162,7 @@ static int new_rdma_link(char *buffer)
return -1; return -1;
} }
static void test_precopy_rdma_plain(void) static void __test_precopy_rdma_plain(bool ipv6)
{ {
char buffer[128] = {}; char buffer[128] = {};
@ -170,7 +171,7 @@ static void test_precopy_rdma_plain(void)
return; return;
} }
if (new_rdma_link(buffer)) { if (new_rdma_link(buffer, ipv6)) {
g_test_skip("No rdma link available\n" g_test_skip("No rdma link available\n"
"# To enable the test:\n" "# To enable the test:\n"
"# Run \'" RDMA_MIGRATION_HELPER " setup\' with root to " "# Run \'" RDMA_MIGRATION_HELPER " setup\' with root to "
@ -193,6 +194,16 @@ static void test_precopy_rdma_plain(void)
test_precopy_common(&args); test_precopy_common(&args);
} }
static void test_precopy_rdma_plain(void)
{
__test_precopy_rdma_plain(false);
}
static void test_precopy_rdma_plain_ipv6(void)
{
__test_precopy_rdma_plain(true);
}
#endif #endif
static void test_precopy_tcp_plain(void) static void test_precopy_tcp_plain(void)
@ -1226,6 +1237,8 @@ static void migration_test_add_precopy_smoke(MigrationTestEnv *env)
#ifdef CONFIG_RDMA #ifdef CONFIG_RDMA
migration_test_add("/migration/precopy/rdma/plain", migration_test_add("/migration/precopy/rdma/plain",
test_precopy_rdma_plain); test_precopy_rdma_plain);
migration_test_add("/migration/precopy/rdma/plain/ipv6",
test_precopy_rdma_plain_ipv6);
#endif #endif
} }