Skip to contentSkip to conversation

rcutorture: Add CFcommon.arch for the various arch's need

PATCH In review Zhouyi Zhou 3 participants 5 messages Jun 19, 2024 – Jun 21, 2024

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

PATCH v4 1/1 rcutorture: Add CFcommon.arch for the various arch's need

Add CFcommon.arch for the various arch's need for rcutorture.

In accordance with [1], [2] and [3], move x86 specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.arch, also move kernel option CONFIG_KVM_GUEST which only exists on x86 & PowerPC to CFcommon.arch.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")
---
 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh        | 2 ++
 tools/testing/selftests/rcutorture/configs/rcu/CFcommon         | 2 --
 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686    | 2 ++
 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le | 1 +
 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64  | 2 ++
 5 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +2 -0
index b33cd8753689..ad79784e552d 100755
@@ -68,6 +68,8 @@ 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"
+config_override_param "$config_dir/CFcommon.$(uname -m)" KcList \
+		      "`cat $config_dir/CFcommon.$(uname -m) 2> /dev/null`"
 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..217597e84905 100644
@@ -1,7 +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
 CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=n
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686 new file +2 -0
new file mode 100644
index 000000000000..d8b2f555686f
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le new file +1 -0
new file mode 100644
index 000000000000..133da04247ee
@@ -0,0 +1 @@
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64 new file +2 -0
new file mode 100644
index 000000000000..d8b2f555686f
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
Signature · 1 line
2.39.2
maintainer
#1 lore raw
Quoted 10 lines · Zhouyi Zhou

Add CFcommon.arch for the various arch's need for rcutorture.

In accordance with [1], [2] and [3], move x86 specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.arch, also move kernel option CONFIG_KVM_GUEST which only exists on x86 & PowerPC to CFcommon.arch.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Quoted 6 lines

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")

Thank you! I have reverted the earlier version to queue this one. Please check below to make sure that my usual wordsmithing did not mess things up.

