- kvm-migration-multifd-move-macros-to-multifd-header.patch [RHEL-59697] - kvm-migration-refactor-channel-discovery-mechanism.patch [RHEL-59697] - kvm-migration-Add-save_postcopy_prepare-savevm-handler.patch [RHEL-59697] - kvm-migration-ram-Implement-save_postcopy_prepare.patch [RHEL-59697] - kvm-tests-qtest-migration-consolidate-set-capabilities.patch [RHEL-59697] - kvm-migration-write-zero-pages-when-postcopy-enabled.patch [RHEL-59697] - kvm-migration-enable-multifd-and-postcopy-together.patch [RHEL-59697] - kvm-migration-Add-qtest-for-migration-over-RDMA.patch [RHEL-59697] - kvm-qtest-migration-rdma-Enforce-RLIMIT_MEMLOCK-128MB-re.patch [RHEL-59697] - kvm-qtest-migration-rdma-Add-test-for-rdma-migration-wit.patch [RHEL-59697] - kvm-tests-qtest-migration-add-postcopy-tests-with-multif.patch [RHEL-59697] - kvm-file-posix-Fix-aio-threads-performance-regression-af.patch [RHEL-96854] - kvm-block-remove-outdated-comments-about-AioContext-lock.patch [RHEL-88561] - kvm-block-move-drain-outside-of-read-locked-bdrv_reopen_.patch [RHEL-88561] - kvm-block-snapshot-move-drain-outside-of-read-locked-bdr.patch [RHEL-88561] - kvm-block-move-drain-outside-of-read-locked-bdrv_inactiv.patch [RHEL-88561] - kvm-block-mark-bdrv_parent_change_aio_context-GRAPH_RDLO.patch [RHEL-88561] - kvm-block-mark-change_aio_ctx-callback-and-instances-as-.patch [RHEL-88561] - kvm-block-mark-bdrv_child_change_aio_context-GRAPH_RDLOC.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_change_aio_context-.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_try_change_aio_cont.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_attach_child_common.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_set_backing_hd_drai.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_root_attach_child.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_attach_child.patch [RHEL-88561] - kvm-block-move-drain-outside-of-quorum_add_child.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_root_unref_child.patch [RHEL-88561] - kvm-block-move-drain-outside-of-quorum_del_child.patch [RHEL-88561] - kvm-blockdev-drain-while-unlocked-in-internal_snapshot_a.patch [RHEL-88561] - kvm-blockdev-drain-while-unlocked-in-external_snapshot_a.patch [RHEL-88561] - kvm-block-mark-bdrv_drained_begin-and-friends-as-GRAPH_U.patch [RHEL-88561] - kvm-iotests-graph-changes-while-io-remove-image-file-aft.patch [RHEL-88561] - kvm-iotests-graph-changes-while-io-add-test-case-with-re.patch [RHEL-88561] - Resolves: RHEL-59697 (Allow multifd+postcopy features being enabled together, but only use multifd during precopy ) - Resolves: RHEL-96854 (Performance Degradation(aio=threads) between Upstream Commit b75c5f9 and 984a32f) - Resolves: RHEL-88561 (qemu graph deadlock during job-dismiss)
213 lines
6.4 KiB
Diff
213 lines
6.4 KiB
Diff
From 879b050c6cef5cf2ae1944ffb8b203faeca62f1a Mon Sep 17 00:00:00 2001
|
|
From: Li Zhijian <lizhijian@fujitsu.com>
|
|
Date: Tue, 13 May 2025 09:22:07 +0800
|
|
Subject: [PATCH 10/33] qtest/migration/rdma: Add test for rdma migration with
|
|
ipv6
|
|
|
|
RH-Author: Prasad Pandit <None>
|
|
RH-MergeRequest: 390: migration: allow to enable multifd+postcopy features together, but use multifd during precopy only
|
|
RH-Jira: RHEL-59697
|
|
RH-Acked-by: Juraj Marcin <None>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [10/11] d2dd06604b461abf0c6d47dc860b1bb925889133 (pjp/cs-qemu-kvm)
|
|
|
|
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/
|
|
|
|
Jira: https://issues.redhat.com/browse/RHEL-59697
|
|
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>
|
|
(cherry picked from commit 6b84c46e8e0ef6f83f33657a29a8abb2b8362d02)
|
|
Signed-off-by: Prasad Pandit <ppandit@redhat.com>
|
|
---
|
|
scripts/rdma-migration-helper.sh | 57 ++++++++++++++++++++++-----
|
|
tests/qtest/migration/precopy-tests.c | 21 ++++++++--
|
|
2 files changed, 65 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/scripts/rdma-migration-helper.sh b/scripts/rdma-migration-helper.sh
|
|
index a39f2fb0e5..d784d1566a 100755
|
|
--- a/scripts/rdma-migration-helper.sh
|
|
+++ b/scripts/rdma-migration-helper.sh
|
|
@@ -8,23 +8,44 @@ get_ipv4_addr()
|
|
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
|
|
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
|
|
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()
|
|
{
|
|
+ family=$1
|
|
for r in $(rdma_interfaces)
|
|
do
|
|
- ipv4_interfaces | grep -qw $r && get_ipv4_addr $r && return
|
|
+ "$family"_interfaces | grep -qw $r && get_"$family"_addr $r && return
|
|
done
|
|
|
|
return 1
|
|
@@ -32,16 +53,23 @@ rdma_rxe_detect()
|
|
|
|
rdma_rxe_setup()
|
|
{
|
|
- for i in $(ipv4_interfaces)
|
|
+ family=$1
|
|
+ for i in $("$family"_interfaces)
|
|
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" && {
|
|
- 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
|
|
}
|
|
done
|
|
|
|
- echo "Failed to setup any new rdma/rxe link" >&2
|
|
+ echo "$family: Failed to setup any new rdma/rxe link" >&2
|
|
return 1
|
|
}
|
|
|
|
@@ -50,6 +78,12 @@ rdma_rxe_clean()
|
|
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}
|
|
|
|
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
|
|
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
|
|
- rdma_rxe_detect
|
|
+ rdma_rxe_detect "$IP_FAMILY"
|
|
else
|
|
echo "Usage: $0 [setup | detect | clean]"
|
|
fi
|
|
diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/precopy-tests.c
|
|
index 5be1cd5742..a62d3c5378 100644
|
|
--- a/tests/qtest/migration/precopy-tests.c
|
|
+++ b/tests/qtest/migration/precopy-tests.c
|
|
@@ -131,12 +131,13 @@ static bool mlock_check(void)
|
|
}
|
|
|
|
#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];
|
|
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");
|
|
|
|
FILE *pipe = popen(cmd, "r");
|
|
@@ -161,7 +162,7 @@ static int new_rdma_link(char *buffer)
|
|
return -1;
|
|
}
|
|
|
|
-static void test_precopy_rdma_plain(void)
|
|
+static void __test_precopy_rdma_plain(bool ipv6)
|
|
{
|
|
char buffer[128] = {};
|
|
|
|
@@ -170,7 +171,7 @@ static void test_precopy_rdma_plain(void)
|
|
return;
|
|
}
|
|
|
|
- if (new_rdma_link(buffer)) {
|
|
+ if (new_rdma_link(buffer, ipv6)) {
|
|
g_test_skip("No rdma link available\n"
|
|
"# To enable the test:\n"
|
|
"# Run \'" RDMA_MIGRATION_HELPER " setup\' with root to "
|
|
@@ -193,6 +194,16 @@ static void test_precopy_rdma_plain(void)
|
|
|
|
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
|
|
|
|
static void test_precopy_tcp_plain(void)
|
|
@@ -1226,6 +1237,8 @@ static void migration_test_add_precopy_smoke(MigrationTestEnv *env)
|
|
#ifdef CONFIG_RDMA
|
|
migration_test_add("/migration/precopy/rdma/plain",
|
|
test_precopy_rdma_plain);
|
|
+ migration_test_add("/migration/precopy/rdma/plain/ipv6",
|
|
+ test_precopy_rdma_plain_ipv6);
|
|
#endif
|
|
}
|
|
|
|
--
|
|
2.39.3
|
|
|