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

[PATCH v15 00/24] selftests, powerpc, x86: Memory Protection Keys

by Sandipan Das

Memory protection keys enables an application to protect its address space from inadvertent access by its own code. This feature is now enabled on powerpc and has been available since 4.16-rc1. The patches move the selftests to arch neutral directory and enhance their test coverage. Testing ------- Verified for correctness on powerpc. Need help with x86 testing as I do not have access to a Skylake server. Client platforms like Coffee Lake do not have the required feature bits set in CPUID. Changelog --------- Link to previous version (v14): https://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=55981&state=* v15: (1) Rebased on top of latest master. (2) Addressed review comments from Dave Hansen. (3) Moved code for getting or setting pkey bits to new helpers. These changes replace patch 7 of v14. (4) Added a fix which ensures that the correct count of reserved keys is used across different platforms. (5) Added a fix which ensures that the correct page size is used as powerpc supports both 4K and 64K pages. v14: (1) Incorporated another round of comments from Dave Hansen. v13: (1) Incorporated comments for Dave Hansen. (2) Added one more test for correct pkey-0 behavior. v12: (1) Fixed the offset of pkey field in the siginfo structure for x86_64 and powerpc. And tries to use the actual field if the headers have it defined. v11: (1) Fixed a deadlock in the ptrace testcase. v10 and prior: (1) Moved the testcase to arch neutral directory. (2) Split the changes into incremental patches. Desnes A. Nunes do Rosario (1): selftests/vm/pkeys: Fix number of reserved powerpc pkeys Ram Pai (17): selftests/x86/pkeys: Move selftests to arch-neutral directory selftests/vm/pkeys: Rename all references to pkru to a generic name selftests/vm/pkeys: Move generic definitions to header file selftests/vm/pkeys: Typecast the pkey register selftests/vm/pkeys: Fix pkey_disable_clear() selftests/vm/pkeys: Fix assertion in pkey_disable_set/clear() selftests/vm/pkeys: Fix alloc_random_pkey() to make it really random selftests/vm/pkeys: Introduce generic pkey abstractions selftests/vm/pkeys: Introduce powerpc support selftests/vm/pkeys: Fix assertion in test_pkey_alloc_exhaust() selftests/vm/pkeys: Improve checks to determine pkey support selftests/vm/pkeys: Associate key on a mapped page and detect access violation selftests/vm/pkeys: Associate key on a mapped page and detect write violation selftests/vm/pkeys: Detect write violation on a mapped access-denied-key page selftests/vm/pkeys: Introduce a sub-page allocator selftests/vm/pkeys: Test correct behaviour of pkey-0 selftests/vm/pkeys: Override access right definitions on powerpc Sandipan Das (3): selftests: vm: pkeys: Add helpers for pkey bits selftests: vm: pkeys: Use the correct huge page size selftests: vm: pkeys: Use the correct page size on powerpc Thiago Jung Bauermann (2): selftests/vm/pkeys: Move some definitions to arch-specific header selftests/vm/pkeys: Make gcc check arguments of sigsafe_printf() tools/testing/selftests/vm/.gitignore | 1 + tools/testing/selftests/vm/Makefile | 5 + tools/testing/selftests/vm/pkey-helpers.h | 226 ++++++ tools/testing/selftests/vm/pkey-powerpc.h | 138 ++++ tools/testing/selftests/vm/pkey-x86.h | 183 +++++ .../selftests/{x86 => vm}/protection_keys.c | 688 ++++++++++-------- tools/testing/selftests/x86/.gitignore | 1 - tools/testing/selftests/x86/pkey-helpers.h | 219 ------ 8 files changed, 931 insertions(+), 530 deletions(-) create mode 100644 tools/testing/selftests/vm/pkey-helpers.h create mode 100644 tools/testing/selftests/vm/pkey-powerpc.h create mode 100644 tools/testing/selftests/vm/pkey-x86.h rename tools/testing/selftests/{x86 => vm}/protection_keys.c (74%) delete mode 100644 tools/testing/selftests/x86/pkey-helpers.h -- 2.17.1

5 years, 11 months

5
35
0 0

[BUGFIX PATCH] selftests: Fix pthread link option

by Masami Hiramatsu

