mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-28 08:44:29 -04:00
perf tests: Speed up lock contention analysis shell test
The lock contention analysis test suite (`lock_contention.sh`) performs a series of 13 separate profiling checks to verify various aggregation and filtering parameters of `perf lock contention`. Each of these checks runs the `perf bench sched messaging` messaging benchmark as its workload. By default, `sched messaging` runs 10 groups of 40 processes (400 processes total) generating substantial task scheduling, context switching, and IPC message passing. When traced system-wide for lock events, the tracing overhead (handling millions of lock acquisitions and releases) slows execution down significantly, causing the test suite to take over 80 seconds. Optimize this by introducing a scaled-down messaging benchmark workload: `perf bench sched messaging -g 1 -p`. Running 1 group (40 processes) takes only 0.01 seconds natively (instead of 0.08 seconds), drastically reduces the sheer volume of lock acquire/release trace events, and reduces CPU context switching during tracing while still generating sufficient lock events to fully exercise the BPF/record filters. Assisted-by: Antigravity:gemini-3.1-pro Signed-off-by: Ian Rogers <irogers@google.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
@@ -9,6 +9,10 @@ perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
|
||||
result=$(mktemp /tmp/__perf_test.result.XXXXX)
|
||||
errout=$(mktemp /tmp/__perf_test.errout.XXXXX)
|
||||
|
||||
# Workload to generate lock contention.
|
||||
# Using 1 group (-g 1) keeps runtime low while generating sufficient lock events.
|
||||
msg_workload="perf bench sched messaging -g 1"
|
||||
|
||||
cleanup() {
|
||||
rm -f ${perfdata}
|
||||
rm -f ${result}
|
||||
@@ -50,7 +54,7 @@ check() {
|
||||
test_record()
|
||||
{
|
||||
echo "Testing perf lock record and perf lock contention"
|
||||
perf lock record -o ${perfdata} -- perf bench sched messaging -p > /dev/null 2>&1
|
||||
perf lock record -o ${perfdata} -- ${msg_workload} > /dev/null 2>&1
|
||||
# the output goes to the stderr and we expect only 1 output (-E 1)
|
||||
perf lock contention -i ${perfdata} -E 1 -q 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
@@ -70,7 +74,7 @@ test_bpf()
|
||||
fi
|
||||
|
||||
# the perf lock contention output goes to the stderr
|
||||
perf lock con -a -b -E 1 -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b -E 1 -q -- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] BPF result count is not 1:" "$(cat "${result}" | wc -l)"
|
||||
err=1
|
||||
@@ -81,7 +85,7 @@ test_bpf()
|
||||
test_record_concurrent()
|
||||
{
|
||||
echo "Testing perf lock record and perf lock contention at the same time"
|
||||
perf lock record -o- -- perf bench sched messaging -p 2> ${errout} | \
|
||||
perf lock record -o- -- ${msg_workload} 2> ${errout} | \
|
||||
perf lock contention -i- -E 1 -q 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] Recorded result count is not 1:" "$(cat "${result}" | wc -l)"
|
||||
@@ -107,7 +111,7 @@ test_aggr_task()
|
||||
fi
|
||||
|
||||
# the perf lock contention output goes to the stderr
|
||||
perf lock con -a -b -t -E 1 -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b -t -E 1 -q -- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] BPF result count is not 1:" "$(cat "${result}" | wc -l)"
|
||||
err=1
|
||||
@@ -130,7 +134,7 @@ test_aggr_addr()
|
||||
fi
|
||||
|
||||
# the perf lock contention output goes to the stderr
|
||||
perf lock con -a -b -l -E 1 -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b -l -E 1 -q -- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] BPF result count is not 1:" "$(cat "${result}" | wc -l)"
|
||||
err=1
|
||||
@@ -148,7 +152,7 @@ test_aggr_cgroup()
|
||||
fi
|
||||
|
||||
# the perf lock contention output goes to the stderr
|
||||
perf lock con -a -b --lock-cgroup -E 1 -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b --lock-cgroup -E 1 -q -- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] BPF result count is not 1:" "$(cat "${result}" | wc -l)"
|
||||
err=1
|
||||
@@ -170,7 +174,7 @@ test_type_filter()
|
||||
return
|
||||
fi
|
||||
|
||||
perf lock con -a -b -Y spinlock -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b -Y spinlock -q -- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(grep -c -v spinlock "${result}")" != "0" ]; then
|
||||
echo "[Fail] BPF result should not have non-spinlocks:" "$(cat "${result}")"
|
||||
err=1
|
||||
@@ -202,7 +206,7 @@ test_lock_filter()
|
||||
return
|
||||
fi
|
||||
|
||||
perf lock con -a -b -L tasklist_lock -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b -L tasklist_lock -q -- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(grep -c -v "${test_lock_filter_type}" "${result}")" != "0" ]; then
|
||||
echo "[Fail] BPF result should not have non-${test_lock_filter_type} locks:" "$(cat "${result}")"
|
||||
err=1
|
||||
@@ -241,7 +245,7 @@ test_stack_filter()
|
||||
return
|
||||
fi
|
||||
|
||||
perf lock con -a -b -S unix_stream -E 1 -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b -S unix_stream -E 1 -q -- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] BPF result should have a lock from unix_stream:" "$(cat "${result}")"
|
||||
err=1
|
||||
@@ -269,7 +273,7 @@ test_aggr_task_stack_filter()
|
||||
return
|
||||
fi
|
||||
|
||||
perf lock con -a -b -t -S unix_stream -E 1 -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b -t -S unix_stream -E 1 -q -- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] BPF result should have a task from unix_stream:" "$(cat "${result}")"
|
||||
err=1
|
||||
@@ -285,7 +289,8 @@ test_cgroup_filter()
|
||||
return
|
||||
fi
|
||||
|
||||
perf lock con -a -b --lock-cgroup -E 1 -F wait_total -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b --lock-cgroup -E 1 -F wait_total -q \
|
||||
-- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] BPF result should have a cgroup result:" "$(cat "${result}")"
|
||||
err=1
|
||||
@@ -293,7 +298,8 @@ test_cgroup_filter()
|
||||
fi
|
||||
|
||||
cgroup=$(cat "${result}" | awk '{ print $3 }')
|
||||
perf lock con -a -b --lock-cgroup -E 1 -G "${cgroup}" -q -- perf bench sched messaging -p > /dev/null 2> ${result}
|
||||
perf lock con -a -b --lock-cgroup -E 1 -G "${cgroup}" -q \
|
||||
-- ${msg_workload} > /dev/null 2> ${result}
|
||||
if [ "$(cat "${result}" | wc -l)" != "1" ]; then
|
||||
echo "[Fail] BPF result should have a result with cgroup filter:" "$(cat "${cgroup}")"
|
||||
err=1
|
||||
@@ -328,7 +334,7 @@ test_csv_output()
|
||||
fi
|
||||
|
||||
# the perf lock contention output goes to the stderr
|
||||
perf lock con -a -b -E 1 -x , --output ${result} -- perf bench sched messaging -p > /dev/null 2>&1
|
||||
perf lock con -a -b -E 1 -x , --output ${result} -- ${msg_workload} > /dev/null 2>&1
|
||||
output=$(grep -v "^#" ${result} | tr -d -c , | wc -c)
|
||||
if [ "${header}" != "${output}" ]; then
|
||||
echo "[Fail] BPF result does not match the number of commas: ${header} != ${output}"
|
||||
|
||||
Reference in New Issue
Block a user