Commit 0f50767d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull Kselftest updates from Shuah Khan:

 - several patches to enhance and fix resctrl test

 - nolibc support for kselftest with an addition to vprintf() to
   tools/nolibc/stdio and related test changes

 - Refactor 'peeksiginfo' ptrace test part

 - add 'malloc' failures checks in cgroup test_memcontrol

 - a new prctl test

 - enhancements sched test with additional ore schedule prctl calls

* tag 'linux-kselftest-next-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (25 commits)
  selftests/resctrl: Fix incorrect error return on test complete
  selftests/resctrl: Remove duplicate codes that clear each test result file
  selftests/resctrl: Commonize the signal handler register/unregister for all tests
  selftests/resctrl: Cleanup properly when an error occurs in CAT test
  selftests/resctrl: Flush stdout file buffer before executing fork()
  selftests/resctrl: Return MBA check result and make it to output message
  selftests/resctrl: Fix set up schemata with 100% allocation on first run in MBM test
  selftests/resctrl: Use correct exit code when tests fail
  kselftest/arm64: Convert za-fork to use kselftest.h
  kselftest: Support nolibc
  tools/nolibc/stdio: Implement vprintf()
  selftests/resctrl: Correct get_llc_perf() param in function comment
  selftests/resctrl: Use remount_resctrlfs() consistently with boolean
  selftests/resctrl: Change name from CBM_MASK_PATH to INFO_PATH
  selftests/resctrl: Change initialize_llc_perf() return type to void
  selftests/resctrl: Replace obsolete memalign() with posix_memalign()
  selftests/resctrl: Check for return value after write_schemata()
  selftests/resctrl: Allow ->setup() to return errors
  selftests/resctrl: Move ->setup() call outside of test specific branches
  selftests/resctrl: Return NULL if malloc_and_init_memory() did not alloc mem
  ...
parents 5dfb75e8 50ad2fb7

tools/include/nolibc/stdio.h

+6 −0
Original line number Diff line number Diff line
@@ -273,6 +273,12 @@ int vfprintf(FILE *stream, const char *fmt, va_list args) 
	return written;

}



static __attribute__((unused))

int vprintf(const char *fmt, va_list args)

{

	return vfprintf(stdout, fmt, args);

}



static __attribute__((unused, format(printf, 2, 3)))

int fprintf(FILE *stream, const char *fmt, ...)

{

tools/testing/selftests/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ TARGETS += nsfs 
TARGETS += pidfd

TARGETS += pid_namespace

TARGETS += powerpc

TARGETS += prctl

TARGETS += proc

TARGETS += pstore

TARGETS += ptrace

tools/testing/selftests/amd-pstate/gitsource.sh

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ parse_gitsource() 
	printf "Gitsource-$1-#$2 power consumption(J): $en_sum\n" | tee -a $OUTFILE_GIT.result



	# Permance is the number of run gitsource per second, denoted 1/t, where 1 is the number of run gitsource in t

	# senconds. It is well known that P=E/t, where P is power measured in watts(W), E is energy measured in joules(J),

	# seconds. It is well known that P=E/t, where P is power measured in watts(W), E is energy measured in joules(J),

	# and t is time measured in seconds(s). This means that performance per watt becomes

	#        1/t     1/t     1

	#       ----- = ----- = ---
@@ -175,7 +175,7 @@ gather_gitsource() 
	printf "Gitsource-$1 avg power consumption(J): $avg_en\n" | tee -a $OUTFILE_GIT.result



	# Permance is the number of run gitsource per second, denoted 1/t, where 1 is the number of run gitsource in t

	# senconds. It is well known that P=E/t, where P is power measured in watts(W), E is energy measured in joules(J),

	# seconds. It is well known that P=E/t, where P is power measured in watts(W), E is energy measured in joules(J),

	# and t is time measured in seconds(s). This means that performance per watt becomes

	#        1/t     1/t     1

	#       ----- = ----- = ---

tools/testing/selftests/amd-pstate/run.sh

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ prerequisite() 
		if [ "$scaling_driver" != "$CURRENT_TEST" ]; then

			echo "$0 # Skipped: Test can only run on $CURRENT_TEST driver or run comparative test."

			echo "$0 # Please set X86_AMD_PSTATE enabled or run comparative test."

			echo "$0 # Current cpufreq scaling drvier is $scaling_driver."

			echo "$0 # Current cpufreq scaling driver is $scaling_driver."

			exit $ksft_skip

		fi

	else
@@ -252,7 +252,7 @@ prerequisite() 
			"tbench" | "gitsource")

				if [ "$scaling_driver" != "$COMPARATIVE_TEST" ]; then

					echo "$0 # Skipped: Comparison test can only run on $COMPARISON_TEST driver."

					echo "$0 # Current cpufreq scaling drvier is $scaling_driver."

					echo "$0 # Current cpufreq scaling driver is $scaling_driver."

					exit $ksft_skip

				fi

				;;

tools/testing/selftests/arm64/fp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ $(OUTPUT)/vec-syscfg: vec-syscfg.c $(OUTPUT)/rdvl.o 
$(OUTPUT)/vlset: vlset.c

$(OUTPUT)/za-fork: za-fork.c $(OUTPUT)/za-fork-asm.o

	$(CC) -fno-asynchronous-unwind-tables -fno-ident -s -Os -nostdlib \

		-include ../../../../include/nolibc/nolibc.h \

		-include ../../../../include/nolibc/nolibc.h -I../..\

		-static -ffreestanding -Wall $^ -o $@

$(OUTPUT)/za-ptrace: za-ptrace.c

$(OUTPUT)/za-test: za-test.S $(OUTPUT)/asm-utils.o