To support pthread correctly, it is better to use -pthread instead of -lpthread. Signed-off-by: Masami Hiramatsu <mhiramat(a)kernel.org> --- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/membarrier/Makefile | 2 +- tools/testing/selftests/mqueue/Makefile | 2 +- tools/testing/selftests/net/Makefile | 4 ++-- .../testing/selftests/powerpc/benchmarks/Makefile | 4 ++-- tools/testing/selftests/powerpc/dscr/Makefile | 2 +- tools/testing/selftests/powerpc/mm/Makefile | 2 +- tools/testing/selftests/rseq/Makefile | 2 +- tools/testing/selftests/rtc/Makefile | 2 +- tools/testing/selftests/seccomp/Makefile | 2 +- tools/testing/selftests/timers/Makefile | 2 +- tools/testing/selftests/vm/Makefile | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index e2fd6f8d579c..419f58c53d12 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -22,7 +22,7 @@ CFLAGS += -g -Wall -O2 $(GENFLAGS) -I$(APIDIR) -I$(LIBDIR) -I$(BPFDIR) \ -I$(GENDIR) -I$(TOOLSDIR) -I$(CURDIR) \ -Dbpf_prog_load=bpf_prog_test_load \ -Dbpf_load_program=bpf_test_load_program -LDLIBS += -lcap -lelf -lrt -lpthread +LDLIBS += -lcap -lelf -lrt -pthread # Order correspond to 'make run_tests' order TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \ diff --git a/tools/testing/selftests/membarrier/Makefile b/tools/testing/selftests/membarrier/Makefile index 34d1c81a2324..19d657d966e3 100644 --- a/tools/testing/selftests/membarrier/Makefile +++ b/tools/testing/selftests/membarrier/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only CFLAGS += -g -I../../../../usr/include/ -LDLIBS += -lpthread +LDLIBS += -pthread TEST_GEN_PROGS := membarrier_test_single_thread \ membarrier_test_multi_thread diff --git a/tools/testing/selftests/mqueue/Makefile b/tools/testing/selftests/mqueue/Makefile index 8a58055fc1f5..9986b778b8b3 100644 --- a/tools/testing/selftests/mqueue/Makefile +++ b/tools/testing/selftests/mqueue/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += -O2 -LDLIBS = -lrt -lpthread -lpopt +LDLIBS = -lrt -pthread -lpopt TEST_GEN_PROGS := mq_open_tests mq_perf_tests diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index a8e04d665b69..6ad8571bb0ed 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -25,5 +25,5 @@ KSFT_KHDR_INSTALL := 1 include ../lib.mk $(OUTPUT)/reuseport_bpf_numa: LDLIBS += -lnuma -$(OUTPUT)/tcp_mmap: LDFLAGS += -lpthread -$(OUTPUT)/tcp_inq: LDFLAGS += -lpthread +$(OUTPUT)/tcp_mmap: LDFLAGS += -pthread +$(OUTPUT)/tcp_inq: LDFLAGS += -pthread diff --git a/tools/testing/selftests/powerpc/benchmarks/Makefile b/tools/testing/selftests/powerpc/benchmarks/Makefile index d40300a65b42..0d7c82d520ce 100644 --- a/tools/testing/selftests/powerpc/benchmarks/Makefile +++ b/tools/testing/selftests/powerpc/benchmarks/Makefile @@ -11,8 +11,8 @@ $(TEST_GEN_PROGS): ../harness.c $(OUTPUT)/context_switch: ../utils.c $(OUTPUT)/context_switch: CFLAGS += -maltivec -mvsx -mabi=altivec -$(OUTPUT)/context_switch: LDLIBS += -lpthread +$(OUTPUT)/context_switch: LDLIBS += -pthread -$(OUTPUT)/fork: LDLIBS += -lpthread +$(OUTPUT)/fork: LDLIBS += -pthread $(OUTPUT)/exec_target: CFLAGS += -static -nostartfiles diff --git a/tools/testing/selftests/powerpc/dscr/Makefile b/tools/testing/selftests/powerpc/dscr/Makefile index 5df476364b4d..90c744592d1b 100644 --- a/tools/testing/selftests/powerpc/dscr/Makefile +++ b/tools/testing/selftests/powerpc/dscr/Makefile @@ -6,6 +6,6 @@ TEST_GEN_PROGS := dscr_default_test dscr_explicit_test dscr_user_test \ top_srcdir = ../../../../.. include ../../lib.mk -$(OUTPUT)/dscr_default_test: LDLIBS += -lpthread +$(OUTPUT)/dscr_default_test: LDLIBS += -pthread $(TEST_GEN_PROGS): ../harness.c diff --git a/tools/testing/selftests/powerpc/mm/Makefile b/tools/testing/selftests/powerpc/mm/Makefile index ed1565809d2b..4cda9b0b3dd4 100644 --- a/tools/testing/selftests/powerpc/mm/Makefile +++ b/tools/testing/selftests/powerpc/mm/Makefile @@ -20,4 +20,4 @@ $(OUTPUT)/large_vm_fork_separation: CFLAGS += -m64 $(OUTPUT)/tempfile: dd if=/dev/zero of=$@ bs=64k count=1 -$(OUTPUT)/tlbie_test: LDLIBS += -lpthread +$(OUTPUT)/tlbie_test: LDLIBS += -pthread diff --git a/tools/testing/selftests/rseq/Makefile b/tools/testing/selftests/rseq/Makefile index d6469535630a..3a17f5b74b9c 100644 --- a/tools/testing/selftests/rseq/Makefile +++ b/tools/testing/selftests/rseq/Makefile @@ -6,7 +6,7 @@ endif CFLAGS += -O2 -Wall -g -I./ -I../../../../usr/include/ -L./ -Wl,-rpath=./ \ $(CLANG_FLAGS) -LDLIBS += -lpthread +LDLIBS += -pthread # Own dependencies because we only want to build against 1st prerequisite, but # still track changes to header files and depend on shared object. diff --git a/tools/testing/selftests/rtc/Makefile b/tools/testing/selftests/rtc/Makefile index de9c8566672a..d075ecfbe846 100644 --- a/tools/testing/selftests/rtc/Makefile +++ b/tools/testing/selftests/rtc/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += -O3 -Wl,-no-as-needed -Wall -LDFLAGS += -lrt -lpthread -lm +LDFLAGS += -lrt -pthread -lm TEST_GEN_PROGS = rtctest diff --git a/tools/testing/selftests/seccomp/Makefile b/tools/testing/selftests/seccomp/Makefile index 1760b3e39730..3e35159f709a 100644 --- a/tools/testing/selftests/seccomp/Makefile +++ b/tools/testing/selftests/seccomp/Makefile @@ -9,7 +9,7 @@ BINARIES := seccomp_bpf seccomp_benchmark CFLAGS += -Wl,-no-as-needed -Wall seccomp_bpf: seccomp_bpf.c ../kselftest_harness.h - $(CC) $(CFLAGS) $(LDFLAGS) $< -lpthread -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< -pthread -o $@ TEST_PROGS += $(BINARIES) EXTRA_CLEAN := $(BINARIES) diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile index 7656c7ce79d9..70461befa338 100644 --- a/tools/testing/selftests/timers/Makefile +++ b/tools/testing/selftests/timers/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += -O3 -Wl,-no-as-needed -Wall -LDLIBS += -lrt -lpthread -lm +LDLIBS += -lrt -pthread -lm # these are all "safe" tests that don't modify # system time or require escalated privileges diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index 7f9a8a8c31da..afb35febd7b6 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -31,6 +31,6 @@ TEST_FILES := test_vmalloc.sh KSFT_KHDR_INSTALL := 1 include ../lib.mk -$(OUTPUT)/userfaultfd: LDLIBS += -lpthread +$(OUTPUT)/userfaultfd: LDLIBS += -pthread $(OUTPUT)/mlock-random-test: LDLIBS += -lcap

