Skip to content

Commit d451b07

Browse files
committed
Merge tag 'linux_kselftest-next-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest update from Shuah Khan: - livepatch restructuring to move the module out of lib to be built as a out-of-tree modules during kselftest build. This makes it easier change, debug and rebuild the tests by running make on the selftests/livepatch directory, which is not currently possible since the modules on lib/livepatch are build and installed using the main makefile modules target. - livepatch restructuring fixes for problems found by kernel test robot. The change skips the test if kernel-devel isn't installed (default value of KDIR), or if KDIR variable passed doesn't exists. - resctrl test restructuring and new non-contiguous CBMs CAT test - new ktap_helpers to print diagnostic messages, pass/fail tests based on exit code, abort test, and finish the test. - a new test verify power supply properties. - a new ftrace to exercise function tracer across cpu hotplug. - timeout increase for mqueue test to allow the test to run on i3.metal AWS instances. - minor spelling corrections in several tests. - missing gitignore files and changes to existing gitignore files. * tag 'linux_kselftest-next-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (57 commits) kselftest: Add basic test for probing the rust sample modules selftests: lib.mk: Do not process TEST_GEN_MODS_DIR selftests: livepatch: Avoid running the tests if kernel-devel is missing selftests: livepatch: Add initial .gitignore selftests/resctrl: Add non-contiguous CBMs CAT test selftests/resctrl: Add resource_info_file_exists() selftests/resctrl: Split validate_resctrl_feature_request() selftests/resctrl: Add a helper for the non-contiguous test selftests/resctrl: Add test groups and name L3 CAT test L3_CAT selftests: sched: Fix spelling mistake "hiearchy" -> "hierarchy" selftests/mqueue: Set timeout to 180 seconds selftests/ftrace: Add test to exercize function tracer across cpu hotplug selftest: ftrace: fix minor typo in log selftests: thermal: intel: workload_hint: add missing gitignore selftests: thermal: intel: power_floor: add missing gitignore selftests: uevent: add missing gitignore selftests: Add test to verify power supply properties selftests: ktap_helpers: Add a helper to finish the test selftests: ktap_helpers: Add a helper to abort the test selftests: ktap_helpers: Add helper to pass/fail test based on exit code ...
2 parents e8f897f + 5d94da7 commit d451b07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1945
-883
lines changed

Documentation/dev-tools/kselftest.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ Contributing new tests (details)
245245
TEST_PROGS, TEST_GEN_PROGS mean it is the executable tested by
246246
default.
247247

248+
TEST_GEN_MODS_DIR should be used by tests that require modules to be built
249+
before the test starts. The variable will contain the name of the directory
250+
containing the modules.
251+
248252
TEST_CUSTOM_PROGS should be used by tests that require custom build
249253
rules and prevent common build rule use.
250254

MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12517,7 +12517,6 @@ F: arch/powerpc/include/asm/livepatch.h
1251712517
F: include/linux/livepatch.h
1251812518
F: kernel/livepatch/
1251912519
F: kernel/module/livepatch.c
12520-
F: lib/livepatch/
1252112520
F: samples/livepatch/
1252212521
F: tools/testing/selftests/livepatch/
1252312522

@@ -17550,6 +17549,7 @@ F: Documentation/devicetree/bindings/power/supply/
1755017549
F: drivers/power/supply/
1755117550
F: include/linux/power/
1755217551
F: include/linux/power_supply.h
17552+
F: tools/testing/selftests/power_supply/
1755317553

1755417554
POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
1755517555
M: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
@@ -19120,6 +19120,7 @@ F: Documentation/rust/
1912019120
F: rust/
1912119121
F: samples/rust/
1912219122
F: scripts/*rust*
19123+
F: tools/testing/selftests/rust/
1912319124
K: \b(?i:rust)\b
1912419125

1912519126
RXRPC SOCKETS (AF_RXRPC)

arch/s390/configs/debug_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,4 +880,3 @@ CONFIG_ATOMIC64_SELFTEST=y
880880
CONFIG_STRING_SELFTEST=y
881881
CONFIG_TEST_BITOPS=m
882882
CONFIG_TEST_BPF=m
883-
CONFIG_TEST_LIVEPATCH=m

arch/s390/configs/defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,4 +808,3 @@ CONFIG_KPROBES_SANITY_TEST=m
808808
CONFIG_PERCPU_TEST=m
809809
CONFIG_ATOMIC64_SELFTEST=y
810810
CONFIG_TEST_BPF=m
811-
CONFIG_TEST_LIVEPATCH=m

lib/Kconfig.debug

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2858,28 +2858,6 @@ config TEST_MEMCAT_P
28582858

28592859
If unsure, say N.
28602860

2861-
config TEST_LIVEPATCH
2862-
tristate "Test livepatching"
2863-
default n
2864-
depends on DYNAMIC_DEBUG
2865-
depends on LIVEPATCH
2866-
depends on m
2867-
help
2868-
Test kernel livepatching features for correctness. The tests will
2869-
load test modules that will be livepatched in various scenarios.
2870-
2871-
To run all the livepatching tests:
2872-
2873-
make -C tools/testing/selftests TARGETS=livepatch run_tests
2874-
2875-
Alternatively, individual tests may be invoked:
2876-
2877-
tools/testing/selftests/livepatch/test-callbacks.sh
2878-
tools/testing/selftests/livepatch/test-livepatch.sh
2879-
tools/testing/selftests/livepatch/test-shadow-vars.sh
2880-
2881-
If unsure, say N.
2882-
28832861
config TEST_OBJAGG
28842862
tristate "Perform selftest on object aggreration manager"
28852863
default n

lib/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ endif
134134
obj-$(CONFIG_TEST_FPU) += test_fpu.o
135135
CFLAGS_test_fpu.o += $(FPU_CFLAGS)
136136

137-
obj-$(CONFIG_TEST_LIVEPATCH) += livepatch/
138-
139137
# Some KUnit files (hooks.o) need to be built-in even when KUnit is a module,
140138
# so we can't just use obj-$(CONFIG_KUNIT).
141139
ifdef CONFIG_KUNIT

lib/livepatch/Makefile

Lines changed: 0 additions & 14 deletions
This file was deleted.

tools/testing/selftests/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ TARGETS += nsfs
6767
TARGETS += perf_events
6868
TARGETS += pidfd
6969
TARGETS += pid_namespace
70+
TARGETS += power_supply
7071
TARGETS += powerpc
7172
TARGETS += prctl
7273
TARGETS += proc
@@ -78,6 +79,7 @@ TARGETS += riscv
7879
TARGETS += rlimits
7980
TARGETS += rseq
8081
TARGETS += rtc
82+
TARGETS += rust
8183
TARGETS += seccomp
8284
TARGETS += sgx
8385
TARGETS += sigaltstack
@@ -236,6 +238,7 @@ ifdef INSTALL_PATH
236238
install -m 744 kselftest/module.sh $(INSTALL_PATH)/kselftest/
237239
install -m 744 kselftest/runner.sh $(INSTALL_PATH)/kselftest/
238240
install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/
241+
install -m 744 kselftest/ktap_helpers.sh $(INSTALL_PATH)/kselftest/
239242
install -m 744 run_kselftest.sh $(INSTALL_PATH)/
240243
rm -f $(TEST_LIST)
241244
@ret=1; \

tools/testing/selftests/dt/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ifneq ($(PY3),)
44

55
TEST_PROGS := test_unprobed_devices.sh
66
TEST_GEN_FILES := compatible_list
7-
TEST_FILES := compatible_ignore_list ktap_helpers.sh
7+
TEST_FILES := compatible_ignore_list
88

99
include ../lib.mk
1010

tools/testing/selftests/dt/test_unprobed_devices.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@
1515

1616
DIR="$(dirname $(readlink -f "$0"))"
1717

18-
source "${DIR}"/ktap_helpers.sh
18+
source "${DIR}"/../kselftest/ktap_helpers.sh
1919

2020
PDT=/proc/device-tree/
2121
COMPAT_LIST="${DIR}"/compatible_list
2222
IGNORE_LIST="${DIR}"/compatible_ignore_list
2323

24-
KSFT_PASS=0
25-
KSFT_FAIL=1
26-
KSFT_SKIP=4
27-
2824
ktap_print_header
2925

3026
if [[ ! -d "${PDT}" ]]; then

0 commit comments

Comments
 (0)