Commit 4369b3ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull Kselftest update from Shuah Khan:
 "Fixes to build errors, false negatives, and several code cleanups,
  including the ARRAY_SIZE cleanup that removes 25+ duplicates
  ARRAY_SIZE defines from individual tests"

* tag 'linux-kselftest-next-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/vm: remove ARRAY_SIZE define from individual tests
  selftests/timens: remove ARRAY_SIZE define from individual tests
  selftests/sparc64: remove ARRAY_SIZE define from adi-test
  selftests/seccomp: remove ARRAY_SIZE define from seccomp_benchmark
  selftests/rseq: remove ARRAY_SIZE define from individual tests
  selftests/net: remove ARRAY_SIZE define from individual tests
  selftests/landlock: remove ARRAY_SIZE define from common.h
  selftests/ir: remove ARRAY_SIZE define from ir_loopback.c
  selftests/core: remove ARRAY_SIZE define from close_range_test.c
  selftests/cgroup: remove ARRAY_SIZE define from cgroup_util.h
  selftests/arm64: remove ARRAY_SIZE define from vec-syscfg.c
  tools: fix ARRAY_SIZE defines in tools and selftests hdrs
  selftests: cgroup: build error multiple outpt files
  selftests/move_mount_set_group remove unneeded conversion to bool
  selftests/mount: remove unneeded conversion to bool
  selftests: harness: avoid false negatives if test has no ASSERTs
  selftests/ftrace: make kprobe profile testcase description unique
  selftests: clone3: clone3: add case CLONE3_ARGS_NO_TEST
  selftests: timers: Remove unneeded semicolon
  kselftests: timers:Remove unneeded semicolon
parents ca1a46d6 e8990820

tools/include/linux/kernel.h

+2 −0
Original line number Diff line number Diff line
@@ -92,7 +92,9 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); 
int scnprintf(char * buf, size_t size, const char * fmt, ...);

int scnprintf_pad(char * buf, size_t size, const char * fmt, ...);



#ifndef ARRAY_SIZE

#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))

#endif



#define current_gfp_context(k) 0

#define synchronize_rcu()

tools/testing/selftests/arm64/fp/vec-syscfg.c

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include "../../kselftest.h"

#include "rdvl.h"



#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))



#define ARCH_MIN_VL SVE_VL_MIN



struct vec_data {

tools/testing/selftests/cgroup/Makefile

+7 −5
Original line number Diff line number Diff line
@@ -11,10 +11,12 @@ TEST_GEN_PROGS += test_core 
TEST_GEN_PROGS += test_freezer

TEST_GEN_PROGS += test_kill



LOCAL_HDRS += $(selfdir)/clone3/clone3_selftests.h $(selfdir)/pidfd/pidfd.h



include ../lib.mk



$(OUTPUT)/test_memcontrol: cgroup_util.c ../clone3/clone3_selftests.h

$(OUTPUT)/test_kmem: cgroup_util.c ../clone3/clone3_selftests.h

$(OUTPUT)/test_core: cgroup_util.c ../clone3/clone3_selftests.h

$(OUTPUT)/test_freezer: cgroup_util.c ../clone3/clone3_selftests.h

$(OUTPUT)/test_kill: cgroup_util.c ../clone3/clone3_selftests.h ../pidfd/pidfd.h
 
$(OUTPUT)/test_memcontrol: cgroup_util.c

$(OUTPUT)/test_kmem: cgroup_util.c

$(OUTPUT)/test_core: cgroup_util.c

$(OUTPUT)/test_freezer: cgroup_util.c

$(OUTPUT)/test_kill: cgroup_util.c

tools/testing/selftests/cgroup/cgroup_util.h

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
#include <stdbool.h>

#include <stdlib.h>



#define PAGE_SIZE 4096

#include "../kselftest.h"



#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

#define PAGE_SIZE 4096



#define MB(x) (x << 20)

tools/testing/selftests/clone3/clone3.c

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mode) 
		size = sizeof(struct __clone_args);



	switch (test_mode) {

	case CLONE3_ARGS_NO_TEST:

		/*

		 * Uses default 'flags' and 'SIGCHLD'

		 * assignment.

		 */

		break;

	case CLONE3_ARGS_ALL_0:

		args.flags = 0;

		args.exit_signal = 0;