mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
Merge branch 'rcu-torture.20260104a' into rcu-next
* rcu-torture.20260104a: rcutorture: Add --kill-previous option to terminate previous kvm.sh runs rcutorture: Prevent concurrent kvm.sh runs on same source tree torture: Include commit discription in testid.txt torture: Make config2csv.sh properly handle comments in .boot files torture: Make kvm-series.sh give run numbers and totals torture: Make kvm-series.sh give build numbers and totals torture: Parallelize kvm-series.sh guest-OS execution rcutorture: Add context checks to rcu_torture_timer()
This commit is contained in:
Boqun Feng
@@ -2454,6 +2454,9 @@ static DEFINE_TORTURE_RANDOM_PERCPU(rcu_torture_timer_rand);
|
||||
*/
|
||||
static void rcu_torture_timer(struct timer_list *unused)
|
||||
{
|
||||
WARN_ON_ONCE(!in_serving_softirq());
|
||||
WARN_ON_ONCE(in_hardirq());
|
||||
WARN_ON_ONCE(in_nmi());
|
||||
atomic_long_inc(&n_rcu_torture_timers);
|
||||
(void)rcu_torture_one_read(this_cpu_ptr(&rcu_torture_timer_rand), -1);
|
||||
|
||||
|
||||
@@ -3,3 +3,4 @@ initrd
|
||||
b[0-9]*
|
||||
res
|
||||
*.swp
|
||||
.kvm.sh.lock
|
||||
|
||||
@@ -42,7 +42,7 @@ do
|
||||
grep -v '^#' < $i | grep -v '^ *$' > $T/p
|
||||
if test -r $i.boot
|
||||
then
|
||||
tr -s ' ' '\012' < $i.boot | grep -v '^#' >> $T/p
|
||||
sed -e 's/#.*$//' < $i.boot | tr -s ' ' '\012' >> $T/p
|
||||
fi
|
||||
sed -e 's/^[^=]*$/&=?/' < $T/p |
|
||||
sed -e 's/^\([^=]*\)=\(.*\)$/\tp["\1:'"$i"'"] = "\2";\n\tc["\1"] = 1;/' >> $T/p.awk
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
# This script is intended to replace kvm-check-branches.sh by providing
|
||||
# ease of use and faster execution.
|
||||
|
||||
T="`mktemp -d ${TMPDIR-/tmp}/kvm-series.sh.XXXXXX`"
|
||||
T="`mktemp -d ${TMPDIR-/tmp}/kvm-series.sh.XXXXXX`"; export T
|
||||
trap 'rm -rf $T' 0
|
||||
|
||||
scriptname=$0
|
||||
@@ -32,6 +32,7 @@ then
|
||||
echo "$0: Repetition ('*') not allowed in config list."
|
||||
exit 1
|
||||
fi
|
||||
config_list_len="`echo ${config_list} | wc -w | awk '{ print $1; }'`"
|
||||
|
||||
commit_list="${2}"
|
||||
if test -z "${commit_list}"
|
||||
@@ -47,70 +48,209 @@ then
|
||||
exit 2
|
||||
fi
|
||||
sha1_list=`cat $T/commits`
|
||||
sha1_list_len="`echo ${sha1_list} | wc -w | awk '{ print $1; }'`"
|
||||
|
||||
shift
|
||||
shift
|
||||
|
||||
RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE
|
||||
PATH=${RCUTORTURE}/bin:$PATH; export PATH
|
||||
RES="${RCUTORTURE}/res"; export RES
|
||||
. functions.sh
|
||||
|
||||
ret=0
|
||||
nfail=0
|
||||
nbuildfail=0
|
||||
nrunfail=0
|
||||
nsuccess=0
|
||||
faillist=
|
||||
ncpus=0
|
||||
buildfaillist=
|
||||
runfaillist=
|
||||
successlist=
|
||||
cursha1="`git rev-parse --abbrev-ref HEAD`"
|
||||
ds="`date +%Y.%m.%d-%H.%M.%S`-series"
|
||||
DS="${RES}/${ds}"; export DS
|
||||
startdate="`date`"
|
||||
starttime="`get_starttime`"
|
||||
|
||||
echo " --- " $scriptname $args | tee -a $T/log
|
||||
echo " --- Results directory: " $ds | tee -a $T/log
|
||||
|
||||
# Do all builds. Iterate through commits within a given scenario
|
||||
# because builds normally go faster from one commit to the next within a
|
||||
# given scenario. In contrast, switching scenarios on each rebuild will
|
||||
# often force a full rebuild due to Kconfig differences, for example,
|
||||
# turning preemption on and off. Defer actual runs in order to run
|
||||
# lots of them concurrently on large systems.
|
||||
touch $T/torunlist
|
||||
n2build="$((config_list_len*sha1_list_len))"
|
||||
nbuilt=0
|
||||
for config in ${config_list}
|
||||
do
|
||||
sha_n=0
|
||||
for sha in ${sha1_list}
|
||||
do
|
||||
sha1=${sha_n}.${sha} # Enable "sort -k1nr" to list commits in order.
|
||||
echo Starting ${config}/${sha1} at `date` | tee -a $T/log
|
||||
git checkout "${sha}"
|
||||
time tools/testing/selftests/rcutorture/bin/kvm.sh --configs "$config" --datestamp "$ds/${config}/${sha1}" --duration 1 "$@"
|
||||
echo
|
||||
echo Starting ${config}/${sha1} "($((nbuilt+1)) of ${n2build})" at `date` | tee -a $T/log
|
||||
git checkout --detach "${sha}"
|
||||
tools/testing/selftests/rcutorture/bin/kvm.sh --configs "$config" --datestamp "$ds/${config}/${sha1}" --duration 1 --build-only --trust-make "$@"
|
||||
curret=$?
|
||||
if test "${curret}" -ne 0
|
||||
then
|
||||
nfail=$((nfail+1))
|
||||
faillist="$faillist ${config}/${sha1}(${curret})"
|
||||
nbuildfail=$((nbuildfail+1))
|
||||
buildfaillist="$buildfaillist ${config}/${sha1}(${curret})"
|
||||
else
|
||||
nsuccess=$((nsuccess+1))
|
||||
successlist="$successlist ${config}/${sha1}"
|
||||
# Successful run, so remove large files.
|
||||
rm -f ${RCUTORTURE}/$ds/${config}/${sha1}/{vmlinux,bzImage,System.map,Module.symvers}
|
||||
batchncpus="`grep -v "^# cpus=" "${DS}/${config}/${sha1}/batches" | awk '{ sum += $3 } END { print sum }'`"
|
||||
echo run_one_qemu ${sha_n} ${config}/${sha1} ${batchncpus} >> $T/torunlist
|
||||
if test "${ncpus}" -eq 0
|
||||
then
|
||||
ncpus="`grep "^# cpus=" "${DS}/${config}/${sha1}/batches" | sed -e 's/^# cpus=//'`"
|
||||
case "${ncpus}" in
|
||||
^[0-9]*$)
|
||||
;;
|
||||
*)
|
||||
ncpus=0
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
if test "${ret}" -eq 0
|
||||
then
|
||||
ret=${curret}
|
||||
fi
|
||||
sha_n=$((sha_n+1))
|
||||
nbuilt=$((nbuilt+1))
|
||||
done
|
||||
done
|
||||
|
||||
# If the user did not specify the number of CPUs, use them all.
|
||||
if test "${ncpus}" -eq 0
|
||||
then
|
||||
ncpus="`identify_qemu_vcpus`"
|
||||
fi
|
||||
|
||||
cpusused=0
|
||||
touch $T/successlistfile
|
||||
touch $T/faillistfile
|
||||
n2run="`wc -l $T/torunlist | awk '{ print $1; }'`"
|
||||
nrun=0
|
||||
|
||||
# do_run_one_qemu ds resultsdir qemu_curout
|
||||
#
|
||||
# Start the specified qemu run and record its success or failure.
|
||||
do_run_one_qemu () {
|
||||
local ret
|
||||
local ds="$1"
|
||||
local resultsdir="$2"
|
||||
local qemu_curout="$3"
|
||||
|
||||
tools/testing/selftests/rcutorture/bin/kvm-again.sh "${DS}/${resultsdir}" --link inplace-force > ${qemu_curout} 2>&1
|
||||
ret=$?
|
||||
if test "${ret}" -eq 0
|
||||
then
|
||||
echo ${resultsdir} >> $T/successlistfile
|
||||
# Successful run, so remove large files.
|
||||
rm -f ${DS}/${resultsdir}/{vmlinux,bzImage,System.map,Module.symvers}
|
||||
else
|
||||
echo "${resultsdir}(${ret})" >> $T/faillistfile
|
||||
fi
|
||||
}
|
||||
|
||||
# cleanup_qemu_batch batchncpus
|
||||
#
|
||||
# Update success and failure lists, files, and counts at the end of
|
||||
# a batch.
|
||||
cleanup_qemu_batch () {
|
||||
local batchncpus="$1"
|
||||
|
||||
echo Waiting, cpusused=${cpusused}, ncpus=${ncpus} `date` | tee -a $T/log
|
||||
wait
|
||||
cpusused="${batchncpus}"
|
||||
nsuccessbatch="`wc -l $T/successlistfile | awk '{ print $1 }'`"
|
||||
nsuccess=$((nsuccess+nsuccessbatch))
|
||||
successlist="$successlist `cat $T/successlistfile`"
|
||||
rm $T/successlistfile
|
||||
touch $T/successlistfile
|
||||
nfailbatch="`wc -l $T/faillistfile | awk '{ print $1 }'`"
|
||||
nrunfail=$((nrunfail+nfailbatch))
|
||||
runfaillist="$runfaillist `cat $T/faillistfile`"
|
||||
rm $T/faillistfile
|
||||
touch $T/faillistfile
|
||||
}
|
||||
|
||||
# run_one_qemu sha_n config/sha1 batchncpus
|
||||
#
|
||||
# Launch into the background the sha_n-th qemu job whose results directory
|
||||
# is config/sha1 and which uses batchncpus CPUs. Once we reach a job that
|
||||
# would overflow the number of available CPUs, wait for the previous jobs
|
||||
# to complete and record their results.
|
||||
run_one_qemu () {
|
||||
local sha_n="$1"
|
||||
local config_sha1="$2"
|
||||
local batchncpus="$3"
|
||||
local qemu_curout
|
||||
|
||||
cpusused=$((cpusused+batchncpus))
|
||||
if test "${cpusused}" -gt $ncpus
|
||||
then
|
||||
cleanup_qemu_batch "${batchncpus}"
|
||||
fi
|
||||
echo Starting ${config_sha1} using ${batchncpus} CPUs "($((nrun+1)) of ${n2run})" `date`
|
||||
qemu_curout="${DS}/${config_sha1}/qemu-series"
|
||||
do_run_one_qemu "$ds" "${config_sha1}" ${qemu_curout} &
|
||||
nrun="$((nrun+1))"
|
||||
}
|
||||
|
||||
# Re-ordering the runs will mess up the affinity chosen at build time
|
||||
# (among other things, over-using CPU 0), so suppress it.
|
||||
TORTURE_NO_AFFINITY="no-affinity"; export TORTURE_NO_AFFINITY
|
||||
|
||||
# Run the kernels (if any) that built correctly.
|
||||
echo | tee -a $T/log # Put a blank line between build and run messages.
|
||||
. $T/torunlist
|
||||
cleanup_qemu_batch "${batchncpus}"
|
||||
|
||||
# Get back to initial checkout/SHA-1.
|
||||
git checkout "${cursha1}"
|
||||
|
||||
echo ${nsuccess} SUCCESSES: | tee -a $T/log
|
||||
echo ${successlist} | fmt | tee -a $T/log
|
||||
echo | tee -a $T/log
|
||||
echo ${nfail} FAILURES: | tee -a $T/log
|
||||
echo ${faillist} | fmt | tee -a $T/log
|
||||
if test -n "${faillist}"
|
||||
# Throw away leading and trailing space characters for fmt.
|
||||
successlist="`echo ${successlist} | sed -e 's/^ *//' -e 's/ *$//'`"
|
||||
buildfaillist="`echo ${buildfaillist} | sed -e 's/^ *//' -e 's/ *$//'`"
|
||||
runfaillist="`echo ${runfaillist} | sed -e 's/^ *//' -e 's/ *$//'`"
|
||||
|
||||
# Print lists of successes, build failures, and run failures, if any.
|
||||
if test "${nsuccess}" -gt 0
|
||||
then
|
||||
echo | tee -a $T/log
|
||||
echo Failures across commits: | tee -a $T/log
|
||||
echo ${faillist} | tr ' ' '\012' | sed -e 's,^[^/]*/,,' -e 's/([0-9]*)//' |
|
||||
echo ${nsuccess} SUCCESSES: | tee -a $T/log
|
||||
echo ${successlist} | fmt | tee -a $T/log
|
||||
fi
|
||||
if test "${nbuildfail}" -gt 0
|
||||
then
|
||||
echo | tee -a $T/log
|
||||
echo ${nbuildfail} BUILD FAILURES: | tee -a $T/log
|
||||
echo ${buildfaillist} | fmt | tee -a $T/log
|
||||
fi
|
||||
if test "${nrunfail}" -gt 0
|
||||
then
|
||||
echo | tee -a $T/log
|
||||
echo ${nrunfail} RUN FAILURES: | tee -a $T/log
|
||||
echo ${runfaillist} | fmt | tee -a $T/log
|
||||
fi
|
||||
|
||||
# If there were build or runtime failures, map them to commits.
|
||||
if test "${nbuildfail}" -gt 0 || test "${nrunfail}" -gt 0
|
||||
then
|
||||
echo | tee -a $T/log
|
||||
echo Build failures across commits: | tee -a $T/log
|
||||
echo ${buildfaillist} | tr ' ' '\012' | sed -e 's,^[^/]*/,,' -e 's/([0-9]*)//' |
|
||||
sort | uniq -c | sort -k2n | tee -a $T/log
|
||||
fi
|
||||
|
||||
# Print run summary.
|
||||
echo | tee -a $T/log
|
||||
echo Started at $startdate, ended at `date`, duration `get_starttime_duration $starttime`. | tee -a $T/log
|
||||
echo Summary: Successes: ${nsuccess} Failures: ${nfail} | tee -a $T/log
|
||||
cp $T/log tools/testing/selftests/rcutorture/res/${ds}
|
||||
echo Summary: Successes: ${nsuccess} " "Build Failures: ${nbuildfail} " "Runtime Failures: ${nrunfail}| tee -a $T/log
|
||||
cp $T/log ${DS}
|
||||
|
||||
exit "${ret}"
|
||||
|
||||
@@ -80,6 +80,7 @@ usage () {
|
||||
echo " --kasan"
|
||||
echo " --kconfig Kconfig-options"
|
||||
echo " --kcsan"
|
||||
echo " --kill-previous"
|
||||
echo " --kmake-arg kernel-make-arguments"
|
||||
echo " --mac nn:nn:nn:nn:nn:nn"
|
||||
echo " --memory megabytes|nnnG"
|
||||
@@ -206,6 +207,9 @@ do
|
||||
--kcsan)
|
||||
TORTURE_KCONFIG_KCSAN_ARG="$debuginfo CONFIG_KCSAN=y CONFIG_KCSAN_STRICT=y CONFIG_KCSAN_REPORT_ONCE_IN_MS=100000 CONFIG_KCSAN_VERBOSE=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y"; export TORTURE_KCONFIG_KCSAN_ARG
|
||||
;;
|
||||
--kill-previous)
|
||||
TORTURE_KILL_PREVIOUS=1
|
||||
;;
|
||||
--kmake-arg|--kmake-args)
|
||||
checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$'
|
||||
TORTURE_KMAKE_ARG="`echo "$TORTURE_KMAKE_ARG $2" | sed -e 's/^ *//' -e 's/ *$//'`"
|
||||
@@ -275,6 +279,42 @@ do
|
||||
shift
|
||||
done
|
||||
|
||||
# Prevent concurrent kvm.sh runs on the same source tree. The flock
|
||||
# is automatically released when the script exits, even if killed.
|
||||
TORTURE_LOCK="$RCUTORTURE/.kvm.sh.lock"
|
||||
|
||||
# Terminate any processes holding the lock file, if requested.
|
||||
if test -n "$TORTURE_KILL_PREVIOUS"
|
||||
then
|
||||
if test -e "$TORTURE_LOCK"
|
||||
then
|
||||
echo "Killing processes holding $TORTURE_LOCK..."
|
||||
if fuser -k "$TORTURE_LOCK" >/dev/null 2>&1
|
||||
then
|
||||
sleep 2
|
||||
echo "Previous kvm.sh processes killed."
|
||||
else
|
||||
echo "No processes were holding the lock."
|
||||
fi
|
||||
else
|
||||
echo "No lock file exists, nothing to kill."
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -z "$dryrun"
|
||||
then
|
||||
# Create a file descriptor and flock it, so that when kvm.sh (and its
|
||||
# children) exit, the flock is released by the kernel automatically.
|
||||
exec 9>"$TORTURE_LOCK"
|
||||
if ! flock -n 9
|
||||
then
|
||||
echo "ERROR: Another kvm.sh instance is already running on this tree."
|
||||
echo " Lock file: $TORTURE_LOCK"
|
||||
echo " To run kvm.sh, kill all existing kvm.sh runs first (--kill-previous)."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -n "$dryrun" || test -z "$TORTURE_INITRD" || tools/testing/selftests/rcutorture/bin/mkinitrd.sh
|
||||
then
|
||||
:
|
||||
|
||||
@@ -18,7 +18,7 @@ fi
|
||||
echo Build directory: `pwd` > ${resdir}/testid.txt
|
||||
if test -d .git
|
||||
then
|
||||
echo Current commit: `git rev-parse HEAD` >> ${resdir}/testid.txt
|
||||
echo Current commit: `git show --oneline --no-patch HEAD` >> ${resdir}/testid.txt
|
||||
echo >> ${resdir}/testid.txt
|
||||
echo ' ---' Output of "'"git status"'": >> ${resdir}/testid.txt
|
||||
git status >> ${resdir}/testid.txt
|
||||
|
||||
Reference in New Issue
Block a user