- Linux-kselftest-mirror - lists.linaro.org

[Linux-kselftest-mirror] [PATCH for 4.16 11/11] membarrier: selftest: Test private expedited sync core cmd

by Mathieu Desnoyers

Test the new MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE and MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE commands. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Acked-by: Shuah Khan <shuahkh(a)osg.samsung.com> CC: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> CC: Peter Zijlstra <peterz(a)infradead.org> CC: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> CC: Boqun Feng <boqun.feng(a)gmail.com> CC: Andrew Hunter <ahh(a)google.com> CC: Maged Michael <maged.michael(a)gmail.com> CC: Avi Kivity <avi(a)scylladb.com> CC: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> CC: Paul Mackerras <paulus(a)samba.org> CC: Michael Ellerman <mpe(a)ellerman.id.au> CC: Dave Watson <davejwatson(a)fb.com> CC: Alan Stern <stern(a)rowland.harvard.edu> CC: Will Deacon <will.deacon(a)arm.com> CC: Andy Lutomirski <luto(a)kernel.org> CC: Alice Ferrazzi <alice.ferrazzi(a)gmail.com> CC: Paul Elder <paul.elder(a)pitt.edu> CC: linux-kselftest(a)vger.kernel.org CC: linux-arch(a)vger.kernel.org --- .../testing/selftests/membarrier/membarrier_test.c | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index eec39a0e1f77..22bffd55a523 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -132,6 +132,63 @@ static int test_membarrier_private_expedited_success(void) return 0; } +static int test_membarrier_private_expedited_sync_core_fail(void) +{ + int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE not registered failure"; + + if (sys_membarrier(cmd, flags) != -1) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should fail, but passed\n", + test_name, flags); + } + if (errno != EPERM) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n", + test_name, flags, EPERM, strerror(EPERM), + errno, strerror(errno)); + } + + ksft_test_result_pass( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + return 0; +} + +static int test_membarrier_register_private_expedited_sync_core_success(void) +{ + int cmd = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + +static int test_membarrier_private_expedited_sync_core_success(void) +{ + int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + static int test_membarrier_register_global_expedited_success(void) { int cmd = MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED, flags = 0; @@ -188,6 +245,22 @@ static int test_membarrier(void) status = test_membarrier_private_expedited_success(); if (status) return status; + status = sys_membarrier(MEMBARRIER_CMD_QUERY, 0); + if (status < 0) { + ksft_test_result_fail("sys_membarrier() failed\n"); + return status; + } + if (status & MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE) { + status = test_membarrier_private_expedited_sync_core_fail(); + if (status) + return status; + status = test_membarrier_register_private_expedited_sync_core_success(); + if (status) + return status; + status = test_membarrier_private_expedited_sync_core_success(); + if (status) + return status; + } /* * It is valid to send a global membarrier from a non-registered * process. -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

1
0
0 0

[Linux-kselftest-mirror] [PATCH for 4.16 05/11] membarrier: selftest: Test global expedited cmd (v2)

by Mathieu Desnoyers

