Skip to content

Commit 1524f20

Browse files
paulmckrcuNeeraj Upadhyay (AMD)
authored andcommitted
torture: Default --no-rcutasksflavors on arm64
Because arm64 does not support CONFIG_SMP=n kernels, --do-rcutasksflavors gets Kconfig errors when running the TINY01 rcutorture scenario. This commit therefore makes --no-rcutasksflavors be the default on arm64. Once kvm.sh automatically deselects CONFIG_SMP=n rcutorture scenarios on arm64, the two lines marked "FIXME" can be changed back from "${ifnotaarch64}" to "yes". Note that arm64 users can still specify --do-rcutasksflavors in order to override this default. Signed-off-by: Paul E. McKenney <[email protected]> Signed-off-by: Neeraj Upadhyay (AMD) <[email protected]>
1 parent 955a834 commit 1524f20

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

tools/testing/selftests/rcutorture/bin/torture.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ then
3030
VERBOSE_BATCH_CPUS=0
3131
fi
3232

33+
# Machine architecture? ("uname -p" is said to be less portable.)1
34+
thisarch="`uname -m`"
35+
if test "${thisarch}" = aarch64
36+
then
37+
ifnotaarch64=no
38+
else
39+
ifnotaarch64=yes
40+
fi
41+
3342
# Configurations/scenarios.
3443
configs_rcutorture=
3544
configs_locktorture=
@@ -57,7 +66,7 @@ do_kasan=yes
5766
do_kcsan=no
5867
do_clocksourcewd=yes
5968
do_rt=yes
60-
do_rcutasksflavors=yes
69+
do_rcutasksflavors="${ifnotaarch64}" # FIXME: Back to "yes" when SMP=n auto-avoided
6170
do_srcu_lockdep=yes
6271
do_rcu_rust=no
6372

@@ -124,7 +133,7 @@ do
124133
;;
125134
--do-all|--doall)
126135
do_allmodconfig=yes
127-
do_rcutasksflavor=yes
136+
do_rcutasksflavors="${ifnotaarch64}" # FIXME: Back to "yes" when SMP=n auto-avoided
128137
do_rcutorture=yes
129138
do_locktorture=yes
130139
do_scftorture=yes

0 commit comments

Comments
 (0)