5 years, 11 months

2
3
0 0

[PATCH] software node: introduce CONFIG_KUNIT_DRIVER_PE_TEST

by Alan Maguire

currently the property entry kunit tests are built if CONFIG_KUNIT=y. This will cause warnings when merged with the kunit tree that now supports tristate CONFIG_KUNIT. While the tests appear to compile as a module, we get a warning about missing module license. It's better to have a per-test suite CONFIG variable so that we can do selective building of kunit-based suites, and can also avoid merge issues like this. Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Fixes: c032ace71c29 ("software node: add basic tests for property entries") Signed-off-by: Alan Maguire <alan.maguire(a)oracle.com> --- drivers/base/test/Kconfig | 3 +++ drivers/base/test/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/base/test/Kconfig b/drivers/base/test/Kconfig index 86e85da..d29ae95 100644 --- a/drivers/base/test/Kconfig +++ b/drivers/base/test/Kconfig @@ -8,3 +8,6 @@ config TEST_ASYNC_DRIVER_PROBE The module name will be test_async_driver_probe.ko If unsure say N. +config KUNIT_DRIVER_PE_TEST + bool "KUnit Tests for property entry API" + depends on KUNIT diff --git a/drivers/base/test/Makefile b/drivers/base/test/Makefile index 2214310..3ca5636 100644 --- a/drivers/base/test/Makefile +++ b/drivers/base/test/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_TEST_ASYNC_DRIVER_PROBE) += test_async_driver_probe.o -obj-$(CONFIG_KUNIT) += property-entry-test.o +obj-$(CONFIG_KUNIT_DRIVER_PE_TEST) += property-entry-test.o -- 1.8.3.1

5 years, 11 months

4
5
0 0

Re: linux-next: Tree for Jan 13 (drivers/base/test/property-entry-test.o)

by Randy Dunlap