Test the new MEMBARRIER_CMD_GLOBAL_EXPEDITED and MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED commands. Adapt to the MEMBARRIER_CMD_SHARED -> MEMBARRIER_CMD_GLOBAL rename. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Acked-by: Shuah Khan <shuahkh(a)osg.samsung.com> CC: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> CC: Peter Zijlstra <peterz(a)infradead.org> CC: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> CC: Boqun Feng <boqun.feng(a)gmail.com> CC: Andrew Hunter <ahh(a)google.com> CC: Maged Michael <maged.michael(a)gmail.com> CC: Avi Kivity <avi(a)scylladb.com> CC: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> CC: Paul Mackerras <paulus(a)samba.org> CC: Michael Ellerman <mpe(a)ellerman.id.au> CC: Dave Watson <davejwatson(a)fb.com> CC: Alan Stern <stern(a)rowland.harvard.edu> CC: Will Deacon <will.deacon(a)arm.com> CC: Andy Lutomirski <luto(a)kernel.org> CC: Alice Ferrazzi <alice.ferrazzi(a)gmail.com> CC: Paul Elder <paul.elder(a)pitt.edu> CC: linux-kselftest(a)vger.kernel.org CC: linux-arch(a)vger.kernel.org --- Changes since v1: - Rename SHARED to GLOBAL. --- .../testing/selftests/membarrier/membarrier_test.c | 59 ++++++++++++++++++++-- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index e6ee73d01fa1..eec39a0e1f77 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -59,10 +59,10 @@ static int test_membarrier_flags_fail(void) return 0; } -static int test_membarrier_shared_success(void) +static int test_membarrier_global_success(void) { - int cmd = MEMBARRIER_CMD_SHARED, flags = 0; - const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED"; + int cmd = MEMBARRIER_CMD_GLOBAL, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_GLOBAL"; if (sys_membarrier(cmd, flags) != 0) { ksft_exit_fail_msg( @@ -132,6 +132,40 @@ static int test_membarrier_private_expedited_success(void) return 0; } +static int test_membarrier_register_global_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + +static int test_membarrier_global_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_GLOBAL_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_GLOBAL_EXPEDITED"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + static int test_membarrier(void) { int status; @@ -142,7 +176,7 @@ static int test_membarrier(void) status = test_membarrier_flags_fail(); if (status) return status; - status = test_membarrier_shared_success(); + status = test_membarrier_global_success(); if (status) return status; status = test_membarrier_private_expedited_fail(); @@ -154,6 +188,19 @@ static int test_membarrier(void) status = test_membarrier_private_expedited_success(); if (status) return status; + /* + * It is valid to send a global membarrier from a non-registered + * process. + */ + status = test_membarrier_global_expedited_success(); + if (status) + return status; + status = test_membarrier_register_global_expedited_success(); + if (status) + return status; + status = test_membarrier_global_expedited_success(); + if (status) + return status; return 0; } @@ -173,8 +220,10 @@ static int test_membarrier_query(void) } ksft_exit_fail_msg("sys_membarrier() failed\n"); } - if (!(ret & MEMBARRIER_CMD_SHARED)) + if (!(ret & MEMBARRIER_CMD_GLOBAL)) { + ksft_test_result_fail("sys_membarrier() CMD_GLOBAL query failed\n"); ksft_exit_fail_msg("sys_membarrier is not supported.\n"); + } ksft_test_result_pass("sys_membarrier available\n"); return 0; -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

1
0
0 0

[Linux-kselftest-mirror] [PATCH for 4.16 01/11] membarrier: selftest: Test private expedited cmd (v2)

by Mathieu Desnoyers

Test the new MEMBARRIER_CMD_PRIVATE_EXPEDITED and MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED commands. Add checks expecting specific error values on system calls expected to fail. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Acked-by: Shuah Khan <shuahkh(a)osg.samsung.com> Acked-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> CC: Peter Zijlstra <peterz(a)infradead.org> CC: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> CC: Boqun Feng <boqun.feng(a)gmail.com> CC: Andrew Hunter <ahh(a)google.com> CC: Maged Michael <maged.michael(a)gmail.com> CC: Avi Kivity <avi(a)scylladb.com> CC: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> CC: Paul Mackerras <paulus(a)samba.org> CC: Michael Ellerman <mpe(a)ellerman.id.au> CC: Dave Watson <davejwatson(a)fb.com> CC: Alan Stern <stern(a)rowland.harvard.edu> CC: Will Deacon <will.deacon(a)arm.com> CC: Andy Lutomirski <luto(a)kernel.org> CC: Alice Ferrazzi <alice.ferrazzi(a)gmail.com> CC: Paul Elder <paul.elder(a)pitt.edu> CC: linux-kselftest(a)vger.kernel.org CC: linux-arch(a)vger.kernel.org --- Changes since v1: - return result of ksft_exit_pass from main(), silencing compiler warning about missing return value. --- .../testing/selftests/membarrier/membarrier_test.c | 111 ++++++++++++++++++--- 1 file changed, 95 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index 9e674d9514d1..e6ee73d01fa1 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -16,49 +16,119 @@ static int sys_membarrier(int cmd, int flags) static int test_membarrier_cmd_fail(void) { int cmd = -1, flags = 0; + const char *test_name = "sys membarrier invalid command"; if (sys_membarrier(cmd, flags) != -1) { ksft_exit_fail_msg( - "sys membarrier invalid command test: command = %d, flags = %d. Should fail, but passed\n", - cmd, flags); + "%s test: command = %d, flags = %d. Should fail, but passed\n", + test_name, cmd, flags); + } + if (errno != EINVAL) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n", + test_name, flags, EINVAL, strerror(EINVAL), + errno, strerror(errno)); } ksft_test_result_pass( - "sys membarrier invalid command test: command = %d, flags = %d. Failed as expected\n", - cmd, flags); + "%s test: command = %d, flags = %d, errno = %d. Failed as expected\n", + test_name, cmd, flags, errno); return 0; } static int test_membarrier_flags_fail(void) { int cmd = MEMBARRIER_CMD_QUERY, flags = 1; + const char *test_name = "sys membarrier MEMBARRIER_CMD_QUERY invalid flags"; if (sys_membarrier(cmd, flags) != -1) { ksft_exit_fail_msg( - "sys membarrier MEMBARRIER_CMD_QUERY invalid flags test: flags = %d. Should fail, but passed\n", - flags); + "%s test: flags = %d. Should fail, but passed\n", + test_name, flags); + } + if (errno != EINVAL) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n", + test_name, flags, EINVAL, strerror(EINVAL), + errno, strerror(errno)); } ksft_test_result_pass( - "sys membarrier MEMBARRIER_CMD_QUERY invalid flags test: flags = %d. Failed as expected\n", - flags); + "%s test: flags = %d, errno = %d. Failed as expected\n", + test_name, flags, errno); return 0; } -static int test_membarrier_success(void) +static int test_membarrier_shared_success(void) { int cmd = MEMBARRIER_CMD_SHARED, flags = 0; - const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED\n"; + const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", test_name, flags); + return 0; +} + +static int test_membarrier_private_expedited_fail(void) +{ + int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED not registered failure"; + + if (sys_membarrier(cmd, flags) != -1) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should fail, but passed\n", + test_name, flags); + } + if (errno != EPERM) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n", + test_name, flags, EPERM, strerror(EPERM), + errno, strerror(errno)); + } + + ksft_test_result_pass( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + return 0; +} + +static int test_membarrier_register_private_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED"; if (sys_membarrier(cmd, flags) != 0) { ksft_exit_fail_msg( - "sys membarrier MEMBARRIER_CMD_SHARED test: flags = %d\n", - flags); + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); } ksft_test_result_pass( - "sys membarrier MEMBARRIER_CMD_SHARED test: flags = %d\n", - flags); + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + +static int test_membarrier_private_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); return 0; } @@ -72,7 +142,16 @@ static int test_membarrier(void) status = test_membarrier_flags_fail(); if (status) return status; - status = test_membarrier_success(); + status = test_membarrier_shared_success(); + if (status) + return status; + status = test_membarrier_private_expedited_fail(); + if (status) + return status; + status = test_membarrier_register_private_expedited_success(); + if (status) + return status; + status = test_membarrier_private_expedited_success(); if (status) return status; return 0; @@ -108,5 +187,5 @@ int main(int argc, char **argv) test_membarrier_query(); test_membarrier(); - ksft_exit_pass(); + return ksft_exit_pass(); } -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

1
0
0 0

[Linux-kselftest-mirror] [PATCH] selftests: Fix loss of test output in run_kselftests.sh

by Michael Ellerman

