Skip to content

Commit 99c80a9

Browse files
committed
torture: Compress KCSAN as well as KASAN vmlinux files
Compressing KASAN vmlinux files reduces torture.sh res file size from about 100G to about 50G, which is good, but the KCSAN vmlinux files are also large. Compressing them reduces their size from about 700M to about 100M (but of course your mileage may vary). This commit therefore compresses both KASAN and KCSAN vmlinux files. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
1 parent 9a32ed1 commit 99c80a9

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ configs_scftorture=
3737
kcsan_kmake_args=
3838

3939
# Default compression, duration, and apportionment.
40-
compress_kasan_vmlinux="`identify_qemu_vcpus`"
40+
compress_concurrency="`identify_qemu_vcpus`"
4141
duration_base=10
4242
duration_rcutorture_frac=7
4343
duration_locktorture_frac=1
@@ -67,7 +67,7 @@ function doyesno () {
6767

6868
usage () {
6969
echo "Usage: $scriptname optional arguments:"
70-
echo " --compress-kasan-vmlinux concurrency"
70+
echo " --compress-concurrency concurrency"
7171
echo " --configs-rcutorture \"config-file list w/ repeat factor (3*TINY01)\""
7272
echo " --configs-locktorture \"config-file list w/ repeat factor (10*LOCK01)\""
7373
echo " --configs-scftorture \"config-file list w/ repeat factor (2*CFLIST)\""
@@ -91,9 +91,9 @@ usage () {
9191
while test $# -gt 0
9292
do
9393
case "$1" in
94-
--compress-kasan-vmlinux)
95-
checkarg --compress-kasan-vmlinux "(concurrency level)" $# "$2" '^[0-9][0-9]*$' '^error'
96-
compress_kasan_vmlinux=$2
94+
--compress-concurrency)
95+
checkarg --compress-concurrency "(concurrency level)" $# "$2" '^[0-9][0-9]*$' '^error'
96+
compress_concurrency=$2
9797
shift
9898
;;
9999
--config-rcutorture|--configs-rcutorture)
@@ -435,11 +435,11 @@ then
435435
echo " All bugs were KCSAN failures."
436436
fi
437437
tdir="`cat $T/successes $T/failures | head -1 | awk '{ print $NF }' | sed -e 's,/[^/]\+/*$,,'`"
438-
if test -n "$tdir" && test $compress_kasan_vmlinux -gt 0
438+
if test -n "$tdir" && test $compress_concurrency -gt 0
439439
then
440440
# KASAN vmlinux files can approach 1GB in size, so compress them.
441-
echo Looking for KASAN files to compress: `date` > "$tdir/log-xz" 2>&1
442-
find "$tdir" -type d -name '*-kasan' -print > $T/xz-todo
441+
echo Looking for K[AC]SAN files to compress: `date` > "$tdir/log-xz" 2>&1
442+
find "$tdir" -type d -name '*-k[ac]san' -print > $T/xz-todo
443443
ncompresses=0
444444
batchno=1
445445
if test -s $T/xz-todo
@@ -457,7 +457,7 @@ then
457457
do
458458
xz "$j" >> "$tdir/log-xz" 2>&1 &
459459
ncompresses=$((ncompresses+1))
460-
if test $ncompresses -ge $compress_kasan_vmlinux
460+
if test $ncompresses -ge $compress_concurrency
461461
then
462462
echo Waiting for batch $batchno of $ncompresses compressions `date` | tee -a "$tdir/log-xz" | tee -a $T/log
463463
wait

0 commit comments

Comments
 (0)