On 1/12/20 11:14 PM, Stephen Rothwell wrote: > Hi all, > > Changes since 20200110: > > The kunit-next tree lost its failures. > on i386: WARNING: modpost: missing MODULE_LICENSE() in drivers/base/test/property-entry-test.o see include/linux/module.h for more information -- ~Randy Reported-by: Randy Dunlap <rdunlap(a)infradead.org>

5 years, 11 months

4
3
0 0

[PATCH v2 0/8] vdso: Complete the conversion to 32bit syscalls

by Vincenzo Frascino

This patch series is a follow up to "lib/vdso, x86/vdso: Fix fallout from generic VDSO conversion" [1]. The main purpose is to complete the 32bit vDSOs conversion to use the legacy 32bit syscalls as a fallback. With the conversion of all the architectures present in -next complete, this patch series removes as well the conditional choice in between 32 and 64 bit for 32bit vDSOs. This series has been rebased on linux-next/master. [1] https://lkml.org/lkml/2019/7/28/86 Cc: Catalin Marinas <catalin.marinas(a)arm.com> Cc: Will Deacon <will(a)kernel.org> Cc: Paul Burton <paul.burton(a)mips.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Dmitry Safonov <0x7f454c46(a)gmail.com> Cc: Andy Lutomirski <luto(a)kernel.org> Signed-off-by: Vincenzo Frascino <vincenzo.frascino(a)arm.com> Vincenzo Frascino (8): arm64: compat: vdso: Expose BUILD_VDSO32 lib: vdso: Build 32 bit specific functions in the right context mips: compat: vdso: Use legacy syscalls as fallback lib: vdso: Remove VDSO_HAS_32BIT_FALLBACK lib: vdso: Remove checks on return value for 32 bit vDSO arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK x86: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK .../include/asm/vdso/compat_gettimeofday.h | 2 +- arch/mips/include/asm/vdso/gettimeofday.h | 43 +++++++++++++++++++ arch/mips/vdso/config-n32-o32-env.c | 1 + arch/x86/include/asm/vdso/gettimeofday.h | 2 - lib/vdso/gettimeofday.c | 30 ++++++------- 5 files changed, 57 insertions(+), 21 deletions(-) -- 2.23.0

5 years, 11 months

4
22
0 0

[PATCH] [RFC] kunit: move binary assertion out of line

by Arnd Bergmann

