ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'linux-kselftest-fixes-5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Browse Source 
Pull Kselftest fixes from Shuah Khan:
 "Fixes to the ftrace test and several fixes from Tommi Rantala for
  various other tests"

* tag 'linux-kselftest-fixes-5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: binderfs: use SKIP instead of XFAIL
  selftests: clone3: use SKIP instead of XFAIL
  selftests: core: use SKIP instead of XFAIL in close_range_test.c
  selftests: proc: fix warning: _GNU_SOURCE redefined
  selftests: pidfd: drop needless linux/kcmp.h inclusion in pidfd_setns_test.c
  selftests: pidfd: add CONFIG_CHECKPOINT_RESTORE=y to config
  selftests: pidfd: skip test on kcmp() ENOSYS
  selftests: pidfd: use ksft_test_result_skip() when skipping test
  selftests/harness: prettify SKIP message whitespace again
  selftests: pidfd: fix compilation errors due to wait.h
  selftests: filter kselftest headers from command in lib.mk
  selftests/ftrace: check for do_sys_openat2 in user-memory test
  selftests/ftrace: Use $FUNCTION_FORK to reference kernel fork function
This commit is contained in:
Linus Torvalds
2020-11-06 15:42:42 -08:00
parent d4fc96832f 7d764b685e
commit 03f0f5ad58
34 changed files with 65 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c
View File

@@ -145,7 +145,7 @@ TEST(clone3_cap_checkpoint_restore)
test_clone3_supported(); test_clone3_supported();
EXPECT_EQ(getuid(), 0) EXPECT_EQ(getuid(), 0)
XFAIL(return, "Skipping all tests as non-root\n"); SKIP(return, "Skipping all tests as non-root");
memset(&set_tid, 0, sizeof(set_tid)); memset(&set_tid, 0, sizeof(set_tid));

8
tools/testing/selftests/core/close_range_test.c
View File

@@ -44,7 +44,7 @@ TEST(close_range)
fd = open("/dev/null", O_RDONLY | O_CLOEXEC); fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
ASSERT_GE(fd, 0) { ASSERT_GE(fd, 0) {
if (errno == ENOENT) if (errno == ENOENT)
XFAIL(return, "Skipping test since /dev/null does not exist"); SKIP(return, "Skipping test since /dev/null does not exist");
} }
open_fds[i] = fd; open_fds[i] = fd;
@@ -52,7 +52,7 @@ TEST(close_range)
EXPECT_EQ(-1, sys_close_range(open_fds[0], open_fds[100], -1)) { EXPECT_EQ(-1, sys_close_range(open_fds[0], open_fds[100], -1)) {
if (errno == ENOSYS) if (errno == ENOSYS)
XFAIL(return, "close_range() syscall not supported"); SKIP(return, "close_range() syscall not supported");
} }
EXPECT_EQ(0, sys_close_range(open_fds[0], open_fds[50], 0)); EXPECT_EQ(0, sys_close_range(open_fds[0], open_fds[50], 0));
@@ -108,7 +108,7 @@ TEST(close_range_unshare)
fd = open("/dev/null", O_RDONLY | O_CLOEXEC); fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
ASSERT_GE(fd, 0) { ASSERT_GE(fd, 0) {
if (errno == ENOENT) if (errno == ENOENT)
XFAIL(return, "Skipping test since /dev/null does not exist"); SKIP(return, "Skipping test since /dev/null does not exist");
} }
open_fds[i] = fd; open_fds[i] = fd;
@@ -197,7 +197,7 @@ TEST(close_range_unshare_capped)
fd = open("/dev/null", O_RDONLY | O_CLOEXEC); fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
ASSERT_GE(fd, 0) { ASSERT_GE(fd, 0) {
if (errno == ENOENT) if (errno == ENOENT)
XFAIL(return, "Skipping test since /dev/null does not exist"); SKIP(return, "Skipping test since /dev/null does not exist");
} }
open_fds[i] = fd; open_fds[i] = fd;

8
tools/testing/selftests/filesystems/binderfs/binderfs_test.c
View File

@@ -74,7 +74,7 @@ static int __do_binderfs_test(struct __test_metadata *_metadata)
ret = mount(NULL, binderfs_mntpt, "binder", 0, 0); ret = mount(NULL, binderfs_mntpt, "binder", 0, 0);
EXPECT_EQ(ret, 0) { EXPECT_EQ(ret, 0) {
if (errno == ENODEV) if (errno == ENODEV)
XFAIL(goto out, "binderfs missing"); SKIP(goto out, "binderfs missing");
TH_LOG("%s - Failed to mount binderfs", strerror(errno)); TH_LOG("%s - Failed to mount binderfs", strerror(errno));
goto rmdir; goto rmdir;
} }
@@ -475,10 +475,10 @@ TEST(binderfs_stress)
TEST(binderfs_test_privileged) TEST(binderfs_test_privileged)
{ {
if (geteuid() != 0) if (geteuid() != 0)
XFAIL(return, "Tests are not run as root. Skipping privileged tests"); SKIP(return, "Tests are not run as root. Skipping privileged tests");
if (__do_binderfs_test(_metadata)) if (__do_binderfs_test(_metadata))
XFAIL(return, "The Android binderfs filesystem is not available"); SKIP(return, "The Android binderfs filesystem is not available");
} }
TEST(binderfs_test_unprivileged) TEST(binderfs_test_unprivileged)
@@ -511,7 +511,7 @@ TEST(binderfs_test_unprivileged)
ret = wait_for_pid(pid); ret = wait_for_pid(pid);
if (ret) { if (ret) {
if (ret == 2) if (ret == 2)
XFAIL(return, "The Android binderfs filesystem is not available"); SKIP(return, "The Android binderfs filesystem is not available");
ASSERT_EQ(ret, 0) { ASSERT_EQ(ret, 0) {
TH_LOG("wait_for_pid() failed"); TH_LOG("wait_for_pid() failed");
} }

2
tools/testing/selftests/ftrace/test.d/dynevent/add_remove_kprobe.tc
View File

@@ -6,7 +6,7 @@
echo 0 > events/enable echo 0 > events/enable
echo > dynamic_events echo > dynamic_events
PLACE=kernel_clone PLACE=$FUNCTION_FORK
echo "p:myevent1 $PLACE" >> dynamic_events echo "p:myevent1 $PLACE" >> dynamic_events
echo "r:myevent2 $PLACE" >> dynamic_events echo "r:myevent2 $PLACE" >> dynamic_events

2
tools/testing/selftests/ftrace/test.d/dynevent/clear_select_events.tc
View File

@@ -6,7 +6,7 @@
echo 0 > events/enable echo 0 > events/enable
echo > dynamic_events echo > dynamic_events
PLACE=kernel_clone PLACE=$FUNCTION_FORK
setup_events() { setup_events() {
echo "p:myevent1 $PLACE" >> dynamic_events echo "p:myevent1 $PLACE" >> dynamic_events

2
tools/testing/selftests/ftrace/test.d/dynevent/generic_clear_event.tc
View File

@@ -6,7 +6,7 @@
echo 0 > events/enable echo 0 > events/enable
echo > dynamic_events echo > dynamic_events
PLACE=kernel_clone PLACE=$FUNCTION_FORK
setup_events() { setup_events() {
echo "p:myevent1 $PLACE" >> dynamic_events echo "p:myevent1 $PLACE" >> dynamic_events

2
tools/testing/selftests/ftrace/test.d/ftrace/func-filter-notrace-pid.tc
View File

@@ -39,7 +39,7 @@ do_test() {
disable_tracing disable_tracing
echo do_execve* > set_ftrace_filter echo do_execve* > set_ftrace_filter
echo *do_fork >> set_ftrace_filter echo $FUNCTION_FORK >> set_ftrace_filter
echo $PID > set_ftrace_notrace_pid echo $PID > set_ftrace_notrace_pid
echo function > current_tracer echo function > current_tracer

2
tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
View File

@@ -39,7 +39,7 @@ do_test() {
disable_tracing disable_tracing
echo do_execve* > set_ftrace_filter echo do_execve* > set_ftrace_filter
echo *do_fork >> set_ftrace_filter echo $FUNCTION_FORK >> set_ftrace_filter
echo $PID > set_ftrace_pid echo $PID > set_ftrace_pid
echo function > current_tracer echo function > current_tracer

4
tools/testing/selftests/ftrace/test.d/ftrace/func-filter-stacktrace.tc
View File

@@ -4,9 +4,9 @@
# requires: set_ftrace_filter # requires: set_ftrace_filter
# flags: instance # flags: instance
echo kernel_clone:stacktrace >> set_ftrace_filter echo $FUNCTION_FORK:stacktrace >> set_ftrace_filter
grep -q "kernel_clone:stacktrace:unlimited" set_ftrace_filter grep -q "$FUNCTION_FORK:stacktrace:unlimited" set_ftrace_filter
(echo "forked"; sleep 1) (echo "forked"; sleep 1)

7
tools/testing/selftests/ftrace/test.d/functions
View File

@@ -133,6 +133,13 @@ yield() {
ping $LOCALHOST -c 1 || sleep .001 || usleep 1 || sleep 1 ping $LOCALHOST -c 1 || sleep .001 || usleep 1 || sleep 1
} }
# The fork function in the kernel was renamed from "_do_fork" to
# "kernel_fork". As older tests should still work with older kernels
# as well as newer kernels, check which version of fork is used on this
# kernel so that the tests can use the fork function for the running kernel.
FUNCTION_FORK=`(if grep '\bkernel_clone\b' /proc/kallsyms > /dev/null; then
echo kernel_clone; else echo '_do_fork'; fi)`
# Since probe event command may include backslash, explicitly use printf "%s" # Since probe event command may include backslash, explicitly use printf "%s"
# to NOT interpret it. # to NOT interpret it.
ftrace_errlog_check() { # err-prefix command-with-error-pos-by-^ command-file ftrace_errlog_check() { # err-prefix command-with-error-pos-by-^ command-file

2
tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc
View File

@@ -3,7 +3,7 @@
# description: Kprobe dynamic event - adding and removing # description: Kprobe dynamic event - adding and removing
# requires: kprobe_events # requires: kprobe_events
echo p:myevent kernel_clone > kprobe_events echo p:myevent $FUNCTION_FORK > kprobe_events
grep myevent kprobe_events grep myevent kprobe_events
test -d events/kprobes/myevent test -d events/kprobes/myevent
echo > kprobe_events echo > kprobe_events

2
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc
View File

@@ -3,7 +3,7 @@
# description: Kprobe dynamic event - busy event check # description: Kprobe dynamic event - busy event check
# requires: kprobe_events # requires: kprobe_events
echo p:myevent kernel_clone > kprobe_events echo p:myevent $FUNCTION_FORK > kprobe_events
test -d events/kprobes/myevent test -d events/kprobes/myevent
echo 1 > events/kprobes/myevent/enable echo 1 > events/kprobes/myevent/enable
echo > kprobe_events && exit_fail # this must fail echo > kprobe_events && exit_fail # this must fail

4
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc
View File

@@ -3,13 +3,13 @@
# description: Kprobe dynamic event with arguments # description: Kprobe dynamic event with arguments
# requires: kprobe_events # requires: kprobe_events
echo 'p:testprobe kernel_clone $stack $stack0 +0($stack)' > kprobe_events echo "p:testprobe $FUNCTION_FORK \$stack \$stack0 +0(\$stack)" > kprobe_events
grep testprobe kprobe_events | grep -q 'arg1=\$stack arg2=\$stack0 arg3=+0(\$stack)' grep testprobe kprobe_events | grep -q 'arg1=\$stack arg2=\$stack0 arg3=+0(\$stack)'
test -d events/kprobes/testprobe test -d events/kprobes/testprobe
echo 1 > events/kprobes/testprobe/enable echo 1 > events/kprobes/testprobe/enable
( echo "forked") ( echo "forked")
grep testprobe trace | grep 'kernel_clone' | \ grep testprobe trace | grep "$FUNCTION_FORK" | \
grep -q 'arg1=0x[[:xdigit:]]* arg2=0x[[:xdigit:]]* arg3=0x[[:xdigit:]]*$' grep -q 'arg1=0x[[:xdigit:]]* arg2=0x[[:xdigit:]]* arg3=0x[[:xdigit:]]*$'
echo 0 > events/kprobes/testprobe/enable echo 0 > events/kprobes/testprobe/enable

2
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_comm.tc
View File

@@ -5,7 +5,7 @@
grep -A1 "fetcharg:" README | grep -q "\$comm" || exit_unsupported # this is too old grep -A1 "fetcharg:" README | grep -q "\$comm" || exit_unsupported # this is too old
echo 'p:testprobe kernel_clone comm=$comm ' > kprobe_events echo "p:testprobe $FUNCTION_FORK comm=\$comm " > kprobe_events
grep testprobe kprobe_events | grep -q 'comm=$comm' grep testprobe kprobe_events | grep -q 'comm=$comm'
test -d events/kprobes/testprobe test -d events/kprobes/testprobe

4
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc
View File

@@ -30,13 +30,13 @@ esac
: "Test get argument (1)" : "Test get argument (1)"
echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string" > kprobe_events echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string" > kprobe_events
echo 1 > events/kprobes/testprobe/enable echo 1 > events/kprobes/testprobe/enable
echo "p:test kernel_clone" >> kprobe_events echo "p:test $FUNCTION_FORK" >> kprobe_events
grep -qe "testprobe.* arg1=\"test\"" trace grep -qe "testprobe.* arg1=\"test\"" trace
echo 0 > events/kprobes/testprobe/enable echo 0 > events/kprobes/testprobe/enable
: "Test get argument (2)" : "Test get argument (2)"
echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events
echo 1 > events/kprobes/testprobe/enable echo 1 > events/kprobes/testprobe/enable
echo "p:test kernel_clone" >> kprobe_events echo "p:test $FUNCTION_FORK" >> kprobe_events
grep -qe "testprobe.* arg1=\"test\" arg2=\"test\"" trace grep -qe "testprobe.* arg1=\"test\" arg2=\"test\"" trace

10
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_symbol.tc
View File

@@ -14,12 +14,12 @@ elif ! grep "$SYMBOL\$" /proc/kallsyms; then
fi fi
: "Test get basic types symbol argument" : "Test get basic types symbol argument"
echo "p:testprobe_u kernel_clone arg1=@linux_proc_banner:u64 arg2=@linux_proc_banner:u32 arg3=@linux_proc_banner:u16 arg4=@linux_proc_banner:u8" > kprobe_events echo "p:testprobe_u $FUNCTION_FORK arg1=@linux_proc_banner:u64 arg2=@linux_proc_banner:u32 arg3=@linux_proc_banner:u16 arg4=@linux_proc_banner:u8" > kprobe_events
echo "p:testprobe_s kernel_clone arg1=@linux_proc_banner:s64 arg2=@linux_proc_banner:s32 arg3=@linux_proc_banner:s16 arg4=@linux_proc_banner:s8" >> kprobe_events echo "p:testprobe_s $FUNCTION_FORK arg1=@linux_proc_banner:s64 arg2=@linux_proc_banner:s32 arg3=@linux_proc_banner:s16 arg4=@linux_proc_banner:s8" >> kprobe_events
if grep -q "x8/16/32/64" README; then if grep -q "x8/16/32/64" README; then
echo "p:testprobe_x kernel_clone arg1=@linux_proc_banner:x64 arg2=@linux_proc_banner:x32 arg3=@linux_proc_banner:x16 arg4=@linux_proc_banner:x8" >> kprobe_events echo "p:testprobe_x $FUNCTION_FORK arg1=@linux_proc_banner:x64 arg2=@linux_proc_banner:x32 arg3=@linux_proc_banner:x16 arg4=@linux_proc_banner:x8" >> kprobe_events
fi fi
echo "p:testprobe_bf kernel_clone arg1=@linux_proc_banner:b8@4/32" >> kprobe_events echo "p:testprobe_bf $FUNCTION_FORK arg1=@linux_proc_banner:b8@4/32" >> kprobe_events
echo 1 > events/kprobes/enable echo 1 > events/kprobes/enable
(echo "forked") (echo "forked")
echo 0 > events/kprobes/enable echo 0 > events/kprobes/enable
@@ -27,7 +27,7 @@ grep "testprobe_[usx]:.* arg1=.* arg2=.* arg3=.* arg4=.*" trace
grep "testprobe_bf:.* arg1=.*" trace grep "testprobe_bf:.* arg1=.*" trace
: "Test get string symbol argument" : "Test get string symbol argument"
echo "p:testprobe_str kernel_clone arg1=@linux_proc_banner:string" > kprobe_events echo "p:testprobe_str $FUNCTION_FORK arg1=@linux_proc_banner:string" > kprobe_events
echo 1 > events/kprobes/enable echo 1 > events/kprobes/enable
(echo "forked") (echo "forked")
echo 0 > events/kprobes/enable echo 0 > events/kprobes/enable

2
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc
View File

@@ -4,7 +4,7 @@
# requires: kprobe_events "x8/16/32/64":README # requires: kprobe_events "x8/16/32/64":README
gen_event() { # Bitsize gen_event() { # Bitsize
echo "p:testprobe kernel_clone \$stack0:s$1 \$stack0:u$1 \$stack0:x$1 \$stack0:b4@4/$1" echo "p:testprobe $FUNCTION_FORK \$stack0:s$1 \$stack0:u$1 \$stack0:x$1 \$stack0:b4@4/$1"
} }
check_types() { # s-type u-type x-type bf-type width check_types() { # s-type u-type x-type bf-type width

4
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc
View File

@@ -9,12 +9,16 @@ grep -A10 "fetcharg:" README | grep -q '\[u\]<offset>' || exit_unsupported
:;: "user-memory access syntax and ustring working on user memory";: :;: "user-memory access syntax and ustring working on user memory";:
echo 'p:myevent do_sys_open path=+0($arg2):ustring path2=+u0($arg2):string' \ echo 'p:myevent do_sys_open path=+0($arg2):ustring path2=+u0($arg2):string' \
> kprobe_events > kprobe_events
echo 'p:myevent2 do_sys_openat2 path=+0($arg2):ustring path2=+u0($arg2):string' \
>> kprobe_events
grep myevent kprobe_events | \ grep myevent kprobe_events | \
grep -q 'path=+0($arg2):ustring path2=+u0($arg2):string' grep -q 'path=+0($arg2):ustring path2=+u0($arg2):string'
echo 1 > events/kprobes/myevent/enable echo 1 > events/kprobes/myevent/enable
echo 1 > events/kprobes/myevent2/enable
echo > /dev/null echo > /dev/null
echo 0 > events/kprobes/myevent/enable echo 0 > events/kprobes/myevent/enable
echo 0 > events/kprobes/myevent2/enable
grep myevent trace | grep -q 'path="/dev/null" path2="/dev/null"' grep myevent trace | grep -q 'path="/dev/null" path2="/dev/null"'

14
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
View File

@@ -5,29 +5,29 @@
# prepare # prepare
echo nop > current_tracer echo nop > current_tracer
echo kernel_clone > set_ftrace_filter echo $FUNCTION_FORK > set_ftrace_filter
echo 'p:testprobe kernel_clone' > kprobe_events echo "p:testprobe $FUNCTION_FORK" > kprobe_events
# kprobe on / ftrace off # kprobe on / ftrace off
echo 1 > events/kprobes/testprobe/enable echo 1 > events/kprobes/testprobe/enable
echo > trace echo > trace
( echo "forked") ( echo "forked")
grep testprobe trace grep testprobe trace
! grep 'kernel_clone <-' trace ! grep "$FUNCTION_FORK <-" trace
# kprobe on / ftrace on # kprobe on / ftrace on
echo function > current_tracer echo function > current_tracer
echo > trace echo > trace
( echo "forked") ( echo "forked")
grep testprobe trace grep testprobe trace
grep 'kernel_clone <-' trace grep "$FUNCTION_FORK <-" trace
# kprobe off / ftrace on # kprobe off / ftrace on
echo 0 > events/kprobes/testprobe/enable echo 0 > events/kprobes/testprobe/enable
echo > trace echo > trace
( echo "forked") ( echo "forked")
! grep testprobe trace ! grep testprobe trace
grep 'kernel_clone <-' trace grep "$FUNCTION_FORK <-" trace
# kprobe on / ftrace on # kprobe on / ftrace on
echo 1 > events/kprobes/testprobe/enable echo 1 > events/kprobes/testprobe/enable
@@ -35,11 +35,11 @@ echo function > current_tracer
echo > trace echo > trace
( echo "forked") ( echo "forked")
grep testprobe trace grep testprobe trace
grep 'kernel_clone <-' trace grep "$FUNCTION_FORK <-" trace
# kprobe on / ftrace off # kprobe on / ftrace off
echo nop > current_tracer echo nop > current_tracer
echo > trace echo > trace
( echo "forked") ( echo "forked")
grep testprobe trace grep testprobe trace
! grep 'kernel_clone <-' trace ! grep "$FUNCTION_FORK <-" trace

2
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_multiprobe.tc
View File

@@ -4,7 +4,7 @@
# requires: kprobe_events "Create/append/":README # requires: kprobe_events "Create/append/":README
# Choose 2 symbols for target # Choose 2 symbols for target
SYM1=kernel_clone SYM1=$FUNCTION_FORK
SYM2=do_exit SYM2=do_exit
EVENT_NAME=kprobes/testevent EVENT_NAME=kprobes/testevent

12
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
View File

@@ -86,15 +86,15 @@ esac
# multiprobe errors # multiprobe errors
if grep -q "Create/append/" README && grep -q "imm-value" README; then if grep -q "Create/append/" README && grep -q "imm-value" README; then
echo 'p:kprobes/testevent kernel_clone' > kprobe_events echo "p:kprobes/testevent $FUNCTION_FORK" > kprobe_events
check_error '^r:kprobes/testevent do_exit' # DIFF_PROBE_TYPE check_error '^r:kprobes/testevent do_exit' # DIFF_PROBE_TYPE
# Explicitly use printf "%s" to not interpret \1 # Explicitly use printf "%s" to not interpret \1
printf "%s" 'p:kprobes/testevent kernel_clone abcd=\1' > kprobe_events printf "%s" "p:kprobes/testevent $FUNCTION_FORK abcd=\\1" > kprobe_events
check_error 'p:kprobes/testevent kernel_clone ^bcd=\1' # DIFF_ARG_TYPE check_error "p:kprobes/testevent $FUNCTION_FORK ^bcd=\\1" # DIFF_ARG_TYPE
check_error 'p:kprobes/testevent kernel_clone ^abcd=\1:u8' # DIFF_ARG_TYPE check_error "p:kprobes/testevent $FUNCTION_FORK ^abcd=\\1:u8" # DIFF_ARG_TYPE
check_error 'p:kprobes/testevent kernel_clone ^abcd=\"foo"' # DIFF_ARG_TYPE check_error "p:kprobes/testevent $FUNCTION_FORK ^abcd=\\\"foo\"" # DIFF_ARG_TYPE
check_error '^p:kprobes/testevent kernel_clone abcd=\1' # SAME_PROBE check_error "^p:kprobes/testevent $FUNCTION_FORK abcd=\\1" # SAME_PROBE
fi fi
# %return suffix errors # %return suffix errors

4
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc
View File

@@ -4,14 +4,14 @@
# requires: kprobe_events # requires: kprobe_events
# Add new kretprobe event # Add new kretprobe event
echo 'r:testprobe2 kernel_clone $retval' > kprobe_events echo "r:testprobe2 $FUNCTION_FORK \$retval" > kprobe_events
grep testprobe2 kprobe_events | grep -q 'arg1=\$retval' grep testprobe2 kprobe_events | grep -q 'arg1=\$retval'
test -d events/kprobes/testprobe2 test -d events/kprobes/testprobe2
echo 1 > events/kprobes/testprobe2/enable echo 1 > events/kprobes/testprobe2/enable
( echo "forked") ( echo "forked")
cat trace | grep testprobe2 | grep -q '<- kernel_clone' cat trace | grep testprobe2 | grep -q "<- $FUNCTION_FORK"
echo 0 > events/kprobes/testprobe2/enable echo 0 > events/kprobes/testprobe2/enable
echo '-:testprobe2' >> kprobe_events echo '-:testprobe2' >> kprobe_events

2
tools/testing/selftests/ftrace/test.d/kprobe/profile.tc
View File

@@ -4,7 +4,7 @@
# requires: kprobe_events # requires: kprobe_events
! grep -q 'myevent' kprobe_profile ! grep -q 'myevent' kprobe_profile
echo p:myevent kernel_clone > kprobe_events echo "p:myevent $FUNCTION_FORK" > kprobe_events
grep -q 'myevent[[:space:]]*0[[:space:]]*0$' kprobe_profile grep -q 'myevent[[:space:]]*0[[:space:]]*0$' kprobe_profile
echo 1 > events/kprobes/myevent/enable echo 1 > events/kprobes/myevent/enable
( echo "forked" ) ( echo "forked" )

2
tools/testing/selftests/kselftest_harness.h
View File

@@ -126,7 +126,7 @@
snprintf(_metadata->results->reason, \ snprintf(_metadata->results->reason, \
sizeof(_metadata->results->reason), fmt, ##__VA_ARGS__); \ sizeof(_metadata->results->reason), fmt, ##__VA_ARGS__); \
if (TH_LOG_ENABLED) { \ if (TH_LOG_ENABLED) { \
fprintf(TH_LOG_STREAM, "# SKIP %s\n", \ fprintf(TH_LOG_STREAM, "# SKIP %s\n", \
_metadata->results->reason); \ _metadata->results->reason); \
} \ } \
_metadata->passed = 1; \ _metadata->passed = 1; \

2
tools/testing/selftests/lib.mk
View File

@@ -136,7 +136,7 @@ endif
ifeq ($(OVERRIDE_TARGETS),) ifeq ($(OVERRIDE_TARGETS),)
LOCAL_HDRS := $(selfdir)/kselftest_harness.h $(selfdir)/kselftest.h LOCAL_HDRS := $(selfdir)/kselftest_harness.h $(selfdir)/kselftest.h
$(OUTPUT)/%:%.c $(LOCAL_HDRS) $(OUTPUT)/%:%.c $(LOCAL_HDRS)
$(LINK.c) $^ $(LDLIBS) -o $@ $(LINK.c) $(filter-out $(LOCAL_HDRS),$^) $(LDLIBS) -o $@
$(OUTPUT)/%.o:%.S $(OUTPUT)/%.o:%.S
$(COMPILE.S) $^ -o $@ $(COMPILE.S) $^ -o $@

1
tools/testing/selftests/pidfd/config
View File

@@ -4,3 +4,4 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y CONFIG_PID_NS=y
CONFIG_NET_NS=y CONFIG_NET_NS=y
CONFIG_CGROUPS=y CONFIG_CGROUPS=y
CONFIG_CHECKPOINT_RESTORE=y

5
tools/testing/selftests/pidfd/pidfd_getfd_test.c
View File

@@ -204,7 +204,10 @@ TEST_F(child, fetch_fd)
fd = sys_pidfd_getfd(self->pidfd, self->remote_fd, 0); fd = sys_pidfd_getfd(self->pidfd, self->remote_fd, 0);
ASSERT_GE(fd, 0); ASSERT_GE(fd, 0);
EXPECT_EQ(0, sys_kcmp(getpid(), self->pid, KCMP_FILE, fd, self->remote_fd)); ret = sys_kcmp(getpid(), self->pid, KCMP_FILE, fd, self->remote_fd);
if (ret < 0 && errno == ENOSYS)
SKIP(return, "kcmp() syscall not supported");
EXPECT_EQ(ret, 0);
ret = fcntl(fd, F_GETFD); ret = fcntl(fd, F_GETFD);
ASSERT_GE(ret, 0); ASSERT_GE(ret, 0);

1
tools/testing/selftests/pidfd/pidfd_open_test.c
View File

@@ -6,7 +6,6 @@
#include <inttypes.h> #include <inttypes.h>
#include <limits.h> #include <limits.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h>
#include <sched.h> #include <sched.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h> #include <stdbool.h>

1
tools/testing/selftests/pidfd/pidfd_poll_test.c
View File

@@ -3,7 +3,6 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <errno.h> #include <errno.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h>
#include <poll.h> #include <poll.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h> #include <stdbool.h>

1
tools/testing/selftests/pidfd/pidfd_setns_test.c
View File

@@ -16,7 +16,6 @@
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <linux/kcmp.h>
#include "pidfd.h" #include "pidfd.h"
#include "../clone3/clone3_selftests.h" #include "../clone3/clone3_selftests.h"

2
tools/testing/selftests/pidfd/pidfd_test.c
View File

@@ -330,7 +330,7 @@ static int test_pidfd_send_signal_recycled_pid_fail(void)
ksft_exit_fail_msg("%s test: Failed to recycle pid %d\n", ksft_exit_fail_msg("%s test: Failed to recycle pid %d\n",
test_name, PID_RECYCLE); test_name, PID_RECYCLE);
case PIDFD_SKIP: case PIDFD_SKIP:
ksft_print_msg("%s test: Skipping test\n", test_name); ksft_test_result_skip("%s test: Skipping test\n", test_name);
ret = 0; ret = 0;
break; break;
case PIDFD_XFAIL: case PIDFD_XFAIL:

1
tools/testing/selftests/proc/proc-loadavg-001.c
View File

@@ -14,7 +14,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* Test that /proc/loadavg correctly reports last pid in pid namespace. */ /* Test that /proc/loadavg correctly reports last pid in pid namespace. */
#define _GNU_SOURCE
#include <errno.h> #include <errno.h>
#include <sched.h> #include <sched.h>
#include <sys/types.h> #include <sys/types.h>

1
tools/testing/selftests/proc/proc-self-syscall.c
View File

@@ -13,7 +13,6 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define _GNU_SOURCE
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/types.h> #include <sys/types.h>

1
tools/testing/selftests/proc/proc-uptime-002.c
View File

@@ -15,7 +15,6 @@
*/ */
// Test that values in /proc/uptime increment monotonically // Test that values in /proc/uptime increment monotonically
// while shifting across CPUs. // while shifting across CPUs.
#define _GNU_SOURCE
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>