Commit 1c6d2ead authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-next-5.19-rc1' of... 

Merge tag 'linux-kselftest-next-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest updates from Shuah Khan:
 "Several fixes, cleanups, and enhancements to tests:

   - add mips support for kprobe args string and syntax tests

   - updates to resctrl test to use kselftest framework

   - fixes, cleanups, and enhancements to tests"

* tag 'linux-kselftest-next-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kselftests/ir : Improve readability of modprobe error message
  selftests/resctrl: Fix null pointer dereference on open failed
  selftests/resctrl: Add missing SPDX license to Makefile
  selftests/resctrl: Update README about using kselftest framework to build/run resctrl_tests
  selftests/resctrl: Make resctrl_tests run using kselftest framework
  selftests/resctrl: Fix resctrl_tests' return code to work with selftest framework
  selftests/resctrl: Change the default limited time to 120 seconds
  selftests/resctrl: Kill child process before parent process terminates if SIGTERM is received
  selftests/resctrl: Print a message if the result of MBM&CMT tests is failed on Intel CPU
  selftests/resctrl: Extend CPU vendor detection
  selftests/x86/corrupt_xstate_header: Use provided __cpuid_count() macro
  selftests/x86/amx: Use provided __cpuid_count() macro
  selftests/vm/pkeys: Use provided __cpuid_count() macro
  selftests: Provide local define of __cpuid_count()
  selftests/damon: add damon to selftests root Makefile
  selftests/binderfs: Improve message to provide more info
  selftests: mqueue: drop duplicate min definition
  selftests/ftrace: add mips support for kprobe args syntax tests
  selftests/ftrace: add mips support for kprobe args string tests
parents 88a61892 15477b31

tools/testing/selftests/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ TARGETS += clone3 
TARGETS += core

TARGETS += cpufreq

TARGETS += cpu-hotplug

TARGETS += damon

TARGETS += drivers/dma-buf

TARGETS += efivarfs

TARGETS += exec
@@ -52,6 +53,7 @@ TARGETS += proc 
TARGETS += pstore

TARGETS += ptrace

TARGETS += openat2

TARGETS += resctrl

TARGETS += rlimits

TARGETS += rseq

TARGETS += rtc

tools/testing/selftests/filesystems/binderfs/binderfs_test.c

+2 −1
Original line number Diff line number Diff line
@@ -412,7 +412,8 @@ TEST(binderfs_stress) 


		ret = mount(NULL, binderfs_mntpt, "binder", 0, 0);

		ASSERT_EQ(ret, 0) {

			TH_LOG("%s - Failed to mount binderfs", strerror(errno));

			TH_LOG("%s - Failed to mount binderfs, check if CONFIG_ANDROID_BINDERFS is enabled in the running kernel",

				strerror(errno));

		}



		for (int i = 0; i < ARRAY_SIZE(fds); i++) {

tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ ppc*) 
s390*)

  ARG1=%r2

;;

mips*)

  ARG1=%r4

;;

*)

  echo "Please implement other architecture here"

  exit_untested

tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ s390*) 
  GOODREG=%r2

  BADREG=%s2

;;

mips*)

  GOODREG=%r4

  BADREG=%r12

;;

*)

  echo "Please implement other architecture here"

  exit_untested

tools/testing/selftests/ir/ir_loopback.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ if [ $UID != 0 ]; then 
fi



if ! /sbin/modprobe -q -n rc-loopback; then

        echo "ir_loopback: module rc-loopback is not found [SKIP]"

        echo "ir_loopback: module rc-loopback is not found in /lib/modules/`uname -r` [SKIP]"

        exit $ksft_skip

fi