In combination with the structleak gcc plugin, kunit can lead to excessive stack usage when each assertion adds another structure to the stack from of the calling function: base/test/property-entry-test.c:99:1: error: the frame size of 3032 bytes is larger than 2048 bytes [-Werror=frame-larger-than=] As most assertions are binary, change those over to a direct function call that does not have this problem. This can probably be improved further, I just went for a straightforward conversion, but a function call with 12 fixed arguments plus varargs it not great either. Cc: Kees Cook <keescook(a)chromium.org> Cc: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: Brendan Higgins <brendanhiggins(a)google.com> Cc: Stephen Boyd <sboyd(a)kernel.org> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: "Rafael J. Wysocki" <rjw(a)rjwysocki.net> Cc: linux-kselftest(a)vger.kernel.org Cc: kunit-dev(a)googlegroups.com Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- I think improving the compiler or the plugin to not force the allocation of these structs would be better, as it avoids the whack-a-mole game of fixing up each time it hits us, but this may not be possible using the current plugin infrastructure. --- include/kunit/test.h | 155 ++++++++++++------------------------------- lib/kunit/assert.c | 8 +-- lib/kunit/test.c | 42 ++++++++++++ 3 files changed, 90 insertions(+), 115 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index dba48304b3bd..76eadd4a8b77 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -391,6 +391,16 @@ void kunit_do_assertion(struct kunit *test, bool pass, const char *fmt, ...); +void kunit_do_binary_assertion(struct kunit *test, bool pass, + enum kunit_assert_type type, + int line, const char *file, + const char *operation, + const char *left_text, long long left_value, + const char *right_text, long long right_value, + void (*format)(const struct kunit_assert *assert, + struct string_stream *stream), + const char *fmt, ...); + #define KUNIT_ASSERTION(test, pass, assert_class, INITIALIZER, fmt, ...) do { \ struct assert_class __assertion = INITIALIZER; \ kunit_do_assertion(test, \ @@ -491,19 +501,32 @@ do { \ typeof(left) __left = (left); \ typeof(right) __right = (right); \ ((void)__typecheck(__left, __right)); \ - \ - KUNIT_ASSERTION(test, \ - __left op __right, \ - assert_class, \ - ASSERT_CLASS_INIT(test, \ - assert_type, \ - #op, \ - #left, \ - __left, \ - #right, \ - __right), \ - fmt, \ - ##__VA_ARGS__); \ + kunit_do_binary_assertion(test, left op right, assert_type, \ + __LINE__, __FILE__, #op, #left, __left, \ + #right, __right, \ + kunit_binary_assert_format, \ + fmt, ##__VA_ARGS__); \ +} while (0) + +#define KUNIT_BASE_POINTER_ASSERTION(test, \ + assert_class, \ + ASSERT_CLASS_INIT, \ + assert_type, \ + left, \ + op, \ + right, \ + fmt, \ + ...) \ +do { \ + typeof(left) __left = (left); \ + typeof(right) __right = (right); \ + ((void)__typecheck(__left, __right)); \ + kunit_do_binary_assertion(test, left op right, assert_type, \ + __LINE__, __FILE__, #op, \ + #left, (uintptr_t)__left, \ + #right, (uintptr_t)__right, \ + kunit_binary_ptr_assert_format, \ + fmt, ##__VA_ARGS__); \ } while (0) #define KUNIT_BASE_EQ_MSG_ASSERTION(test, \ @@ -625,12 +648,11 @@ do { \ right, \ fmt, \ ...) \ - KUNIT_BASE_EQ_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ + KUNIT_BASE_POINTER_ASSERTION(test, \ + assert_class, \ + ASSERT_CLASS_INIT, \ assert_type, \ - left, \ - right, \ + left, ==, right, \ fmt, \ ##__VA_ARGS__) @@ -664,12 +686,11 @@ do { \ right, \ fmt, \ ...) \ - KUNIT_BASE_NE_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ + KUNIT_BASE_POINTER_ASSERTION(test, \ + assert_class, \ + ASSERT_CLASS_INIT, \ assert_type, \ - left, \ - right, \ + left, !=, right, \ fmt, \ ##__VA_ARGS__) @@ -697,28 +718,6 @@ do { \ right, \ NULL) -#define KUNIT_BINARY_PTR_LT_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ...) \ - KUNIT_BASE_LT_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ##__VA_ARGS__) - -#define KUNIT_BINARY_PTR_LT_ASSERTION(test, assert_type, left, right) \ - KUNIT_BINARY_PTR_LT_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - NULL) - #define KUNIT_BINARY_LE_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ KUNIT_BASE_LE_MSG_ASSERTION(test, \ kunit_binary_assert, \ @@ -736,28 +735,6 @@ do { \ right, \ NULL) -#define KUNIT_BINARY_PTR_LE_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ...) \ - KUNIT_BASE_LE_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ##__VA_ARGS__) - -#define KUNIT_BINARY_PTR_LE_ASSERTION(test, assert_type, left, right) \ - KUNIT_BINARY_PTR_LE_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - NULL) - #define KUNIT_BINARY_GT_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ KUNIT_BASE_GT_MSG_ASSERTION(test, \ kunit_binary_assert, \ @@ -775,28 +752,6 @@ do { \ right, \ NULL) -#define KUNIT_BINARY_PTR_GT_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ...) \ - KUNIT_BASE_GT_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ##__VA_ARGS__) - -#define KUNIT_BINARY_PTR_GT_ASSERTION(test, assert_type, left, right) \ - KUNIT_BINARY_PTR_GT_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - NULL) - #define KUNIT_BINARY_GE_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ KUNIT_BASE_GE_MSG_ASSERTION(test, \ kunit_binary_assert, \ @@ -814,28 +769,6 @@ do { \ right, \ NULL) -#define KUNIT_BINARY_PTR_GE_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ...) \ - KUNIT_BASE_GE_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ##__VA_ARGS__) - -#define KUNIT_BINARY_PTR_GE_ASSERTION(test, assert_type, left, right) \ - KUNIT_BINARY_PTR_GE_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - NULL) - #define KUNIT_BINARY_STR_ASSERTION(test, \ assert_type, \ left, \ diff --git a/lib/kunit/assert.c b/lib/kunit/assert.c index 86013d4cf891..abb6c70de925 100644 --- a/lib/kunit/assert.c +++ b/lib/kunit/assert.c @@ -101,8 +101,8 @@ void kunit_binary_assert_format(const struct kunit_assert *assert, void kunit_binary_ptr_assert_format(const struct kunit_assert *assert, struct string_stream *stream) { - struct kunit_binary_ptr_assert *binary_assert = container_of( - assert, struct kunit_binary_ptr_assert, assert); + struct kunit_binary_assert *binary_assert = container_of( + assert, struct kunit_binary_assert, assert); kunit_base_assert_format(assert, stream); string_stream_add(stream, @@ -112,10 +112,10 @@ void kunit_binary_ptr_assert_format(const struct kunit_assert *assert, binary_assert->right_text); string_stream_add(stream, "\t\t%s == %pK\n", binary_assert->left_text, - binary_assert->left_value); + (void *)(uintptr_t)binary_assert->left_value); string_stream_add(stream, "\t\t%s == %pK", binary_assert->right_text, - binary_assert->right_value); + (void *)(uintptr_t)binary_assert->right_value); kunit_assert_print_msg(assert, stream); } diff --git a/lib/kunit/test.c b/lib/kunit/test.c index c83c0fa59cbd..937f3fbe5ecc 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -172,6 +172,48 @@ void kunit_do_assertion(struct kunit *test, kunit_abort(test); } +void kunit_do_binary_assertion(struct kunit *test, bool pass, + enum kunit_assert_type type, + int line, const char *file, + const char *operation, + const char *left_text, long long left_value, + const char *right_text, long long right_value, + void (*format)(const struct kunit_assert *assert, + struct string_stream *stream), + const char *fmt, ...) +{ + va_list args; + struct kunit_binary_assert assert = { + .assert = { + .test = test, + .type = type, + .file = file, + .line = line, + .message.fmt = fmt, + .format = format, + }, + .operation = operation, + .left_text = left_text, + .left_value = left_value, + .right_text = right_text, + .right_value = right_value, + }; + + if (pass) + return; + + va_start(args, fmt); + + assert.assert.message.va = &args; + + kunit_fail(test, &assert.assert); + + va_end(args); + + if (type == KUNIT_ASSERTION) + kunit_abort(test); +} + void kunit_init_test(struct kunit *test, const char *name) { spin_lock_init(&test->lock); -- 2.20.0