Commit fbcab13d2e25 ("selftests: silence test output by default") changed the run_tests logic as well as the logic to generate run_kselftests.sh to redirect test output away from the console. As discussed on the list and at kernel summit, this is not a desirable default as it means in order to debug a failure the console output is not sufficient, you also need access to the test machine to get the full test logs. Additionally it's impolite to write directly to /tmp/$TEST_NAME on shared systems. The change to the run_tests logic was reverted in commit a323335e62cc ("selftests: lib.mk: print individual test results to console by default"), and instead a summary option was added so that quiet output could be requested. However the change to run_kselftests.sh was left as-is. This commit applies the same logic to the run_kselftests.sh code, ie. the script now takes a "--summary" option which suppresses the output, but shows all output by default. Additionally instead of writing to /tmp/$TEST_NAME the output is redirected to the directory where the generated test script is located. Fixes: fbcab13d2e25 ("selftests: silence test output by default") Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> --- tools/testing/selftests/Makefile | 9 ++++++++- tools/testing/selftests/lib.mk | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index eaf599dc2137..7442dfb73b7f 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -116,8 +116,15 @@ ifdef INSTALL_PATH @# Ask all targets to emit their test scripts echo "#!/bin/sh" > $(ALL_SCRIPT) - echo "cd \$$(dirname \$$0)" >> $(ALL_SCRIPT) + echo "BASE_DIR=\$$(realpath \$$(dirname \$$0))" >> $(ALL_SCRIPT) + echo "cd \$$BASE_DIR" >> $(ALL_SCRIPT) echo "ROOT=\$$PWD" >> $(ALL_SCRIPT) + echo "if [ \"\$$1\" = \"--summary\" ]; then" >> $(ALL_SCRIPT) + echo " OUTPUT=\$$BASE_DIR/output.log" >> $(ALL_SCRIPT) + echo " cat /dev/null > \$$OUTPUT" >> $(ALL_SCRIPT) + echo "else" >> $(ALL_SCRIPT) + echo " OUTPUT=/dev/stdout" >> $(ALL_SCRIPT) + echo "fi" >> $(ALL_SCRIPT) for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 5bef05d6ba39..7de482a0519d 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -77,7 +77,7 @@ endif define EMIT_TESTS @for TEST in $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS); do \ BASENAME_TEST=`basename $$TEST`; \ - echo "(./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && echo \"selftests: $$BASENAME_TEST [PASS]\") || echo \"selftests: $$BASENAME_TEST [FAIL]\""; \ + echo "(./$$BASENAME_TEST >> \$$OUTPUT 2>&1 && echo \"selftests: $$BASENAME_TEST [PASS]\") || echo \"selftests: $$BASENAME_TEST [FAIL]\""; \ done; endef -- 2.14.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

2
1
0 0

[Linux-kselftest-mirror] [RESEND PATCH 0/2] selftests: ftrace: Fix multiple-kprobe testcase

by Masami Hiramatsu

Hi, These patches are fixing a bug and improve testcase to ensure adding 256 kprobe events for test. I've just updated to the latest kselftest/master branch. Thank you, --- Masami Hiramatsu (2): [BUGFIX] selftest: ftrace: Fix to pick text symbols for kprobes selftest: ftrace: Fix to add 256 kprobe events correctly .../ftrace/test.d/kprobe/multiple_kprobes.tc | 21 +++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) -- Masami Hiramatsu (Linaro) <mhiramat(a)kernel.org> -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

3
4
0 0

[Linux-kselftest-mirror] [PATCH] selftests: sync: missing CFLAGS while compiling

by Anders Roxell

Based on patch: https://patchwork.kernel.org/patch/10042045/ arch64-linux-gnu-gcc -c sync.c -o sync/sync.o sync.c:42:29: fatal error: linux/sync_file.h: No such file or directory #include <linux/sync_file.h> ^ CFLAGS is not used during the compile step, so the system instead of kernel headers are used. Fix this by using lib.mk's compile rules and remove CFLAGS from the linking step. Reported-by: Lei Yang <Lei.Yang(a)windriver.com> Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> --- tools/testing/selftests/sync/Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/testing/selftests/sync/Makefile b/tools/testing/selftests/sync/Makefile index b3c8ba3cb668..58b9336d6c84 100644 --- a/tools/testing/selftests/sync/Makefile +++ b/tools/testing/selftests/sync/Makefile @@ -27,12 +27,6 @@ OBJS := $(patsubst %,$(OUTPUT)/%,$(OBJS)) TESTS := $(patsubst %,$(OUTPUT)/%,$(TESTS)) $(TEST_CUSTOM_PROGS): $(TESTS) $(OBJS) - $(CC) -o $(TEST_CUSTOM_PROGS) $(OBJS) $(TESTS) $(CFLAGS) $(LDFLAGS) - -$(OBJS): $(OUTPUT)/%.o: %.c - $(CC) -c $^ -o $@ - -$(TESTS): $(OUTPUT)/%.o: %.c - $(CC) -c $^ -o $@ + $(CC) -o $(TEST_CUSTOM_PROGS) $(OBJS) $(TESTS) $(LDFLAGS) EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(OBJS) $(TESTS) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

3
3
0 0

[Linux-kselftest-mirror] [PATCH for 4.16 10/10] membarrier: selftest: Test private expedited sync core cmd

by Mathieu Desnoyers

Test the new MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE and MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE commands. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Acked-by: Shuah Khan <shuahkh(a)osg.samsung.com> CC: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> CC: Peter Zijlstra <peterz(a)infradead.org> CC: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> CC: Boqun Feng <boqun.feng(a)gmail.com> CC: Andrew Hunter <ahh(a)google.com> CC: Maged Michael <maged.michael(a)gmail.com> CC: Avi Kivity <avi(a)scylladb.com> CC: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> CC: Paul Mackerras <paulus(a)samba.org> CC: Michael Ellerman <mpe(a)ellerman.id.au> CC: Dave Watson <davejwatson(a)fb.com> CC: Alan Stern <stern(a)rowland.harvard.edu> CC: Will Deacon <will.deacon(a)arm.com> CC: Andy Lutomirski <luto(a)kernel.org> CC: Alice Ferrazzi <alice.ferrazzi(a)gmail.com> CC: Paul Elder <paul.elder(a)pitt.edu> CC: linux-kselftest(a)vger.kernel.org CC: linux-arch(a)vger.kernel.org --- .../testing/selftests/membarrier/membarrier_test.c | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index bb9c58072c5c..d9ab8b6ee52e 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -132,6 +132,63 @@ static int test_membarrier_private_expedited_success(void) return 0; } +static int test_membarrier_private_expedited_sync_core_fail(void) +{ + int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE not registered failure"; + + if (sys_membarrier(cmd, flags) != -1) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should fail, but passed\n", + test_name, flags); + } + if (errno != EPERM) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n", + test_name, flags, EPERM, strerror(EPERM), + errno, strerror(errno)); + } + + ksft_test_result_pass( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + return 0; +} + +static int test_membarrier_register_private_expedited_sync_core_success(void) +{ + int cmd = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + +static int test_membarrier_private_expedited_sync_core_success(void) +{ + int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + static int test_membarrier_register_shared_expedited_success(void) { int cmd = MEMBARRIER_CMD_REGISTER_SHARED_EXPEDITED, flags = 0; @@ -188,6 +245,22 @@ static int test_membarrier(void) status = test_membarrier_private_expedited_success(); if (status) return status; + status = sys_membarrier(MEMBARRIER_CMD_QUERY, 0); + if (status < 0) { + ksft_test_result_fail("sys_membarrier() failed\n"); + return status; + } + if (status & MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE) { + status = test_membarrier_private_expedited_sync_core_fail(); + if (status) + return status; + status = test_membarrier_register_private_expedited_sync_core_success(); + if (status) + return status; + status = test_membarrier_private_expedited_sync_core_success(); + if (status) + return status; + } /* * It is valid to send a shared membarrier from a non-registered * process. -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

1
0
0 0

[Linux-kselftest-mirror] [PATCH for 4.16 05/10] membarrier: selftest: Test shared expedited cmd

by Mathieu Desnoyers

Test the new MEMBARRIER_CMD_SHARED_EXPEDITED and MEMBARRIER_CMD_REGISTER_SHARED_EXPEDITED commands. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Acked-by: Shuah Khan <shuahkh(a)osg.samsung.com> CC: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> CC: Peter Zijlstra <peterz(a)infradead.org> CC: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> CC: Boqun Feng <boqun.feng(a)gmail.com> CC: Andrew Hunter <ahh(a)google.com> CC: Maged Michael <maged.michael(a)gmail.com> CC: Avi Kivity <avi(a)scylladb.com> CC: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> CC: Paul Mackerras <paulus(a)samba.org> CC: Michael Ellerman <mpe(a)ellerman.id.au> CC: Dave Watson <davejwatson(a)fb.com> CC: Alan Stern <stern(a)rowland.harvard.edu> CC: Will Deacon <will.deacon(a)arm.com> CC: Andy Lutomirski <luto(a)kernel.org> CC: Alice Ferrazzi <alice.ferrazzi(a)gmail.com> CC: Paul Elder <paul.elder(a)pitt.edu> CC: linux-kselftest(a)vger.kernel.org CC: linux-arch(a)vger.kernel.org --- .../testing/selftests/membarrier/membarrier_test.c | 51 +++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index e6ee73d01fa1..bb9c58072c5c 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -132,6 +132,40 @@ static int test_membarrier_private_expedited_success(void) return 0; } +static int test_membarrier_register_shared_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_REGISTER_SHARED_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_SHARED_EXPEDITED"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + +static int test_membarrier_shared_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_SHARED_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED_EXPEDITED"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + static int test_membarrier(void) { int status; @@ -154,6 +188,19 @@ static int test_membarrier(void) status = test_membarrier_private_expedited_success(); if (status) return status; + /* + * It is valid to send a shared membarrier from a non-registered + * process. + */ + status = test_membarrier_shared_expedited_success(); + if (status) + return status; + status = test_membarrier_register_shared_expedited_success(); + if (status) + return status; + status = test_membarrier_shared_expedited_success(); + if (status) + return status; return 0; } @@ -173,8 +220,10 @@ static int test_membarrier_query(void) } ksft_exit_fail_msg("sys_membarrier() failed\n"); } - if (!(ret & MEMBARRIER_CMD_SHARED)) + if (!(ret & MEMBARRIER_CMD_SHARED)) { + ksft_test_result_fail("sys_membarrier() CMD_SHARED query failed\n"); ksft_exit_fail_msg("sys_membarrier is not supported.\n"); + } ksft_test_result_pass("sys_membarrier available\n"); return 0; -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

1
0
0 0

[Linux-kselftest-mirror] [PATCH for 4.16 01/10] membarrier: selftest: Test private expedited cmd (v2)

by Mathieu Desnoyers

