Commit 5a31cc72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull Kselftest updates from Shuah Khan:
 "A mix of fixes, enhancements, and new tests. Bulk of the changes
  enhance and fix rseq and resctrl tests.

  In addition, user_events, dmabuf-heaps and perf_events are added to
  default kselftest build and test coverage. A futex test fix, enhance
  prctl test coverage, and minor fixes are included in this update"

* tag 'linux-kselftest-next-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (32 commits)
  selftests: cachestat: use proper syscall number macro
  selftests: cachestat: properly link in librt
  selftests/futex: Order calls to futex_lock_pi
  selftests: Hook more tests into the build infrastructure
  selftests/user_events: Reenable build
  selftests/filesystems: Add six consecutive 'x' characters to mktemp
  selftests/rseq: Use rseq_unqual_scalar_typeof in macros
  selftests/rseq: Fix arm64 buggy load-acquire/store-release macros
  selftests/rseq: Implement rseq_unqual_scalar_typeof
  selftests/rseq: Fix CID_ID typo in Makefile
  selftests:prctl: add set-process-name to .gitignore
  selftests:prctl: Fix make clean override warning
  selftests/resctrl: Remove test type checks from cat_val()
  selftests/resctrl: Pass the real number of tests to show_cache_info()
  selftests/resctrl: Move CAT/CMT test global vars to function they are used in
  selftests/resctrl: Don't use variable argument list for ->setup()
  selftests/resctrl: Don't pass test name to fill_buf
  selftests/resctrl: Improve parameter consistency in fill_buf
  selftests/resctrl: Remove unnecessary startptr global from fill_buf
  selftests/resctrl: Remove "malloc_and_init_memory" param from run_fill_buf()
  ...
parents 36534782 9b1db732

tools/testing/selftests/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ TARGETS += core 
TARGETS += cpufreq

TARGETS += cpu-hotplug

TARGETS += damon

TARGETS += dmabuf-heaps

TARGETS += drivers/dma-buf

TARGETS += drivers/s390x/uvdevice

TARGETS += drivers/net/bonding
@@ -57,6 +58,7 @@ TARGETS += net/mptcp 
TARGETS += net/openvswitch

TARGETS += netfilter

TARGETS += nsfs

TARGETS += perf_events

TARGETS += pidfd

TARGETS += pid_namespace

TARGETS += powerpc
@@ -89,7 +91,9 @@ endif 
TARGETS += tmpfs

TARGETS += tpm2

TARGETS += tty

TARGETS += uevents

TARGETS += user

TARGETS += user_events

TARGETS += vDSO

TARGETS += mm

TARGETS += x86

tools/testing/selftests/cachestat/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ TEST_GEN_PROGS := test_cachestat 


CFLAGS += $(KHDR_INCLUDES)

CFLAGS += -Wall

CFLAGS += -lrt

LDLIBS += -lrt



include ../lib.mk

tools/testing/selftests/cachestat/test_cachestat.c

+3 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ static const char * const dev_files[] = { 
	"/dev/zero", "/dev/null", "/dev/urandom",

	"/proc/version", "/proc"

};

static const int cachestat_nr = 451;



void print_cachestat(struct cachestat *cs)

{
@@ -144,7 +143,7 @@ static int test_cachestat(const char *filename, bool write_random, bool create, 
		}

	}



	syscall_ret = syscall(cachestat_nr, fd, &cs_range, &cs, 0);

	syscall_ret = syscall(__NR_cachestat, fd, &cs_range, &cs, 0);



	ksft_print_msg("Cachestat call returned %ld\n", syscall_ret);
@@ -172,7 +171,7 @@ static int test_cachestat(const char *filename, bool write_random, bool create, 
			ksft_print_msg("fsync fails.\n");

			ret = KSFT_FAIL;

		} else {

			syscall_ret = syscall(cachestat_nr, fd, &cs_range, &cs, 0);

			syscall_ret = syscall(__NR_cachestat, fd, &cs_range, &cs, 0);



			ksft_print_msg("Cachestat call (after fsync) returned %ld\n",

				syscall_ret);
@@ -233,7 +232,7 @@ bool test_cachestat_shmem(void) 
		goto close_fd;

	}



	syscall_ret = syscall(cachestat_nr, fd, &cs_range, &cs, 0);

	syscall_ret = syscall(__NR_cachestat, fd, &cs_range, &cs, 0);



	if (syscall_ret) {

		ksft_print_msg("Cachestat returned non-zero.\n");

tools/testing/selftests/filesystems/fat/run_fat_tests.sh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ set -u 
set -o pipefail



BASE_DIR="$(dirname $0)"

TMP_DIR="$(mktemp -d /tmp/fat_tests_tmp.XXXX)"

TMP_DIR="$(mktemp -d /tmp/fat_tests_tmp.XXXXXX)"

IMG_PATH="${TMP_DIR}/fat.img"

MNT_PATH="${TMP_DIR}/mnt"

tools/testing/selftests/futex/functional/futex_wait_timeout.c

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


static long timeout_ns = 100000;	/* 100us default timeout */

static futex_t futex_pi;

static pthread_barrier_t barrier;



void usage(char *prog)

{
@@ -48,6 +49,8 @@ void *get_pi_lock(void *arg) 
	if (ret != 0)

		error("futex_lock_pi failed\n", ret);



	pthread_barrier_wait(&barrier);



	/* Blocks forever */

	ret = futex_wait(&lock, 0, NULL, 0);

	error("futex_wait failed\n", ret);
@@ -130,6 +133,7 @@ int main(int argc, char *argv[]) 
	       basename(argv[0]));

	ksft_print_msg("\tArguments: timeout=%ldns\n", timeout_ns);



	pthread_barrier_init(&barrier, NULL, 2);

	pthread_create(&thread, NULL, get_pi_lock, NULL);



	/* initialize relative timeout */
@@ -163,6 +167,9 @@ int main(int argc, char *argv[]) 
	res = futex_wait_requeue_pi(&f1, f1, &futex_pi, &to, 0);

	test_timeout(res, &ret, "futex_wait_requeue_pi monotonic", ETIMEDOUT);



	/* Wait until the other thread calls futex_lock_pi() */

	pthread_barrier_wait(&barrier);

	pthread_barrier_destroy(&barrier);

	/*

	 * FUTEX_LOCK_PI with CLOCK_REALTIME

	 * Due to historical reasons, FUTEX_LOCK_PI supports only realtime