From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Mar 2024 22:05:27 +0000 (-0700)
Subject: Merge tag 'seccomp-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: for-linus-6.9~361
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7f1a2774098bfdc54f9c94901665ddd81ecbb3cc;p=users%2Fdwmw2%2Flinux.git

Merge tag 'seccomp-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull seccomp updates from Kees Cook:
 "There are no core kernel changes here; it's entirely selftests and
  samples:

   - Improve reliability of selftests (Terry Tritton, Kees Cook)

   - Fix strict-aliasing warning in samples (Arnd Bergmann)"

* tag 'seccomp-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  samples: user-trap: fix strict-aliasing warning
  selftests/seccomp: Pin benchmark to single CPU
  selftests/seccomp: user_notification_addfd check nextfd is available
  selftests/seccomp: Change the syscall used in KILL_THREAD test
  selftests/seccomp: Handle EINVAL on unshare(CLONE_NEWPID)
---

7f1a2774098bfdc54f9c94901665ddd81ecbb3cc
diff --cc tools/testing/selftests/seccomp/seccomp_benchmark.c
index 97b86980b768f,9d7aa5a730e01..b83099160fbca
--- a/tools/testing/selftests/seccomp/seccomp_benchmark.c
+++ b/tools/testing/selftests/seccomp/seccomp_benchmark.c
@@@ -158,20 -177,16 +190,22 @@@ int main(int argc, char *argv[]
  
  	setbuf(stdout, NULL);
  
 -	printf("Running on:\n");
 +	ksft_print_header();
 +	ksft_set_plan(7);
 +
 +	ksft_print_msg("Running on:\n");
 +	ksft_print_msg("");
  	system("uname -a");
  
 -	printf("Current BPF sysctl settings:\n");
 +	ksft_print_msg("Current BPF sysctl settings:\n");
  	/* Avoid using "sysctl" which may not be installed. */
 +	ksft_print_msg("");
  	system("grep -H . /proc/sys/net/core/bpf_jit_enable");
 +	ksft_print_msg("");
  	system("grep -H . /proc/sys/net/core/bpf_jit_harden");
  
+ 	affinity();
+ 
  	if (argc > 1)
  		samples = strtoull(argv[1], NULL, 0);
  	else