Test the new MEMBARRIER_CMD_PRIVATE_EXPEDITED and MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED commands. Add checks expecting specific error values on system calls expected to fail. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Acked-by: Shuah Khan <shuahkh(a)osg.samsung.com> Acked-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> CC: Peter Zijlstra <peterz(a)infradead.org> CC: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> CC: Boqun Feng <boqun.feng(a)gmail.com> CC: Andrew Hunter <ahh(a)google.com> CC: Maged Michael <maged.michael(a)gmail.com> CC: Avi Kivity <avi(a)scylladb.com> CC: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> CC: Paul Mackerras <paulus(a)samba.org> CC: Michael Ellerman <mpe(a)ellerman.id.au> CC: Dave Watson <davejwatson(a)fb.com> CC: Alan Stern <stern(a)rowland.harvard.edu> CC: Will Deacon <will.deacon(a)arm.com> CC: Andy Lutomirski <luto(a)kernel.org> CC: Alice Ferrazzi <alice.ferrazzi(a)gmail.com> CC: Paul Elder <paul.elder(a)pitt.edu> CC: linux-kselftest(a)vger.kernel.org CC: linux-arch(a)vger.kernel.org --- Changes since v1: - return result of ksft_exit_pass from main(), silencing compiler warning about missing return value. --- .../testing/selftests/membarrier/membarrier_test.c | 111 ++++++++++++++++++--- 1 file changed, 95 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index 9e674d9514d1..e6ee73d01fa1 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -16,49 +16,119 @@ static int sys_membarrier(int cmd, int flags) static int test_membarrier_cmd_fail(void) { int cmd = -1, flags = 0; + const char *test_name = "sys membarrier invalid command"; if (sys_membarrier(cmd, flags) != -1) { ksft_exit_fail_msg( - "sys membarrier invalid command test: command = %d, flags = %d. Should fail, but passed\n", - cmd, flags); + "%s test: command = %d, flags = %d. Should fail, but passed\n", + test_name, cmd, flags); + } + if (errno != EINVAL) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n", + test_name, flags, EINVAL, strerror(EINVAL), + errno, strerror(errno)); } ksft_test_result_pass( - "sys membarrier invalid command test: command = %d, flags = %d. Failed as expected\n", - cmd, flags); + "%s test: command = %d, flags = %d, errno = %d. Failed as expected\n", + test_name, cmd, flags, errno); return 0; } static int test_membarrier_flags_fail(void) { int cmd = MEMBARRIER_CMD_QUERY, flags = 1; + const char *test_name = "sys membarrier MEMBARRIER_CMD_QUERY invalid flags"; if (sys_membarrier(cmd, flags) != -1) { ksft_exit_fail_msg( - "sys membarrier MEMBARRIER_CMD_QUERY invalid flags test: flags = %d. Should fail, but passed\n", - flags); + "%s test: flags = %d. Should fail, but passed\n", + test_name, flags); + } + if (errno != EINVAL) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n", + test_name, flags, EINVAL, strerror(EINVAL), + errno, strerror(errno)); } ksft_test_result_pass( - "sys membarrier MEMBARRIER_CMD_QUERY invalid flags test: flags = %d. Failed as expected\n", - flags); + "%s test: flags = %d, errno = %d. Failed as expected\n", + test_name, flags, errno); return 0; } -static int test_membarrier_success(void) +static int test_membarrier_shared_success(void) { int cmd = MEMBARRIER_CMD_SHARED, flags = 0; - const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED\n"; + const char *test_name = "sys membarrier MEMBARRIER_CMD_SHARED"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", test_name, flags); + return 0; +} + +static int test_membarrier_private_expedited_fail(void) +{ + int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED not registered failure"; + + if (sys_membarrier(cmd, flags) != -1) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should fail, but passed\n", + test_name, flags); + } + if (errno != EPERM) { + ksft_exit_fail_msg( + "%s test: flags = %d. Should return (%d: \"%s\"), but returned (%d: \"%s\").\n", + test_name, flags, EPERM, strerror(EPERM), + errno, strerror(errno)); + } + + ksft_test_result_pass( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + return 0; +} + +static int test_membarrier_register_private_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED"; if (sys_membarrier(cmd, flags) != 0) { ksft_exit_fail_msg( - "sys membarrier MEMBARRIER_CMD_SHARED test: flags = %d\n", - flags); + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); } ksft_test_result_pass( - "sys membarrier MEMBARRIER_CMD_SHARED test: flags = %d\n", - flags); + "%s test: flags = %d\n", + test_name, flags); + return 0; +} + +static int test_membarrier_private_expedited_success(void) +{ + int cmd = MEMBARRIER_CMD_PRIVATE_EXPEDITED, flags = 0; + const char *test_name = "sys membarrier MEMBARRIER_CMD_PRIVATE_EXPEDITED"; + + if (sys_membarrier(cmd, flags) != 0) { + ksft_exit_fail_msg( + "%s test: flags = %d, errno = %d\n", + test_name, flags, errno); + } + + ksft_test_result_pass( + "%s test: flags = %d\n", + test_name, flags); return 0; } @@ -72,7 +142,16 @@ static int test_membarrier(void) status = test_membarrier_flags_fail(); if (status) return status; - status = test_membarrier_success(); + status = test_membarrier_shared_success(); + if (status) + return status; + status = test_membarrier_private_expedited_fail(); + if (status) + return status; + status = test_membarrier_register_private_expedited_success(); + if (status) + return status; + status = test_membarrier_private_expedited_success(); if (status) return status; return 0; @@ -108,5 +187,5 @@ int main(int argc, char **argv) test_membarrier_query(); test_membarrier(); - ksft_exit_pass(); + return ksft_exit_pass(); } -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 11 months

1
0
0 0

Re: [Linux-kselftest-mirror] [PATCH] selftests/x86: Add test_vsyscall

by Andy Lutomirski

