Fix some broken tests
Subsystems (6)
cover Fix some broken tests
This series fixes some self-tests that are broken, unreliable or produce compiler warnings in 4.3.
Ben.
Ben Hutchings (6):
selftests: Add missing #include directives
selftests: memfd: Stop unnecessary rebuilds
selftests: kprobe: Choose an always-defined function to probe
selftests: Make scripts executable
selftests: vm: Try harder to allocate huge pages
selftests: breakpoint: Actually build it
tools/testing/selftests/breakpoints/Makefile | 2 +- .../selftests/ftrace/test.d/kprobe/add_and_remove.tc | 2 +- .../testing/selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- .../testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc | 2 +- .../selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +++++++------- .../selftests/ftrace/test.d/kprobe/kretprobe_args.tc | 2 +- tools/testing/selftests/memfd/Makefile | 12 ++++++------ tools/testing/selftests/memfd/memfd_test.c | 1 +
tools/testing/selftests/memfd/run_fuse_test.sh | 0 tools/testing/selftests/mqueue/mq_open_tests.c | 1 + tools/testing/selftests/mqueue/mq_perf_tests.c | 1 + tools/testing/selftests/static_keys/test_static_keys.sh | 0 tools/testing/selftests/timers/nanosleep.c | 1 + tools/testing/selftests/vm/run_vmtests | 15 ++++++++++++++- 14 files changed, 36 insertions(+), 19 deletions(-)
mode change 100644 => 100755 tools/testing/selftests/memfd/run_fuse_test.sh mode change 100644 => 100755 tools/testing/selftests/static_keys/test_static_keys.sh
Signature · 2 lines
Ben Hutchings All extremists should be taken out and shot.
A message that is not in the archive (sent off-list or not yet received): 1446334510.2595.13.camel-/[email protected]
PATCH 1/6 selftests: Add missing #include directives
Several C programs fail to include the headers declaring all the functions they call, resulting in warnings or errors.
After this, memfd_test.c is still missing some function declarations but can't easily get them because of a conflict between <linux/fcntl.h> and <sys/fcntl.h>.
---
tools/testing/selftests/memfd/memfd_test.c | 1 + tools/testing/selftests/mqueue/mq_open_tests.c | 1 + tools/testing/selftests/mqueue/mq_perf_tests.c | 1 + tools/testing/selftests/timers/nanosleep.c | 1 +
4 files changed, 4 insertions(+)
tools/testing/selftests/memfd/memfd_test.c +0 -0
@@ -15,6 +15,7 @@
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/syscall.h>
+#include <sys/wait.h>
#include <unistd.h>
#define MFD_DEF_SIZE 8192
tools/testing/selftests/mqueue/mq_open_tests.c +0 -0
@@ -31,6 +31,7 @@
#include <sys/resource.h>
#include <sys/stat.h>
#include <mqueue.h>
+#include <error.h>
static char *usage =
"Usage:\n"
tools/testing/selftests/mqueue/mq_perf_tests.c +0 -0
@@ -37,6 +37,7 @@
#include <sys/stat.h>
#include <mqueue.h>
#include <popt.h>
+#include <error.h>
static char *usage =
"Usage:\n"
tools/testing/selftests/timers/nanosleep.c +0 -0
@@ -19,6 +19,7 @@
* GNU General Public License for more details. */
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
Signature · 2 lines
Ben Hutchings All extremists should be taken out and shot.
PATCH 2/6 selftests: memfd: Stop unnecessary rebuilds
In reply to a message not in the archiveInstead of explicitly running the compiler, add dependencies and take advantage of implicit rules to build only as necessary.
---
tools/testing/selftests/memfd/Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/memfd/Makefile +0 -0
@@ -4,16 +4,16 @@ CFLAGS += -I../../../../include/uapi/
CFLAGS += -I../../../../include/
CFLAGS += -I../../../../usr/include/
-all:
- $(CC) $(CFLAGS) memfd_test.c -o memfd_test
-
TEST_PROGS := memfd_test
+all: $(TEST_PROGS)
+
include ../lib.mk
-build_fuse:
- $(CC) $(CFLAGS) fuse_mnt.c pkg-config fuse --cflags --libs -o fuse_mnt
- $(CC) $(CFLAGS) fuse_test.c -o fuse_test
+build_fuse: fuse_mnt fuse_test
+
+fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags) +fuse_mnt: LDFLAGS += $(shell pkg-config fuse --libs)
run_fuse: build_fuse
@./run_fuse_test.sh || echo "fuse_test: [FAIL]"
Signature · 2 lines
Ben Hutchings All extremists should be taken out and shot.
PATCH 3/6 selftests: kprobe: Choose an always-defined function to probe
In reply to a message not in the archivedo_fork() is no longer defined on x86, so probe _do_fork() instead.
---
.../selftests/ftrace/test.d/kprobe/add_and_remove.tc | 2 +- tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- .../testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc | 2 +- .../selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +++++++------- .../selftests/ftrace/test.d/kprobe/kretprobe_args.tc | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc +0 -0
@@ -5,7 +5,7 @@
echo 0 > events/enable
echo > kprobe_events
-echo p:myevent do_fork > kprobe_events
+echo p:myevent _do_fork > kprobe_events
grep myevent kprobe_events
test -d events/kprobes/myevent
echo > kprobe_events
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +0 -0
@@ -5,7 +5,7 @@
echo 0 > events/enable
echo > kprobe_events
-echo p:myevent do_fork > kprobe_events
+echo p:myevent _do_fork > kprobe_events
test -d events/kprobes/myevent
echo 1 > events/kprobes/myevent/enable
echo > kprobe_events && exit 1 # this must fail
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc +0 -0
@@ -5,7 +5,7 @@
echo 0 > events/enable
echo > kprobe_events
-echo 'p:testprobe do_fork $stack $stack0 +0($stack)' > kprobe_events +echo 'p:testprobe _do_fork $stack $stack0 +0($stack)' > kprobe_events grep testprobe kprobe_events
test -d events/kprobes/testprobe
echo 1 > events/kprobes/testprobe/enable
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc +0 -0
@@ -6,31 +6,31 @@ grep function available_tracers || exit_unsupported # this is configurable
# prepare echo nop > current_tracer -echo do_fork > set_ftrace_filter +echo _do_fork > set_ftrace_filter echo 0 > events/enable echo > kprobe_events -echo 'p:testprobe do_fork' > kprobe_events +echo 'p:testprobe _do_fork' > kprobe_events # kprobe on / ftrace off echo 1 > events/kprobes/testprobe/enable echo > trace ( echo "forked") grep testprobe trace -! grep 'do_fork <-' trace +! grep '_do_fork <-' trace # kprobe on / ftrace on echo function > current_tracer echo > trace ( echo "forked") grep testprobe trace -grep 'do_fork <-' trace +grep '_do_fork <-' trace # kprobe off / ftrace on echo 0 > events/kprobes/testprobe/enable echo > trace ( echo "forked") ! grep testprobe trace -grep 'do_fork <-' trace +grep '_do_fork <-' trace # kprobe on / ftrace on echo 1 > events/kprobes/testprobe/enable @@ -38,14 +38,14 @@ echo function > current_tracer echo > trace ( echo "forked") grep testprobe trace -grep 'do_fork <-' trace +grep '_do_fork <-' trace # kprobe on / ftrace off echo nop > current_tracer echo > trace ( echo "forked") grep testprobe trace -! grep 'do_fork <-' trace +! grep '_do_fork <-' trace # cleanup echo nop > current_tracer
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +0 -0
@@ -5,7 +5,7 @@
echo 0 > events/enable
echo > kprobe_events
-echo 'r:testprobe2 do_fork $retval' > kprobe_events +echo 'r:testprobe2 _do_fork $retval' > kprobe_events grep testprobe2 kprobe_events
test -d events/kprobes/testprobe2
echo 1 > events/kprobes/testprobe2/enable
Signature · 2 lines
Ben Hutchings All extremists should be taken out and shot.
PATCH 4/6 selftests: Make scripts executable
In reply to a message not in the archive---
tools/testing/selftests/memfd/run_fuse_test.sh | 0 tools/testing/selftests/static_keys/test_static_keys.sh | 0
2 files changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tools/testing/selftests/memfd/run_fuse_test.sh mode change 100644 => 100755 tools/testing/selftests/static_keys/test_static_keys.sh
tools/testing/selftests/memfd/run_fuse_test.sh +0 -0
tools/testing/selftests/static_keys/test_static_keys.sh +0 -0
Signature · 2 lines
Ben Hutchings All extremists should be taken out and shot.
PATCH 6/6 selftests: breakpoint: Actually build it
In reply to a message not in the archive---
tools/testing/selftests/breakpoints/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/breakpoints/Makefile +0 -0
@@ -6,7 +6,7 @@ ifeq ($(ARCH),x86)
TEST_PROGS := breakpoint_test
endif
-all:
+all: $(TEST_PROGS)
include ../lib.mk
Signature · 2 lines
Ben Hutchings All extremists should be taken out and shot.
Quoted 2 lines · Ben Hutchings
This series fixes some self-tests that are broken, unreliable or produce compiler warnings in 4.3.
I now realise that Evolution 3.18 has regressed and is mangling the patches I send. I'll send unmangled patches shortly.
Ben.
Quoted 28 lines
Ben.
Ben Hutchings (6):
selftests: Add missing #include directives
selftests: memfd: Stop unnecessary rebuilds
selftests: kprobe: Choose an always-defined function to probe
selftests: Make scripts executable
selftests: vm: Try harder to allocate huge pages
selftests: breakpoint: Actually build ittools/testing/selftests/breakpoints/Makefile | 2 +- .../selftests/ftrace/test.d/kprobe/add_and_remove.tc | 2 +- .../testing/selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- .../testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc | 2 +- .../selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +++++++------- .../selftests/ftrace/test.d/kprobe/kretprobe_args.tc | 2 +- tools/testing/selftests/memfd/Makefile | 12 ++++++------ tools/testing/selftests/memfd/memfd_test.c | 1 +
tools/testing/selftests/memfd/run_fuse_test.sh | 0 tools/testing/selftests/mqueue/mq_open_tests.c | 1 + tools/testing/selftests/mqueue/mq_perf_tests.c | 1 + tools/testing/selftests/static_keys/test_static_keys.sh | 0 tools/testing/selftests/timers/nanosleep.c | 1 + tools/testing/selftests/vm/run_vmtests | 15 ++++++++++++++- 14 files changed, 36 insertions(+), 19 deletions(-)mode change 100644 => 100755
tools/testing/selftests/memfd/run_fuse_test.shmode change 100644 => 100755tools/testing/selftests/static_keys/test_static_keys.sh
Signature · 2 lines
Ben Hutchings Nothing is ever a complete failure; it can always serve as a bad example.
PATCH 5/6 selftests: vm: Try harder to allocate huge pages
In reply to Ben HutchingsIf we need to increase the number of huge pages, drop caches first to reduce fragmentation and then check that we actually allocated as many as we wanted. Retry once if that doesn't work.
---
The test always fails for me in a 1 GB VM without this.
Ben.
tools/testing/selftests/vm/run_vmtests | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
tools/testing/selftests/vm/run_vmtests +0 -0
@@ -20,13 +20,26 @@ done < /proc/meminfo
if [ -n "$freepgs" ] && [ -n "$pgsize" ]; then
nr_hugepgs=cat /proc/sys/vm/nr_hugepages
needpgs=expr $needmem / $pgsize
- if [ $freepgs -lt $needpgs ]; then
+ tries=2
+ while [ $tries -gt 0 ] && [ $freepgs -lt $needpgs ]; do
lackpgs=$(( $needpgs - $freepgs ))
+ echo 3 > /proc/sys/vm/drop_caches
echo $(( $lackpgs + $nr_hugepgs )) > /proc/sys/vm/nr_hugepages if [ $? -ne 0 ]; then
echo "Please run this test as root"
exit 1
fi
+ while read name size unit; do
+ if [ "$name" = "HugePages_Free:" ]; then
+ freepgs=$size
+ fi
+ done < /proc/meminfo
+ tries=$((tries - 1))
+ done
+ if [ $freepgs -lt $needpgs ]; then
+ printf "Not enough huge pages available (%d < %d)\n" \
+ $freepgs $needpgs
+ exit 1
fi
else
echo "no hugetlbfs support in kernel?"
Signature · 2 lines
Ben Hutchings All extremists should be taken out and shot.
Re: [PATCH selftests 5/6] selftests: vm: Try harder to allocate huge pages
Quoted 42 lines · Ben Hutchings
If we need to increase the number of huge pages, drop caches first to reduce fragmentation and then check that we actually allocated as many as we wanted. Retry once if that doesn't work.
Signed-off-by Ben Hutchings <ben-/[email protected]>---
The test always fails for me in a 1 GB VM without this.Ben.
tools/testing/selftests/vm/run_vmtests | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)tools/testing/selftests/vm/run_vmtests +0
-0@@ -20,13 +20,26 @@ done < /proc/meminfoif [ -n "$freepgs" ] && [ -n "$pgsize" ]; then nr_hugepgs=
cat /proc/sys/vm/nr_hugepagesneedpgs=expr $needmem / $pgsizetools/testing/selftests/vm/run_vmtests +2
-1- if [ $freepgs -lt $needpgs ]; then + tries=2 + while [ $tries -gt 0 ] && [ $freepgs -lt $needpgs ]; dolackpgs=$(( $needpgs - $freepgs ))
tools/testing/selftests/vm/run_vmtests +1
-0+ echo 3 > /proc/sys/vm/drop_cachesecho $(( $lackpgs + $nr_hugepgs )) >
/proc/sys/vm/nr_hugepagesif [ $? -ne 0 ]; then
echo "Please run this test as root"
exit 1
fitools/testing/selftests/vm/run_vmtests +11
-0+ while read name size unit; do + if [ "$name" = "HugePages_Free:" ]; then + freepgs=$size + fi + done < /proc/meminfo + tries=$((tries - 1)) + done + if [ $freepgs -lt $needpgs ]; then + printf "Not enough huge pages available (%d < %d)\n" \ + $freepgs $needpgs + exit 1
Quoted 4 lines
fi
else
echo "no hugetlbfs support in kernel?"
I know this patch is in -mm and hasn't been merged by Linus yet, but I'm wondering why the multiple /proc/sys/vm/drop_caches is helping? Would it simply suffice to put a sleep in there instead or is drop_caches actually doing something useful a second time around?
Re: [PATCH selftests 5/6] selftests: vm: Try harder to allocate huge pages
Quoted 45 lines · David Rientjes
Quoted 43 lines · Ben Hutchings
If we need to increase the number of huge pages, drop caches first to reduce fragmentation and then check that we actually allocated as many as we wanted. Retry once if that doesn't work.
Signed-off-by Ben Hutchings <ben-/[email protected]>---
The test always fails for me in a 1 GB VM without this.Ben.
tools/testing/selftests/vm/run_vmtests | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)tools/testing/selftests/vm/run_vmtests +14
-1@@ -20,13 +20,26 @@ done < /proc/meminfo if [ -n "$freepgs" ] && [ -n "$pgsize" ]; then nr_hugepgs=`cat /proc/sys/vm/nr_hugepages` needpgs=`expr $needmem / $pgsize` - if [ $freepgs -lt $needpgs ]; then + tries=2 + while [ $tries -gt 0 ] && [ $freepgs -lt $needpgs ]; do lackpgs=$(( $needpgs - $freepgs )) + echo 3 > /proc/sys/vm/drop_caches echo $(( $lackpgs + $nr_hugepgs )) > /proc/sys/vm/nr_hugepages if [ $? -ne 0 ]; then echo "Please run this test as root" exit 1 fi + while read name size unit; do + if [ "$name" = "HugePages_Free:" ]; then + freepgs=$size + fi + done < /proc/meminfo + tries=$((tries - 1)) + done + if [ $freepgs -lt $needpgs ]; then + printf "Not enough huge pages available (%d < %d)\n" \ + $freepgs $needpgs + exit 1 fi
Quoted 9 lines
tools/testing/selftests/vm/run_vmtests done < /proc/meminfo · line 45
Quoted 3 lines
tools/testing/selftests/vm/run_vmtests +0
-0else echo "no hugetlbfs support in kernel?"I know this patch is in -mm and hasn't been merged by Linus yet, but I'm wondering why the multiple
/proc/sys/vm/drop_cachesis helping? Would it simply suffice to put a sleep in there instead or isdrop_cachesactually doing something useful a second time around?
I sent this up for merge in my pull request. Adding sleep would increase test run-time. Something to keep in mind.
thanks,
-- Shuah
Signature · 5 lines
Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) [email protected] | (970) 217-8978
Re: [PATCH selftests 5/6] selftests: vm: Try harder to allocate huge pages
In reply to David RientjesQuoted 45 lines · David Rientjes
Quoted 43 lines · Ben Hutchings
If we need to increase the number of huge pages, drop caches first to reduce fragmentation and then check that we actually allocated as many as we wanted. Retry once if that doesn't work.
Signed-off-by Ben Hutchings <[email protected]>---
The test always fails for me in a 1 GB VM without this.Ben.
tools/testing/selftests/vm/run_vmtests | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)tools/testing/selftests/vm/run_vmtests +0
-0@@ -20,13 +20,26 @@ done < /proc/meminfoif [ -n "$freepgs" ] && [ -n "$pgsize" ]; then
nr_hugepgs=cat /proc/sys/vm/nr_hugepages
needpgs=expr $needmem / $pgsize
- if [ $freepgs -lt $needpgs ]; then
+ tries=2
+ while [ $tries -gt 0 ] && [ $freepgs -lt $needpgs ]; do lackpgs=$(( $needpgs - $freepgs ))
+ echo 3 >/proc/sys/vm/drop_caches
echo $(( $lackpgs + $nr_hugepgs )) >/proc/sys/vm/nr_hugepagesif [ $? -ne 0 ]; then
echo "Please run this test as root"
exit 1
fi
+ while read name size unit; do
+ if [ "$name" = "HugePages_Free:" ]; then
+ freepgs=$size
+ fi
+ done </proc/meminfo
+ tries=$((tries - 1))
+ done
+ if [ $freepgs -lt $needpgs ]; then
+ printf "Not enough huge pages available (%d < %d)\n" \
+ $freepgs $needpgs
+ exit 1
fi
Quoted 8 lines
Quoted 3 lines
else
echo "no hugetlbfs support in kernel?"I know this patch is in -mm and hasn't been merged by Linus yet, but I'm wondering why the multiple
/proc/sys/vm/drop_cachesis helping? Would it simply suffice to put a sleep in there instead or isdrop_cachesactually doing something useful a second time around?
Initially I just retried setting nr_hugepages up to 10 times, which wasn't sufficient. Then I added the drop_caches, and after that setting nr_hugepages tended to worked first time so I reduced the retry count. It might not be necessary to retry at all.
Ben.
Signature · 2 lines
Ben Hutchings All the simple programs have been written, and all the good names taken.
Re: [PATCH selftests 5/6] selftests: vm: Try harder to allocate huge pages
Quoted 10 lines · Ben Hutchings
Quoted 4 lines
I know this patch is in -mm and hasn't been merged by Linus yet, but I'm wondering why the multiple
/proc/sys/vm/drop_cachesis helping? Would it simply suffice to put a sleep in there instead or isdrop_cachesactually doing something useful a second time around?Initially I just retried setting
nr_hugepagesup to 10 times, which wasn't sufficient. Then I added thedrop_caches, and after that settingnr_hugepagestended to worked first time so I reduced the retry count. It might not be necessary to retry at all.
Ok, thanks. I was just trying to make sure that the additional drop_caches wasn't actually required for the test, in which case we would have to fix drop_caches :)