mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 16:53:20 -04:00
Merge tag 'probes-fixes-v7.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull probes selftest fix from Masami Hiramatsu: - selftests/ftrace: Refactor eprobes test to fix argument checks Refactor the eprobes selftest to get more stable test result by using `sys_enter_chdir` instead of `openat` and filter for exact directory names This resolves test instability after the string pointer handling fix * tag 'probes-fixes-v7.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: selftests/ftrace: refactor eprobes test to fix argument checks
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# description: Generic dynamic event - add/remove eprobe events
|
||||
# requires: dynamic_events events/syscalls/sys_enter_openat "<attached-group>.<attached-event> [<args>]":README
|
||||
# requires: dynamic_events events/syscalls/sys_enter_chdir "<attached-group>.<attached-event> [<args>]":README
|
||||
|
||||
echo 0 > events/enable
|
||||
|
||||
clear_dynamic_events
|
||||
|
||||
SYSTEM="syscalls"
|
||||
EVENT="sys_enter_openat"
|
||||
EVENT="sys_enter_chdir"
|
||||
FIELD="filename"
|
||||
EPROBE="eprobe_open"
|
||||
EPROBE="eprobe_chdir"
|
||||
OPTIONS="file=+0(\$filename):ustring"
|
||||
echo "e:$EPROBE $SYSTEM/$EVENT $OPTIONS" >> dynamic_events
|
||||
|
||||
@@ -18,20 +18,14 @@ grep -q "$EPROBE" dynamic_events
|
||||
test -d events/eprobes/$EPROBE
|
||||
|
||||
echo 1 > events/eprobes/$EPROBE/enable
|
||||
ls
|
||||
cd /sys/kernel/tracing
|
||||
echo 0 > events/eprobes/$EPROBE/enable
|
||||
|
||||
content=`grep '^ *ls-' trace | grep 'file='`
|
||||
nocontent=`grep '^ *ls-' trace | grep 'file=' | grep -v -e '"/' -e '"."' -e '(fault)' ` || true
|
||||
|
||||
content=`grep -e 'file="/sys/kernel/tracing"\|(fault)' trace`
|
||||
if [ -z "$content" ]; then
|
||||
exit_fail
|
||||
fi
|
||||
|
||||
if [ ! -z "$nocontent" ]; then
|
||||
exit_fail
|
||||
fi
|
||||
|
||||
echo "-:$EPROBE" >> dynamic_events
|
||||
|
||||
! grep -q "$EPROBE" dynamic_events
|
||||
|
||||
Reference in New Issue
Block a user