Merge tag 'seccomp-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2024 22:05:27 +0000 (15:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2024 22:05:27 +0000 (15:05 -0700)
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)

1  2 
tools/testing/selftests/seccomp/seccomp_benchmark.c

index 97b86980b768f4fa09da58f16d71ba42f42d2c8d,9d7aa5a730e017f24b4ce2fcdae40b923212116a..b83099160fbcaae141146795ae718a4cdbd7fa26
@@@ -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