5 years, 11 months

2
3
0 0

[PATCH 0/2] selftests/livepatch: Trivial cleanups

by Miroslav Benes

Two trivial cleanups after recent changes in selftests/livepatch. Based on "next" branch of Shuah's kselftest tree. Miroslav Benes (2): selftests/livepatch: Replace set_dynamic_debug() with setup_config() in README selftests/livepatch: Remove unused local variable in set_ftrace_enabled() tools/testing/selftests/livepatch/README | 2 +- tools/testing/selftests/livepatch/functions.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.24.1

5 years, 11 months

4
6
0 0

[PATCH kunit] kunit: building kunit as a module breaks allmodconfig

by Alan Maguire

kunit tests that do not support module build should depend on KUNIT=y rather than just KUNIT in Kconfig, otherwise they will trigger compilation errors for "make allmodconfig" builds. Fixes: 9fe124bf1b77 ("kunit: allow kunit to be loaded as a module") Signed-off-by: Alan Maguire <alan.maguire(a)oracle.com> Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> --- drivers/base/Kconfig | 2 +- security/apparmor/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index c3b3b5c..5f0bc74 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -150,7 +150,7 @@ config DEBUG_TEST_DRIVER_REMOVE config PM_QOS_KUNIT_TEST bool "KUnit Test for PM QoS features" - depends on KUNIT + depends on KUNIT=y config HMEM_REPORTING bool diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig index d547930..0fe3368 100644 --- a/security/apparmor/Kconfig +++ b/security/apparmor/Kconfig @@ -71,7 +71,7 @@ config SECURITY_APPARMOR_DEBUG_MESSAGES config SECURITY_APPARMOR_KUNIT_TEST bool "Build KUnit tests for policy_unpack.c" - depends on KUNIT && SECURITY_APPARMOR + depends on KUNIT=y && SECURITY_APPARMOR help This builds the AppArmor KUnit tests. -- 1.8.3.1

5 years, 11 months

3
2
0 0

Investment opportunity

by Peter Wong

Greetings, Please read the attached investment proposal and reply for more details. Are you interested in loan? Sincerely: Peter Wong ---------------------------------------------------- This email was sent by the shareware version of Postman Professional.

5 years, 11 months

1
0
0 0

[PATCH v3] selftests/lkdtm: Add tests for LKDTM targets

by Kees Cook

