Skip to contentSkip to conversation

x86/rcutorture move CONFIG_HYPERVISOR_GUEST to kvm-test-1-run.sh

PATCH In review Zhouyi Zhou 2 participants 3 messages Apr 27, 2024 – Apr 30, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/rcutorture move CONFIG_HYPERVISOR_GUEST to kvm-test-1-run.sh

CONFIG_HYPERVISOR_GUEST is a x86 specific kernel option, move to kvm-test-1-run.sh to avoid ConfigFragment.diags in non-x86 platforms.

Tested in both PPC VM of Open Source lab of Oregon State University and local x86_64 server.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")
---
 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 4 ++++
 tools/testing/selftests/rcutorture/configs/rcu/CFcommon  | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +4 -0
index b33cd8753689..75774bc70be7 100755
@@ -68,6 +68,10 @@ config_override_param "--gdb options" KcList "$TORTURE_KCONFIG_GDB_ARG"
 config_override_param "--kasan options" KcList "$TORTURE_KCONFIG_KASAN_ARG"
 config_override_param "--kcsan options" KcList "$TORTURE_KCONFIG_KCSAN_ARG"
 config_override_param "--kconfig argument" KcList "$TORTURE_KCONFIG_ARG"
+if uname -a | grep -q x86
+then
+	config_override_param "x86 specific option" KcList "CONFIG_HYPERVISOR_GUEST=y"
+fi
 cp $T/KcList $resdir/ConfigFragment
 
 base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
tools/testing/selftests/rcutorture/configs/rcu/CFcommon +0 -1
index 0e92d85313aa..cf0387ae5358 100644
@@ -1,6 +1,5 @@
 CONFIG_RCU_TORTURE_TEST=y
 CONFIG_PRINTK_TIME=y
-CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 CONFIG_KVM_GUEST=y
 CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=n
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 8 lines · Zhouyi Zhou

CONFIG_HYPERVISOR_GUEST is a x86 specific kernel option, move to kvm-test-1-run.sh to avoid ConfigFragment.diags in non-x86 platforms.

Tested in both PPC VM of Open Source lab of Oregon State University and local x86_64 server.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")

I like this general approach, but why not have something like a CFCOMMON.arch for the various "arch"s that need it?

Better yet, I bet that there is already something somewhere in the Linux kernel source tree that knows what hypervisor Kconfig options each architecture needs. If so, it would be most excellent to reuse that information instead of maintaining it separately in RCU.

Thanx, Paul

Quoted 34 lines
---
 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 4 ++++
 tools/testing/selftests/rcutorture/configs/rcu/CFcommon  | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +4 -0
index b33cd8753689..75774bc70be7 100755
@@ -68,6 +68,10 @@ config_override_param "--gdb options" KcList "$TORTURE_KCONFIG_GDB_ARG"
 config_override_param "--kasan options" KcList "$TORTURE_KCONFIG_KASAN_ARG"
 config_override_param "--kcsan options" KcList "$TORTURE_KCONFIG_KCSAN_ARG"
 config_override_param "--kconfig argument" KcList "$TORTURE_KCONFIG_ARG"
+if uname -a | grep -q x86
+then
+	config_override_param "x86 specific option" KcList "CONFIG_HYPERVISOR_GUEST=y"
+fi
 cp $T/KcList $resdir/ConfigFragment
 
 base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
tools/testing/selftests/rcutorture/configs/rcu/CFcommon +0 -1
index 0e92d85313aa..cf0387ae5358 100644
@@ -1,6 +1,5 @@
 CONFIG_RCU_TORTURE_TEST=y
 CONFIG_PRINTK_TIME=y
-CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 CONFIG_KVM_GUEST=y
 CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=n
Signature · 1 line
2.34.1
#2 lore raw
Quoted 11 lines · Paul E. McKenney
Quoted 8 lines · Zhouyi Zhou

CONFIG_HYPERVISOR_GUEST is a x86 specific kernel option, move to kvm-test-1-run.sh to avoid ConfigFragment.diags in non-x86 platforms.

Tested in both PPC VM of Open Source lab of Oregon State University and local x86_64 server.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")
Quoted 7 lines

I like this general approach, but why not have something like a CFCOMMON.arch for the various "arch"s that need it?

Better yet, I bet that there is already something somewhere in the Linux kernel source tree that knows what hypervisor Kconfig options each architecture needs. If so, it would be most excellent to reuse that information instead of maintaining it separately in RCU.

Thank Paul for your great guidance and valuable advice!

I will do a thorough research on the above approaches.

Thanks again ;-)
Zhouyi

Quoted 37 lines

Thanx, Paul

Quoted 34 lines
---
 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 4 ++++
 tools/testing/selftests/rcutorture/configs/rcu/CFcommon  | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +4 -0
index b33cd8753689..75774bc70be7 100755
@@ -68,6 +68,10 @@ config_override_param "--gdb options" KcList "$TORTURE_KCONFIG_GDB_ARG"
 config_override_param "--kasan options" KcList "$TORTURE_KCONFIG_KASAN_ARG"
 config_override_param "--kcsan options" KcList "$TORTURE_KCONFIG_KCSAN_ARG"
 config_override_param "--kconfig argument" KcList "$TORTURE_KCONFIG_ARG"
+if uname -a | grep -q x86
+then
+     config_override_param "x86 specific option" KcList "CONFIG_HYPERVISOR_GUEST=y"
+fi
 cp $T/KcList $resdir/ConfigFragment
 
 base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
tools/testing/selftests/rcutorture/configs/rcu/CFcommon +0 -2
index 0e92d85313aa..cf0387ae5358 100644
@@ -1,6 +1,5 @@
 CONFIG_RCU_TORTURE_TEST=y
 CONFIG_PRINTK_TIME=y
-CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 CONFIG_KVM_GUEST=y
 CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=n
--

2.34.1