Skip to content

Commit 8e324a5

Browse files
committed
Merge tag 'linux_kselftest-next-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest updates from Shuah Khan: - Fix bugs and clean up code in tracing, ftrace, and user_events tests - Add missing executables to ftrace gitignore * tag 'linux_kselftest-next-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/ftrace: add 'poll' binary to gitignore selftests/ftrace: Use readelf to find entry point in uprobe test selftests/user_events: Fix failures caused by test code selftests/tracing: Allow some more tests to run in instances selftests/ftrace: Clean up triggers after setting them selftests/tracing: Test only toplevel README file not the instances
2 parents 68f090f + 82ef781 commit 8e324a5

File tree

8 files changed

+25
-4
lines changed

8 files changed

+25
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
logs
3+
poll

tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@
33
# description: Generic dynamic event - add/remove/test uprobe events
44
# requires: uprobe_events
55

6+
if ! which readelf > /dev/null 2>&1 ; then
7+
echo "No readelf found. skipped."
8+
exit_unresolved
9+
fi
10+
611
echo 0 > events/enable
712
echo > dynamic_events
813

914
REALBIN=`readlink -f /bin/sh`
15+
ENTRYPOINT=`readelf -h ${REALBIN} | grep Entry | sed -e 's/[^0]*//'`
1016

11-
echo 'cat /proc/$$/maps' | /bin/sh | \
12-
grep "r-xp .*${REALBIN}$" | \
13-
awk '{printf "p:myevent %s:0x%s\n", $6,$3 }' >> uprobe_events
17+
echo "p:myevent ${REALBIN}:${ENTRYPOINT}" >> uprobe_events
1418

1519
grep -q myevent uprobe_events
1620
test -d events/uprobes/myevent

tools/testing/selftests/ftrace/test.d/functions

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,13 @@ check_requires() { # Check required files and tracers
156156
exit_unsupported
157157
fi
158158
elif [ "$r" != "$i" ]; then
159-
if ! grep -Fq "$r" README ; then
159+
# If this is an instance, check the top directory
160+
if echo $TRACING_DIR | grep -q "/instances/"; then
161+
test="$TRACING_DIR/../.."
162+
else
163+
test=$TRACING_DIR
164+
fi
165+
if ! grep -Fq "$r" $test/README ; then
160166
echo "Required feature pattern \"$r\" is not in README."
161167
exit_unsupported
162168
fi

tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: GPL-2.0
33
# description: event trigger - test inter-event histogram trigger expected fail actions
44
# requires: set_event snapshot "snapshot()":README
5+
# flags: instance
56

67
fail() { #msg
78
echo $1

tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: GPL-2.0
33
# description: event trigger - test inter-event histogram trigger onchange action
44
# requires: set_event "onchange(var)":README ping:program
5+
# flags: instance
56

67
fail() { #msg
78
echo $1
@@ -19,4 +20,6 @@ if ! grep -q "changed:" events/sched/sched_waking/hist; then
1920
fail "Failed to create onchange action inter-event histogram"
2021
fi
2122

23+
echo '!hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio) if comm=="ping"' >> events/sched/sched_waking/trigger
24+
2225
exit 0

tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: GPL-2.0
33
# description: event trigger - test inter-event histogram trigger snapshot action
44
# requires: set_event snapshot events/sched/sched_process_fork/hist "onchange(var)":README "snapshot()":README ping:program
5+
# flags: instance
56

67
fail() { #msg
78
echo $1
@@ -27,4 +28,6 @@ if ! grep -q "comm=ping" snapshot; then
2728
fail "Failed to create snapshot action inter-event histogram"
2829
fi
2930

31+
echo '!hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio):onchange($newprio).snapshot() if comm=="ping"' >> events/sched/sched_waking/trigger
32+
3033
exit 0

tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: GPL-2.0
33
# description: event trigger - test histogram expression parsing
44
# requires: set_event events/sched/sched_process_fork/trigger events/sched/sched_process_fork/hist error_log "<var1>=<field|var_ref|numeric_literal>":README
5+
# flags: instance
56

67

78
fail() { #msg

tools/testing/selftests/user_events/dyn_test.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ static int parse_abi(int *check, const char *value)
127127

128128
close(fd);
129129

130+
wait_for_delete();
131+
130132
return ret;
131133
}
132134

0 commit comments

Comments
 (0)