Hi Linus,
Please pull this kselftest next update for Linux 6.18-rc1.
- Fixes watchdog test to exit when device doesn't support keep alive
- Fix missing header build complaints during out of tree build
- A few minor fixes to git ignore
- MAINTAINERS file change to update dma_map_benchmark
diff is attached.
thanks,
-- Shuah
----------------------------------------------------------------
The following changes since commit f83ec76bf285bea5727f478a68b894f5543ca76e:
Linux 6.17-rc6 (2025-09-14 14:21:14 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
tags/linux_kselftest-next-6.18-rc1
for you to fetch changes up to 19692013415486febf71343f5cc539a343a2994b:
MAINTAINERS: add myself and Barry to dma_map_benchmark maintainers
(2025-09-28 14:41:34 -0600)
----------------------------------------------------------------
linux_kselftest-next-6.18-rc1
- Fixes watchdog test to exit when device doesn't support keep alive
- Fix missing header build complaints during out of tree build
- A few minor fixes to git ignore
- MAINTAINERS file change to update dma_map_benchmark
----------------------------------------------------------------
Akhilesh Patil (1):
selftests: watchdog: skip ping loop if WDIOF_KEEPALIVEPING not supported
Dylan Yudaken (1):
selftests/kexec: Ignore selftest binary
Qinxin Xia (1):
MAINTAINERS: add myself and Barry to dma_map_benchmark maintainers
Thomas Weißschuh (1):
selftests: always install UAPI headers to the correct directory
Yi Lai (1):
selftests/kselftest_harness: Add harness-selftest.expected to TEST_FILES
MAINTAINERS | 5 +++--
tools/testing/selftests/kexec/.gitignore | 2 ++
tools/testing/selftests/kselftest_harness/Makefile | 1 +
tools/testing/selftests/lib.mk | 5 ++++-
tools/testing/selftests/watchdog/watchdog-test.c | 6 ++++++
5 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 tools/testing/selftests/kexec/.gitignore
----------------------------------------------------------------
diff --git a/MAINTAINERS b/MAINTAINERS
index f6206963efbf..dedc681f2632 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7218,10 +7218,11 @@ F: include/linux/dmaengine.h
F: include/linux/of_dma.h
DMA MAPPING BENCHMARK
-M: Xiang Chen <[email protected]>
+M: Barry Song <[email protected]>
+M: Qinxin Xia <[email protected]>
L: [email protected]
F: kernel/dma/map_benchmark.c
-F: tools/testing/selftests/dma/
+F: tools/dma/
DMA MAPPING HELPERS
M: Marek Szyprowski <[email protected]>
diff --git a/tools/testing/selftests/kexec/.gitignore b/tools/testing/selftests/kexec/.gitignore
new file mode 100644
index 000000000000..5f3d9e089ae8
--- /dev/null
+++ b/tools/testing/selftests/kexec/.gitignore
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+test_kexec_jump
diff --git a/tools/testing/selftests/kselftest_harness/Makefile b/tools/testing/selftests/kselftest_harness/Makefile
index 0617535a6ce4..d2369c01701a 100644
--- a/tools/testing/selftests/kselftest_harness/Makefile
+++ b/tools/testing/selftests/kselftest_harness/Makefile
@@ -2,6 +2,7 @@
TEST_GEN_PROGS_EXTENDED := harness-selftest
TEST_PROGS := harness-selftest.sh
+TEST_FILES := harness-selftest.expected
EXTRA_CLEAN := harness-selftest.seen
include ../lib.mk
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 530390033929..a448fae57831 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -228,7 +228,10 @@ $(OUTPUT)/%:%.S
$(LINK.S) $^ $(LDLIBS) -o $@
endif
+# Extract the expected header directory
+khdr_output := $(patsubst %/usr/include,%,$(filter %/usr/include,$(KHDR_INCLUDES)))
+
headers:
- $(Q)$(MAKE) -C $(top_srcdir) headers
+ $(Q)$(MAKE) -f $(top_srcdir)/Makefile -C $(khdr_output) headers
.PHONY: run_tests all clean install emit_tests gen_mods_dir clean_mods_dir headers
diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c
index a1f506ba5578..4f09c5db0c7f 100644
--- a/tools/testing/selftests/watchdog/watchdog-test.c
+++ b/tools/testing/selftests/watchdog/watchdog-test.c
@@ -332,6 +332,12 @@ int main(int argc, char *argv[])
if (oneshot)
goto end;
+ /* Check if WDIOF_KEEPALIVEPING is supported */
+ if (!(info.options & WDIOF_KEEPALIVEPING)) {
+ printf("WDIOC_KEEPALIVE not supported by this device\n");
+ goto end;
+ }
+
printf("Watchdog Ticking Away!\n");
/*