This adds a basic framework for running all the "safe" LKDTM tests. This will allow easy introspection into any selftest logs to examine the results of most LKDTM tests. Signed-off-by: Kees Cook <keescook(a)chromium.org> --- v3: replace open-coded "4" with $KSELFTEST_SKIP_TEXT (shuah), add DOUBLE_FAULT v2: https://lore.kernel.org/lkml/201912301453.19D686EE6@keescook v1: https://lore.kernel.org/lkml/201905091013.E228F0F0BE@keescook --- MAINTAINERS | 1 + tools/testing/selftests/Makefile | 1 + tools/testing/selftests/lkdtm/Makefile | 12 ++++ tools/testing/selftests/lkdtm/config | 1 + tools/testing/selftests/lkdtm/run.sh | 92 +++++++++++++++++++++++++ tools/testing/selftests/lkdtm/tests.txt | 71 +++++++++++++++++++ 6 files changed, 178 insertions(+) create mode 100644 tools/testing/selftests/lkdtm/Makefile create mode 100644 tools/testing/selftests/lkdtm/config create mode 100755 tools/testing/selftests/lkdtm/run.sh create mode 100644 tools/testing/selftests/lkdtm/tests.txt diff --git a/MAINTAINERS b/MAINTAINERS index cc0a4a8ae06a..eacc00c6cfd5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9578,6 +9578,7 @@ LINUX KERNEL DUMP TEST MODULE (LKDTM) M: Kees Cook <keescook(a)chromium.org> S: Maintained F: drivers/misc/lkdtm/* +F: tools/testing/selftests/lkdtm/* LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM) M: Alan Stern <stern(a)rowland.harvard.edu> diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index b001c602414b..f0b02a12ba39 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -26,6 +26,7 @@ TARGETS += kexec TARGETS += kvm TARGETS += lib TARGETS += livepatch +TARGETS += lkdtm TARGETS += membarrier TARGETS += memfd TARGETS += memory-hotplug diff --git a/tools/testing/selftests/lkdtm/Makefile b/tools/testing/selftests/lkdtm/Makefile new file mode 100644 index 000000000000..1bcc9ee990eb --- /dev/null +++ b/tools/testing/selftests/lkdtm/Makefile @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0 +# Makefile for LKDTM regression tests + +include ../lib.mk + +# NOTE: $(OUTPUT) won't get default value if used before lib.mk +TEST_FILES := tests.txt +TEST_GEN_PROGS = $(patsubst %,$(OUTPUT)/%.sh,$(shell awk '{print $$1}' tests.txt | sed -e 's/\#//')) +all: $(TEST_GEN_PROGS) + +$(OUTPUT)/%: run.sh tests.txt + install -m 0744 run.sh $@ diff --git a/tools/testing/selftests/lkdtm/config b/tools/testing/selftests/lkdtm/config new file mode 100644 index 000000000000..d874990e442b --- /dev/null +++ b/tools/testing/selftests/lkdtm/config @@ -0,0 +1 @@ +CONFIG_LKDTM=y diff --git a/tools/testing/selftests/lkdtm/run.sh b/tools/testing/selftests/lkdtm/run.sh new file mode 100755 index 000000000000..dadf819148a4 --- /dev/null +++ b/tools/testing/selftests/lkdtm/run.sh @@ -0,0 +1,92 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# This reads tests.txt for the list of LKDTM tests to invoke. Any marked +# with a leading "#" are skipped. The rest of the line after the +# test name is either the text to look for in dmesg for a "success", +# or the rationale for why a test is marked to be skipped. +# +set -e +TRIGGER=/sys/kernel/debug/provoke-crash/DIRECT +KSELFTEST_SKIP_TEST=4 + +# Verify we have LKDTM available in the kernel. +if [ ! -r $TRIGGER ] ; then + /sbin/modprobe -q lkdtm || true + if [ ! -r $TRIGGER ] ; then + echo "Cannot find $TRIGGER (missing CONFIG_LKDTM?)" + else + echo "Cannot write $TRIGGER (need to run as root?)" + fi + # Skip this test + exit $KSELFTEST_SKIP_TEST +fi + +# Figure out which test to run from our script name. +test=$(basename $0 .sh) +# Look up details about the test from master list of LKDTM tests. +line=$(egrep '^#?'"$test"'\b' tests.txt) +if [ -z "$line" ]; then + echo "Skipped: missing test '$test' in tests.txt" + exit $KSELFTEST_SKIP_TEST +fi +# Check that the test is known to LKDTM. +if ! egrep -q '^'"$test"'$' "$TRIGGER" ; then + echo "Skipped: test '$test' missing in $TRIGGER!" + exit $KSELFTEST_SKIP_TEST +fi + +# Extract notes/expected output from test list. +test=$(echo "$line" | cut -d" " -f1) +if echo "$line" | grep -q ' ' ; then + expect=$(echo "$line" | cut -d" " -f2-) +else + expect="" +fi + +# If the test is commented out, report a skip +if echo "$test" | grep -q '^#' ; then + test=$(echo "$test" | cut -c2-) + if [ -z "$expect" ]; then + expect="crashes entire system" + fi + echo "Skipping $test: $expect" + exit $KSELFTEST_SKIP_TEST +fi + +# If no expected output given, assume an Oops with back trace is success. +if [ -z "$expect" ]; then + expect="call trace:" +fi + +# Clear out dmesg for output reporting +dmesg -c >/dev/null + +# Prepare log for report checking +LOG=$(mktemp --tmpdir -t lkdtm-XXXXXX) +cleanup() { + rm -f "$LOG" +} +trap cleanup EXIT + +# Most shells yell about signals and we're expecting the "cat" process +# to usually be killed by the kernel. So we have to run it in a sub-shell +# and silence errors. +($SHELL -c 'cat <(echo '"$test"') >'"$TRIGGER" 2>/dev/null) || true + +# Record and dump the results +dmesg -c >"$LOG" +cat "$LOG" +# Check for expected output +if egrep -qi "$expect" "$LOG" ; then + echo "$test: saw '$expect': ok" + exit 0 +else + if egrep -qi XFAIL: "$LOG" ; then + echo "$test: saw 'XFAIL': [SKIP]" + exit $KSELFTEST_SKIP_TEST + else + echo "$test: missing '$expect': [FAIL]" + exit 1 + fi +fi diff --git a/tools/testing/selftests/lkdtm/tests.txt b/tools/testing/selftests/lkdtm/tests.txt new file mode 100644 index 000000000000..92ca32143ae5 --- /dev/null +++ b/tools/testing/selftests/lkdtm/tests.txt @@ -0,0 +1,71 @@ +#PANIC +BUG kernel BUG at +WARNING WARNING: +WARNING_MESSAGE message trigger +EXCEPTION +#LOOP Hangs the system +#EXHAUST_STACK Corrupts memory on failure +#CORRUPT_STACK Crashes entire system on success +#CORRUPT_STACK_STRONG Crashes entire system on success +CORRUPT_LIST_ADD list_add corruption +CORRUPT_LIST_DEL list_del corruption +CORRUPT_USER_DS Invalid address limit on user-mode return +STACK_GUARD_PAGE_LEADING +STACK_GUARD_PAGE_TRAILING +UNSET_SMEP CR4 bits went missing +DOUBLE_FAULT +UNALIGNED_LOAD_STORE_WRITE +#OVERWRITE_ALLOCATION Corrupts memory on failure +#WRITE_AFTER_FREE Corrupts memory on failure +READ_AFTER_FREE +#WRITE_BUDDY_AFTER_FREE Corrupts memory on failure +READ_BUDDY_AFTER_FREE +SLAB_FREE_DOUBLE +SLAB_FREE_CROSS +SLAB_FREE_PAGE +#SOFTLOCKUP Hangs the system +#HARDLOCKUP Hangs the system +#SPINLOCKUP Hangs the system +#HUNG_TASK Hangs the system +EXEC_DATA +EXEC_STACK +EXEC_KMALLOC +EXEC_VMALLOC +EXEC_RODATA +EXEC_USERSPACE +EXEC_NULL +ACCESS_USERSPACE +ACCESS_NULL +WRITE_RO +WRITE_RO_AFTER_INIT +WRITE_KERN +REFCOUNT_INC_OVERFLOW +REFCOUNT_ADD_OVERFLOW +REFCOUNT_INC_NOT_ZERO_OVERFLOW +REFCOUNT_ADD_NOT_ZERO_OVERFLOW +REFCOUNT_DEC_ZERO +REFCOUNT_DEC_NEGATIVE Negative detected: saturated +REFCOUNT_DEC_AND_TEST_NEGATIVE Negative detected: saturated +REFCOUNT_SUB_AND_TEST_NEGATIVE Negative detected: saturated +REFCOUNT_INC_ZERO +REFCOUNT_ADD_ZERO +REFCOUNT_INC_SATURATED Saturation detected: still saturated +REFCOUNT_DEC_SATURATED Saturation detected: still saturated +REFCOUNT_ADD_SATURATED Saturation detected: still saturated +REFCOUNT_INC_NOT_ZERO_SATURATED +REFCOUNT_ADD_NOT_ZERO_SATURATED +REFCOUNT_DEC_AND_TEST_SATURATED Saturation detected: still saturated +REFCOUNT_SUB_AND_TEST_SATURATED Saturation detected: still saturated +#REFCOUNT_TIMING timing only +#ATOMIC_TIMING timing only +USERCOPY_HEAP_SIZE_TO +USERCOPY_HEAP_SIZE_FROM +USERCOPY_HEAP_WHITELIST_TO +USERCOPY_HEAP_WHITELIST_FROM +USERCOPY_STACK_FRAME_TO +USERCOPY_STACK_FRAME_FROM +USERCOPY_STACK_BEYOND +USERCOPY_KERNEL +USERCOPY_KERNEL_DS +STACKLEAK_ERASING OK: the rest of the thread stack is properly erased +CFI_FORWARD_PROTO -- 2.20.1 -- Kees Cook

5 years, 11 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror