qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rcutorture: Make torture.sh allow for --kasan 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2117491
Conflicts: A fuzz due to upstream merge conflict with commit b6f3c6a2b1fe
	   ("torture: Add rcu_normal and rcu_expedited runs to
	   torture.sh"). See upstream merge commit be05ee54378d.

commit fb036ad7db108649189d6577051a87e3d3741cf4
Author: Paul E. McKenney <paulmck@kernel.org>
Date:   Mon, 28 Mar 2022 13:30:15 -0700

    rcutorture: Make torture.sh allow for --kasan

    The torture.sh script provides extra memory for scftorture and rcuscale.
    However, the total memory provided is only 1G, which is less than the
    2G that is required for KASAN testing.  This commit therefore ups the
    torture.sh script's 1G to 2G.

    Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

Signed-off-by: Waiman Long <longman@redhat.com>
This commit is contained in:
Waiman Long 2022-08-30 17:22:22 -04:00
parent 7034ab5f16
commit 911c5057ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/rcutorture/bin/torture.sh
View File

@ -359,7 +359,7 @@ fi
if test "$do_scftorture" = "yes"
then
torture_bootargs="scftorture.nthreads=$HALF_ALLOTED_CPUS torture.disable_onoff_at_boot csdlock_debug=1"
torture_set "scftorture" tools/testing/selftests/rcutorture/bin/kvm.sh --torture scf --allcpus --duration "$duration_scftorture" --configs "$configs_scftorture" --kconfig "CONFIG_NR_CPUS=$HALF_ALLOTED_CPUS" --memory 1G --trust-make
torture_set "scftorture" tools/testing/selftests/rcutorture/bin/kvm.sh --torture scf --allcpus --duration "$duration_scftorture" --configs "$configs_scftorture" --kconfig "CONFIG_NR_CPUS=$HALF_ALLOTED_CPUS" --memory 2G --trust-make
fi
if test "$do_rt" = "yes"
@ -400,7 +400,7 @@ done
if test "$do_kvfree" = "yes"
then
torture_bootargs="rcuscale.kfree_rcu_test=1 rcuscale.kfree_nthreads=16 rcuscale.holdoff=20 rcuscale.kfree_loops=10000 torture.disable_onoff_at_boot"
torture_set "rcuscale-kvfree" tools/testing/selftests/rcutorture/bin/kvm.sh --torture rcuscale --allcpus --duration 10 --kconfig "CONFIG_NR_CPUS=$HALF_ALLOTED_CPUS" --memory 1G --trust-make
torture_set "rcuscale-kvfree" tools/testing/selftests/rcutorture/bin/kvm.sh --torture rcuscale --allcpus --duration 10 --kconfig "CONFIG_NR_CPUS=$HALF_ALLOTED_CPUS" --memory 2G --trust-make
fi
if test "$do_clocksourcewd" = "yes"