Mark, any suggestions for any needed ARM CFcommon.arch files? Or does moving out the x86/PowerPC-specific Kconfig options take care of things for you guys? (Hey, I can dream, can't I?)

Thanx, Paul

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

commit 9d6767c47ce4de2ef817e47a5882748d8008ebe9

Author: Zhouyi Zhou <[email protected]>
Date:   Wed Jun 19 23:06:58 2024 +0000

rcutorture: Add CFcommon.arch for arch-specific Kconfig options

Add CFcommon.arch for arch-specific Kconfig options.

In accordance with [1], [2] and [3], move the x86-specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.i686 and CFcommon.x86_64, and also move the x86/PowerPC CONFIG_KVM_GUEST Kconfig option to CFcommon.i686, CFcommon.x86_64, and CFcommon.ppc64le.

The "arch" in CFcommon.arch is taken from the "uname -m" command.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +2 -0
index b33cd87536899..ad79784e552d2 100755
@@ -68,6 +68,8 @@ 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"
+config_override_param "$config_dir/CFcommon.$(uname -m)" KcList \
+		      "`cat $config_dir/CFcommon.$(uname -m) 2> /dev/null`"
 cp $T/KcList $resdir/ConfigFragment
 
 base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
tools/testing/selftests/rcutorture/configs/rcu/CFcommon +0 -2
index 0e92d85313aa7..217597e849052 100644
@@ -1,7 +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
 CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=n
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686 new file +2 -0
new file mode 100644
index 0000000000000..d8b2f555686fb
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le new file +1 -0
new file mode 100644
index 0000000000000..133da04247ee0
@@ -0,0 +1 @@
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64 new file +2 -0
new file mode 100644
index 0000000000000..d8b2f555686fb
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
#2 lore raw
Quoted 14 lines · Paul E. McKenney
Quoted 12 lines · Zhouyi Zhou

Add CFcommon.arch for the various arch's need for rcutorture.

In accordance with [1], [2] and [3], move x86 specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.arch, also move kernel option CONFIG_KVM_GUEST which only exists on x86 & PowerPC to CFcommon.arch.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

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

Thank you! I have reverted the earlier version to queue this one. Please check below to make sure that my usual wordsmithing did not mess things up.

I have studied the edition thoroughly, it is wonderful, and I learn a lot through this
process!

Quoted 4 lines

Mark, any suggestions for any needed ARM CFcommon.arch files? Or does moving out the x86/PowerPC-specific Kconfig options take care of things for you guys? (Hey, I can dream, can't I?)

Thank you both for your guidance!

Regards
Zhouyi

Quoted 80 lines

Thanx, Paul

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

commit 9d6767c47ce4de2ef817e47a5882748d8008ebe9

Author: Zhouyi Zhou <[email protected]>
Date:   Wed Jun 19 23:06:58 2024 +0000

rcutorture: Add CFcommon.arch for arch-specific Kconfig options

Add CFcommon.arch for arch-specific Kconfig options.

In accordance with [1], [2] and [3], move the x86-specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.i686 and CFcommon.x86_64, and also move the x86/PowerPC CONFIG_KVM_GUEST Kconfig option to CFcommon.i686, CFcommon.x86_64, and CFcommon.ppc64le.

The "arch" in CFcommon.arch is taken from the "uname -m" command.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +2 -0
index b33cd87536899..ad79784e552d2 100755
@@ -68,6 +68,8 @@ 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"
+config_override_param "$config_dir/CFcommon.$(uname -m)" KcList \
+                     "`cat $config_dir/CFcommon.$(uname -m) 2> /dev/null`"
 cp $T/KcList $resdir/ConfigFragment
 
 base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
tools/testing/selftests/rcutorture/configs/rcu/CFcommon +0 -2
index 0e92d85313aa7..217597e849052 100644
@@ -1,7 +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
 CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=n
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686 new file +2 -0
new file mode 100644
index 0000000000000..d8b2f555686fb
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le new file +1 -0
new file mode 100644
index 0000000000000..133da04247ee0
@@ -0,0 +1 @@
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64 new file +2 -0
new file mode 100644
index 0000000000000..d8b2f555686fb
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
Acked-by
#3 lore raw
In reply to Paul E. McKenney
Quoted 18 lines · Paul E. McKenney
Quoted 10 lines · Zhouyi Zhou

Add CFcommon.arch for the various arch's need for rcutorture.

In accordance with [1], [2] and [3], move x86 specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.arch, also move kernel option CONFIG_KVM_GUEST which only exists on x86 & PowerPC to CFcommon.arch.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Quoted 6 lines

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

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

Thank you! I have reverted the earlier version to queue this one. Please check below to make sure that my usual wordsmithing did not mess things up.

Mark, any suggestions for any needed ARM CFcommon.arch files? Or does moving out the x86/PowerPC-specific Kconfig options take care of things for you guys? (Hey, I can dream, can't I?)

I'm not aware of anything that we specifically need enabled, so pulling out those bits should be everything -- I've given my Ack below.

Quoted 23 lines

Thanx, Paul

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

commit 9d6767c47ce4de2ef817e47a5882748d8008ebe9

Author: Zhouyi Zhou <[email protected]>
Date:   Wed Jun 19 23:06:58 2024 +0000

rcutorture: Add CFcommon.arch for arch-specific Kconfig options

Add CFcommon.arch for arch-specific Kconfig options.

In accordance with [1], [2] and [3], move the x86-specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.i686 and CFcommon.x86_64, and also move the x86/PowerPC CONFIG_KVM_GUEST Kconfig option to CFcommon.i686, CFcommon.x86_64, and CFcommon.ppc64le.

The "arch" in CFcommon.arch is taken from the "uname -m" command.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Quoted 7 lines

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")

Mark.

Quoted 49 lines
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +2 -0
index b33cd87536899..ad79784e552d2 100755
@@ -68,6 +68,8 @@ 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"
+config_override_param "$config_dir/CFcommon.$(uname -m)" KcList \
+		      "`cat $config_dir/CFcommon.$(uname -m) 2> /dev/null`"
 cp $T/KcList $resdir/ConfigFragment
 
 base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
tools/testing/selftests/rcutorture/configs/rcu/CFcommon +0 -2
index 0e92d85313aa7..217597e849052 100644
@@ -1,7 +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
 CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=n
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686 new file +2 -0
new file mode 100644
index 0000000000000..d8b2f555686fb
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le new file +1 -0
new file mode 100644
index 0000000000000..133da04247ee0
@@ -0,0 +1 @@
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64 new file +2 -0
new file mode 100644
index 0000000000000..d8b2f555686fb
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
maintainer
#4 lore raw
Quoted 23 lines · Mark Rutland
Quoted 22 lines · Paul E. McKenney
Quoted 10 lines · Zhouyi Zhou

Add CFcommon.arch for the various arch's need for rcutorture.

In accordance with [1], [2] and [3], move x86 specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.arch, also move kernel option CONFIG_KVM_GUEST which only exists on x86 & PowerPC to CFcommon.arch.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Quoted 6 lines

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")

Thank you! I have reverted the earlier version to queue this one. Please check below to make sure that my usual wordsmithing did not mess things up.

Quoted 6 lines
Quoted 3 lines

Mark, any suggestions for any needed ARM CFcommon.arch files? Or does moving out the x86/PowerPC-specific Kconfig options take care of things for you guys? (Hey, I can dream, can't I?)

I'm not aware of anything that we specifically need enabled, so pulling out those bits should be everything -- I've given my Ack below.

Sometimes dreams come true? ;-)

And thank you -- I will apply your ack on my next rebase.

Thanx, Paul

Quoted 83 lines
Quoted 21 lines

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

commit 9d6767c47ce4de2ef817e47a5882748d8008ebe9

Author: Zhouyi Zhou <[email protected]>
Date:   Wed Jun 19 23:06:58 2024 +0000

rcutorture: Add CFcommon.arch for arch-specific Kconfig options

Add CFcommon.arch for arch-specific Kconfig options.

In accordance with [1], [2] and [3], move the x86-specific kernel option CONFIG_HYPERVISOR_GUEST to CFcommon.i686 and CFcommon.x86_64, and also move the x86/PowerPC CONFIG_KVM_GUEST Kconfig option to CFcommon.i686, CFcommon.x86_64, and CFcommon.ppc64le.

The "arch" in CFcommon.arch is taken from the "uname -m" command.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/059d36ce-6453-42be-a31e-895abd35d590@paulmck-laptop/
[3] https://lore.kernel.org/all/ZnBkHosMDhsh4H8g@J2N7QTR9R3/

Quoted 7 lines

Tested in x86_64 and PPC VM of Open Source Lab of Oregon State University.

Fixes a6fda6dab93c ("rcutorture: Tweak kvm options")

Mark.

Quoted 49 lines
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +2 -0
index b33cd87536899..ad79784e552d2 100755
@@ -68,6 +68,8 @@ 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"
+config_override_param "$config_dir/CFcommon.$(uname -m)" KcList \
+		      "`cat $config_dir/CFcommon.$(uname -m) 2> /dev/null`"
 cp $T/KcList $resdir/ConfigFragment
 
 base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
tools/testing/selftests/rcutorture/configs/rcu/CFcommon +0 -2
index 0e92d85313aa7..217597e849052 100644
@@ -1,7 +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
 CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=n
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686 new file +2 -0
new file mode 100644
index 0000000000000..d8b2f555686fb
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le new file +1 -0
new file mode 100644
index 0000000000000..133da04247ee0
@@ -0,0 +1 @@
+CONFIG_KVM_GUEST=y
tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64 new file +2 -0
new file mode 100644
index 0000000000000..d8b2f555686fb
@@ -0,0 +1,2 @@
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y