From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Aug 2023 01:46:47 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-next-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5a31cc7297072a7266a910ca5266b640d27803b4;p=linux.git

Merge tag 'linux-kselftest-next-6.6-rc1' of git://git./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()
  ...
---

5a31cc7297072a7266a910ca5266b640d27803b4
diff --cc tools/testing/selftests/cachestat/test_cachestat.c
index c037553cfd92c,a5a4ac8dcb76c..4804c7dc7b312
--- a/tools/testing/selftests/cachestat/test_cachestat.c
+++ b/tools/testing/selftests/cachestat/test_cachestat.c
@@@ -166,13 -147,11 +165,13 @@@ static int test_cachestat(const char *f
  	}
  
  	if (test_fsync) {
 -		if (fsync(fd)) {
 +		if (is_on_tmpfs(fd)) {
 +			ret = KSFT_SKIP;
 +		} else if (fsync(fd)) {
  			ksft_print_msg("fsync fails.\n");
 -			ret = false;
 +			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);