Add missing cc's. Duh On Thu, Jan 11, 2018 at 5:16 PM, Andy Lutomirski <luto(a)kernel.org> wrote: > This tests that the vsyscall entries do what they're expected to do. > It also confirms that attempts to read the vsyscall page behave as > expected. > > If changes are made to the vsyscall code or its memory map handling, > running this test in all three of vsyscall=none, vsyscall=emulate, > and vsyscall=native are helpful. > > (Because it's easy, this also compares the vsyscall results to their > vDSO equivalents.) > > Cc: stable(a)vger.kernel.org > Signed-off-by: Andy Lutomirski <luto(a)kernel.org> > --- > > Note to KAISER backporters: please test this under all three > vsyscall modes. Also, in the emulate and native modes, make sure > that test_vsyscall_64 agrees with the command line or config > option as to which mode you're in. It's quite easy to mess up > the kernel such that native mode accidentally emulates > or vice versa. > > Greg, etc: please backport this to all your Meltdown-patched > kernels. It'll help make sure the patches didn't regress > vsyscalls. > > Changes from RFC version: > - Doesn't warn on 32-bit > - Detects native vs emulate > > tools/testing/selftests/x86/Makefile | 2 +- > tools/testing/selftests/x86/test_vsyscall.c | 500 ++++++++++++++++++++++++++++ > 2 files changed, 501 insertions(+), 1 deletion(-) > create mode 100644 tools/testing/selftests/x86/test_vsyscall.c > > diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile > index 939a337128db..5d4f10ac2af2 100644 > --- a/tools/testing/selftests/x86/Makefile > +++ b/tools/testing/selftests/x86/Makefile > @@ -7,7 +7,7 @@ include ../lib.mk > > TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall test_mremap_vdso \ > check_initial_reg_state sigreturn ldt_gdt iopl mpx-mini-test ioperm \ > - protection_keys test_vdso > + protection_keys test_vdso test_vsyscall > TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault test_syscall_vdso unwind_vdso \ > test_FCMOV test_FCOMI test_FISTTP \ > vdso_restorer > diff --git a/tools/testing/selftests/x86/test_vsyscall.c b/tools/testing/selftests/x86/test_vsyscall.c > new file mode 100644 > index 000000000000..7a744fa7b786 > --- /dev/null > +++ b/tools/testing/selftests/x86/test_vsyscall.c > @@ -0,0 +1,500 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#define _GNU_SOURCE > + > +#include <stdio.h> > +#include <sys/time.h> > +#include <time.h> > +#include <stdlib.h> > +#include <sys/syscall.h> > +#include <unistd.h> > +#include <dlfcn.h> > +#include <string.h> > +#include <inttypes.h> > +#include <signal.h> > +#include <sys/ucontext.h> > +#include <errno.h> > +#include <err.h> > +#include <sched.h> > +#include <stdbool.h> > +#include <setjmp.h> > + > +#ifdef __x86_64__ > +# define VSYS(x) (x) > +#else > +# define VSYS(x) 0 > +#endif > + > +#ifndef SYS_getcpu > +# ifdef __x86_64__ > +# define SYS_getcpu 309 > +# else > +# define SYS_getcpu 318 > +# endif > +#endif > + > +static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *), > + int flags) > +{ > + struct sigaction sa; > + memset(&sa, 0, sizeof(sa)); > + sa.sa_sigaction = handler; > + sa.sa_flags = SA_SIGINFO | flags; > + sigemptyset(&sa.sa_mask); > + if (sigaction(sig, &sa, 0)) > + err(1, "sigaction"); > +} > + > +/* vsyscalls and vDSO */ > +bool should_read_vsyscall = false; > + > +typedef long (*gtod_t)(struct timeval *tv, struct timezone *tz); > +gtod_t vgtod = (gtod_t)VSYS(0xffffffffff600000); > +gtod_t vdso_gtod; > + > +typedef int (*vgettime_t)(clockid_t, struct timespec *); > +vgettime_t vdso_gettime; > + > +typedef long (*time_func_t)(time_t *t); > +time_func_t vtime = (time_func_t)VSYS(0xffffffffff600400); > +time_func_t vdso_time; > + > +typedef long (*getcpu_t)(unsigned *, unsigned *, void *); > +getcpu_t vgetcpu = (getcpu_t)VSYS(0xffffffffff600800); > +getcpu_t vdso_getcpu; > + > +static void init_vdso(void) > +{ > + void *vdso = dlopen("linux-vdso.so.1", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); > + if (!vdso) > + vdso = dlopen("linux-gate.so.1", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); > + if (!vdso) { > + printf("[WARN]\tfailed to find vDSO\n"); > + return; > + } > + > + vdso_gtod = (gtod_t)dlsym(vdso, "__vdso_gettimeofday"); > + if (!vdso_gtod) > + printf("[WARN]\tfailed to find gettimeofday in vDSO\n"); > + > + vdso_gettime = (vgettime_t)dlsym(vdso, "__vdso_clock_gettime"); > + if (!vdso_gettime) > + printf("[WARN]\tfailed to find clock_gettime in vDSO\n"); > + > + vdso_time = (time_func_t)dlsym(vdso, "__vdso_time"); > + if (!vdso_time) > + printf("[WARN]\tfailed to find time in vDSO\n"); > + > + vdso_getcpu = (getcpu_t)dlsym(vdso, "__vdso_getcpu"); > + if (!vdso_getcpu) { > + /* getcpu() was never wired up in the 32-bit vDSO. */ > + printf("[%s]\tfailed to find getcpu in vDSO\n", > + sizeof(long) == 8 ? "WARN" : "NOTE"); > + } > +} > + > +static int init_vsys(void) > +{ > +#ifdef __x86_64__ > + int nerrs = 0; > + FILE *maps; > + char line[128]; > + bool found = false; > + > + maps = fopen("/proc/self/maps", "r"); > + if (!maps) { > + printf("[WARN]\tCould not open /proc/self/maps -- assuming vsyscall is r-x\n"); > + should_read_vsyscall = true; > + return 0; > + } > + > + while (fgets(line, sizeof(line), maps)) { > + char r, x; > + void *start, *end; > + char name[128]; > + if (sscanf(line, "%p-%p %c-%cp %*x %*x:%*x %*u %s", > + &start, &end, &r, &x, name) != 5) > + continue; > + > + if (strcmp(name, "[vsyscall]")) > + continue; > + > + printf("\tvsyscall map: %s", line); > + > + if (start != (void *)0xffffffffff600000 || > + end != (void *)0xffffffffff601000) { > + printf("[FAIL]\taddress range is nonsense\n"); > + nerrs++; > + } > + > + printf("\tvsyscall permissions are %c-%c\n", r, x); > + should_read_vsyscall = (r == 'r'); > + if (x != 'x') { > + vgtod = NULL; > + vtime = NULL; > + vgetcpu = NULL; > + } > + > + found = true; > + break; > + } > + > + fclose(maps); > + > + if (!found) { > + printf("\tno vsyscall map in /proc/self/maps\n"); > + should_read_vsyscall = false; > + vgtod = NULL; > + vtime = NULL; > + vgetcpu = NULL; > + } > + > + return nerrs; > +#else > + return 0; > +#endif > +} > + > +/* syscalls */ > +static inline long sys_gtod(struct timeval *tv, struct timezone *tz) > +{ > + return syscall(SYS_gettimeofday, tv, tz); > +} > + > +static inline int sys_clock_gettime(clockid_t id, struct timespec *ts) > +{ > + return syscall(SYS_clock_gettime, id, ts); > +} > + > +static inline long sys_time(time_t *t) > +{ > + return syscall(SYS_time, t); > +} > + > +static inline long sys_getcpu(unsigned * cpu, unsigned * node, > + void* cache) > +{ > + return syscall(SYS_getcpu, cpu, node, cache); > +} > + > +static jmp_buf jmpbuf; > + > +static void sigsegv(int sig, siginfo_t *info, void *ctx_void) > +{ > + siglongjmp(jmpbuf, 1); > +} > + > +static double tv_diff(const struct timeval *a, const struct timeval *b) > +{ > + return (double)(a->tv_sec - b->tv_sec) + > + (double)((int)a->tv_usec - (int)b->tv_usec) * 1e-6; > +} > + > +static int check_gtod(const struct timeval *tv_sys1, > + const struct timeval *tv_sys2, > + const struct timezone *tz_sys, > + const char *which, > + const struct timeval *tv_other, > + const struct timezone *tz_other) > +{ > + int nerrs = 0; > + double d1, d2; > + > + if (tz_other && (tz_sys->tz_minuteswest != tz_other->tz_minuteswest || tz_sys->tz_dsttime != tz_other->tz_dsttime)) { > + printf("[FAIL] %s tz mismatch\n", which); > + nerrs++; > + } > + > + d1 = tv_diff(tv_other, tv_sys1); > + d2 = tv_diff(tv_sys2, tv_other); > + printf("\t%s time offsets: %lf %lf\n", which, d1, d2); > + > + if (d1 < 0 || d2 < 0) { > + printf("[FAIL]\t%s time was inconsistent with the syscall\n", which); > + nerrs++; > + } else { > + printf("[OK]\t%s gettimeofday()'s timeval was okay\n", which); > + } > + > + return nerrs; > +} > + > +static int test_gtod(void) > +{ > + struct timeval tv_sys1, tv_sys2, tv_vdso, tv_vsys; > + struct timezone tz_sys, tz_vdso, tz_vsys; > + long ret_vdso = -1; > + long ret_vsys = -1; > + int nerrs = 0; > + > + printf("[RUN]\ttest gettimeofday()\n"); > + > + if (sys_gtod(&tv_sys1, &tz_sys) != 0) > + err(1, "syscall gettimeofday"); > + if (vdso_gtod) > + ret_vdso = vdso_gtod(&tv_vdso, &tz_vdso); > + if (vgtod) > + ret_vsys = vgtod(&tv_vsys, &tz_vsys); > + if (sys_gtod(&tv_sys2, &tz_sys) != 0) > + err(1, "syscall gettimeofday"); > + > + if (vdso_gtod) { > + if (ret_vdso == 0) { > + nerrs += check_gtod(&tv_sys1, &tv_sys2, &tz_sys, "vDSO", &tv_vdso, &tz_vdso); > + } else { > + printf("[FAIL]\tvDSO gettimeofday() failed: %ld\n", ret_vdso); > + nerrs++; > + } > + } > + > + if (vgtod) { > + if (ret_vsys == 0) { > + nerrs += check_gtod(&tv_sys1, &tv_sys2, &tz_sys, "vsyscall", &tv_vsys, &tz_vsys); > + } else { > + printf("[FAIL]\tvsys gettimeofday() failed: %ld\n", ret_vsys); > + nerrs++; > + } > + } > + > + return nerrs; > +} > + > +static int test_time(void) { > + int nerrs = 0; > + > + printf("[RUN]\ttest time()\n"); > + long t_sys1, t_sys2, t_vdso = 0, t_vsys = 0; > + long t2_sys1 = -1, t2_sys2 = -1, t2_vdso = -1, t2_vsys = -1; > + t_sys1 = sys_time(&t2_sys1); > + if (vdso_time) > + t_vdso = vdso_time(&t2_vdso); > + if (vtime) > + t_vsys = vtime(&t2_vsys); > + t_sys2 = sys_time(&t2_sys2); > + if (t_sys1 < 0 || t_sys1 != t2_sys1 || t_sys2 < 0 || t_sys2 != t2_sys2) { > + printf("[FAIL]\tsyscall failed (ret1:%ld output1:%ld ret2:%ld output2:%ld)\n", t_sys1, t2_sys1, t_sys2, t2_sys2); > + nerrs++; > + return nerrs; > + } > + > + if (vdso_time) { > + if (t_vdso < 0 || t_vdso != t2_vdso) { > + printf("[FAIL]\tvDSO failed (ret:%ld output:%ld)\n", t_vdso, t2_vdso); > + nerrs++; > + } else if (t_vdso < t_sys1 || t_vdso > t_sys2) { > + printf("[FAIL]\tvDSO returned the wrong time (%ld %ld %ld)\n", t_sys1, t_vdso, t_sys2); > + nerrs++; > + } else { > + printf("[OK]\tvDSO time() is okay\n"); > + } > + } > + > + if (vtime) { > + if (t_vsys < 0 || t_vsys != t2_vsys) { > + printf("[FAIL]\tvsyscall failed (ret:%ld output:%ld)\n", t_vsys, t2_vsys); > + nerrs++; > + } else if (t_vsys < t_sys1 || t_vsys > t_sys2) { > + printf("[FAIL]\tvsyscall returned the wrong time (%ld %ld %ld)\n", t_sys1, t_vsys, t_sys2); > + nerrs++; > + } else { > + printf("[OK]\tvsyscall time() is okay\n"); > + } > + } > + > + return nerrs; > +} > + > +static int test_getcpu(int cpu) > +{ > + int nerrs = 0; > + long ret_sys, ret_vdso = -1, ret_vsys = -1; > + > + printf("[RUN]\tgetcpu() on CPU %d\n", cpu); > + > + cpu_set_t cpuset; > + CPU_ZERO(&cpuset); > + CPU_SET(cpu, &cpuset); > + if (sched_setaffinity(0, sizeof(cpuset), &cpuset) != 0) { > + printf("[SKIP]\tfailed to force CPU %d\n", cpu); > + return nerrs; > + } > + > + unsigned cpu_sys, cpu_vdso, cpu_vsys, node_sys, node_vdso, node_vsys; > + unsigned node = 0; > + bool have_node = false; > + ret_sys = sys_getcpu(&cpu_sys, &node_sys, 0); > + if (vdso_getcpu) > + ret_vdso = vdso_getcpu(&cpu_vdso, &node_vdso, 0); > + if (vgetcpu) > + ret_vsys = vgetcpu(&cpu_vsys, &node_vsys, 0); > + > + if (ret_sys == 0) { > + if (cpu_sys != cpu) { > + printf("[FAIL]\tsyscall reported CPU %hu but should be %d\n", cpu_sys, cpu); > + nerrs++; > + } > + > + have_node = true; > + node = node_sys; > + } > + > + if (vdso_getcpu) { > + if (ret_vdso) { > + printf("[FAIL]\tvDSO getcpu() failed\n"); > + nerrs++; > + } else { > + if (!have_node) { > + have_node = true; > + node = node_vdso; > + } > + > + if (cpu_vdso != cpu) { > + printf("[FAIL]\tvDSO reported CPU %hu but should be %d\n", cpu_vdso, cpu); > + nerrs++; > + } else { > + printf("[OK]\tvDSO reported correct CPU\n"); > + } > + > + if (node_vdso != node) { > + printf("[FAIL]\tvDSO reported node %hu but should be %hu\n", node_vdso, node); > + nerrs++; > + } else { > + printf("[OK]\tvDSO reported correct node\n"); > + } > + } > + } > + > + if (vgetcpu) { > + if (ret_vsys) { > + printf("[FAIL]\tvsyscall getcpu() failed\n"); > + nerrs++; > + } else { > + if (!have_node) { > + have_node = true; > + node = node_vsys; > + } > + > + if (cpu_vsys != cpu) { > + printf("[FAIL]\tvsyscall reported CPU %hu but should be %d\n", cpu_vsys, cpu); > + nerrs++; > + } else { > + printf("[OK]\tvsyscall reported correct CPU\n"); > + } > + > + if (node_vsys != node) { > + printf("[FAIL]\tvsyscall reported node %hu but should be %hu\n", node_vsys, node); > + nerrs++; > + } else { > + printf("[OK]\tvsyscall reported correct node\n"); > + } > + } > + } > + > + return nerrs; > +} > + > +static int test_vsys_r(void) > +{ > +#ifdef __x86_64__ > + printf("[RUN]\tChecking read access to the vsyscall page\n"); > + bool can_read; > + if (sigsetjmp(jmpbuf, 1) == 0) { > + *(volatile int *)0xffffffffff600000; > + can_read = true; > + } else { > + can_read = false; > + } > + > + if (can_read && !should_read_vsyscall) { > + printf("[FAIL]\tWe have read access, but we shouldn't\n"); > + return 1; > + } else if (!can_read && should_read_vsyscall) { > + printf("[FAIL]\tWe don't have read access, but we should\n"); > + return 1; > + } else { > + printf("[OK]\tgot expected result\n"); > + } > +#endif > + > + return 0; > +} > + > + > +#ifdef __x86_64__ > +#define X86_EFLAGS_TF (1UL << 8) > +static volatile sig_atomic_t num_vsyscall_traps; > + > +static unsigned long get_eflags(void) > +{ > + unsigned long eflags; > + asm volatile ("pushfq\n\tpopq %0" : "=rm" (eflags)); > + return eflags; > +} > + > +static void set_eflags(unsigned long eflags) > +{ > + asm volatile ("pushq %0\n\tpopfq" : : "rm" (eflags) : "flags"); > +} > + > +static void sigtrap(int sig, siginfo_t *info, void *ctx_void) > +{ > + ucontext_t *ctx = (ucontext_t *)ctx_void; > + unsigned long ip = ctx->uc_mcontext.gregs[REG_RIP]; > + > + if (((ip ^ 0xffffffffff600000UL) & ~0xfffUL) == 0) > + num_vsyscall_traps++; > +} > + > +static int test_native_vsyscall(void) > +{ > + time_t tmp; > + bool is_native; > + > + if (!vtime) > + return 0; > + > + printf("[RUN]\tchecking for native vsyscall\n"); > + sethandler(SIGTRAP, sigtrap, 0); > + set_eflags(get_eflags() | X86_EFLAGS_TF); > + vtime(&tmp); > + set_eflags(get_eflags() & ~X86_EFLAGS_TF); > + > + /* > + * If vsyscalls are emulated, we expect a single trap in the > + * vsyscall page -- the call instruction will trap with RIP > + * pointing to the entry point before emulation takes over. > + * In native mode, we expect two traps, since whatever code > + * the vsyscall page contains will be more than just a ret > + * instruction. > + */ > + is_native = (num_vsyscall_traps > 1); > + > + printf("\tvsyscalls are %s (%d instructions in vsyscall page)\n", > + (is_native ? "native" : "emulated"), > + (int)num_vsyscall_traps); > + > + return 0; > +} > +#endif > + > +int main(int argc, char **argv) > +{ > + int nerrs = 0; > + > + init_vdso(); > + nerrs += init_vsys(); > + > + nerrs += test_gtod(); > + nerrs += test_time(); > + nerrs += test_getcpu(0); > + nerrs += test_getcpu(1); > + > + sethandler(SIGSEGV, sigsegv, 0); > + nerrs += test_vsys_r(); > + > +#ifdef __x86_64__ > + nerrs += test_native_vsyscall(); > +#endif > + > + return nerrs ? 1 : 0; > +} > -- > 2.13.6 > -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

6 years, 12 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror