Merge tag 'linux-kselftest-5.7-rc1' of... (397a9794) · Commits · 戴 / test

Merge tag 'linux-kselftest-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest Pull kselftest update from Shuah Khan: "This kselftest update consists of: - resctrl_tests for resctrl file system. resctrl isn't included in the default TARGETS list in kselftest Makefile. It can be run manually. - Kselftest harness improvements. - Kselftest framework and individual test fixes to support runs on Kernel CI rings and other environments that use relocatable build and install features. - Minor cleanups and typo fixes" * tag 'linux-kselftest-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (25 commits) selftests: enforce local header dependency in lib.mk selftests: Fix memfd to support relocatable build (O=objdir) selftests: Fix seccomp to support relocatable build (O=objdir) selftests/harness: Handle timeouts cleanly selftests/harness: Move test child waiting logic selftests: android: Fix custom install from skipping test progs selftests: android: ion: Fix ionmap_test compile error selftests: Fix kselftest O=objdir build from cluttering top level objdir selftests/seccomp: Adjust test fixture counts selftests/ftrace: Fix typo in trigger-multihist.tc selftests/timens: Remove duplicated include <time.h> selftests/resctrl: fix spelling mistake "Errror" -> "Error" selftests/resctrl: Add the test in MAINTAINERS selftests/resctrl: Disable MBA and MBM tests for AMD selftests/resctrl: Use cache index3 id for AMD schemata masks selftests/resctrl: Add vendor detection mechanism selftests/resctrl: Add Cache Allocation Technology (CAT) selftest selftests/resctrl: Add Cache QoS Monitoring (CQM) selftest selftests/resctrl: Add MBA test selftests/resctrl: Add MBM test ...

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -14189,6 +14189,7 @@ S: Supported
		F: arch/x86/kernel/cpu/resctrl/
		F: arch/x86/include/asm/resctrl_sched.h
		F: Documentation/x86/resctrl*
		F: tools/testing/selftests/resctrl/

		READ-COPY UPDATE (RCU)
		M: "Paul E. McKenney" <paulmck@kernel.org>

tools/testing/selftests/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ override LDFLAGS =
		override MAKEFLAGS =
		endif

		# Append kselftest to KBUILD_OUTPUT to avoid cluttering
		# Append kselftest to KBUILD_OUTPUT and O to avoid cluttering
		# KBUILD_OUTPUT with selftest objects and headers installed
		# by selftests Makefile or lib.mk.
		ifdef building_out_of_srctree
		@@ -99,7 +99,7 @@ override LDFLAGS =
		endif

		ifneq ($(O),)
		BUILD := $(O)
		BUILD := $(O)/kselftest
		else
		ifneq ($(KBUILD_OUTPUT),)
		BUILD := $(KBUILD_OUTPUT)/kselftest

tools/testing/selftests/android/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ all:

		override define INSTALL_RULE
		mkdir -p $(INSTALL_PATH)
		install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)
		install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)

		@for SUBDIR in $(SUBDIRS); do \
		BUILD_TARGET=$(OUTPUT)/$$SUBDIR; \

tools/testing/selftests/android/ion/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,4 +17,4 @@ include ../../lib.mk

		$(OUTPUT)/ionapp_export: ionapp_export.c ipcsocket.c ionutils.c
		$(OUTPUT)/ionapp_import: ionapp_import.c ipcsocket.c ionutils.c
		$(OUTPUT)/ionmap_test: ionmap_test.c ionutils.c
		$(OUTPUT)/ionmap_test: ionmap_test.c ionutils.c ipcsocket.c

tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ if [ ! -f events/sched/sched_process_fork/hist ]; then
		exit_unsupported
		fi

		echo "Test histogram multiple tiggers"
		echo "Test histogram multiple triggers"

		echo 'hist:keys=parent_pid:vals=child_pid' > events/sched/sched_process_fork/trigger
		echo 'hist:keys=parent_comm:vals=child_pid' >> events/sched/sched_process_fork/trigger

Admin message