Skip to content

selftests: Remove ARRAY_SIZE duplicate defines

Shuah Khan linux-kselftest linux-mm linux-security-module netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest12 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/12tools: fix ARRAY_SIZE defines in tools and selftests hdrstools/include/linux/kernel.h tools/testing/selftests/kselftest.h tools/testing/selftests/kselftest_harness.h+8 -01 reply
2/12selftests/arm64: remove ARRAY_SIZE define from vec-syscfg.ctools/testing/selftests/arm64/fp/vec-syscfg.c+0 -21 reply
3/12selftests/cgroup: remove ARRAY_SIZE define from cgroup_util.htools/testing/selftests/cgroup/cgroup_util.h+2 -20 replies
4/12selftests/core: remove ARRAY_SIZE define from close_range_test.ctools/testing/selftests/core/close_range_test.c+0 -40 replies
5/12selftests/ir: remove ARRAY_SIZE define from ir_loopback.ctools/testing/selftests/ir/ir_loopback.c+0 -10 replies
6/12selftests/landlock: remove ARRAY_SIZE define from common.htools/testing/selftests/landlock/common.h+0 -41 reply
7/12selftests/net: remove ARRAY_SIZE define from individual teststools/testing/selftests/net/gro.c tools/testing/selftests/net/ipsec.c tools/testing/selftests/net/reuseport_bpf.c +3 more+8 -111 reply
8/12selftests/rseq: remove ARRAY_SIZE define from individual teststools/testing/selftests/rseq/basic_percpu_ops_test.c tools/testing/selftests/rseq/rseq.c+2 -40 replies
9/12selftests/seccomp: remove ARRAY_SIZE define from seccomp_benchmarktools/testing/selftests/seccomp/seccomp_benchmark.c+1 -11 reply
10/12selftests/sparc64: remove ARRAY_SIZE define from adi-testtools/testing/selftests/sparc64/drivers/adi-test.c+0 -40 replies
11/12selftests/timens: remove ARRAY_SIZE define from individual teststools/testing/selftests/timens/procfs.c tools/testing/selftests/timens/timens.c+0 -40 replies
12/12selftests/vm: remove ARRAY_SIZE define from individual teststools/testing/selftests/vm/mremap_test.c tools/testing/selftests/vm/pkey-helpers.h tools/testing/selftests/vm/va_128TBswitch.c+3 -30 replies

Reviews trailers per patch

5 of 12 patches have a Reviewed-by or Acked-by.

PatchJakub KicinskiMickaël SalaünWill DeaconKees Cook
1/12R-b
2/12A-b
3/12
4/12
5/12
6/12A-b
7/12A-b
8/12
9/12R-b
10/12
11/12
12/12

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v1 thread

Cover letter [PATCH 00/12] selftests: Remove ARRAY_SIZE duplicate defines

ARRAY_SIZE is defined in several selftests. There are about 25+ duplicate defines in various selftests source and header files. This patch series removes the duplicated defines.

Several tests that define ARRAY_SIZE also include kselftest.h or kselftest_harness.h. Remove ARRAY_SIZE defines from them.

Some tests that define ARRAY_SIZE don't include headers that define it. Remove ARRAY_SIZE define and include kselftest.h

The first patch in this series:

- Adds ARRAY_SIZE define to kselftest.h
- Adds ifndef guard around ARRAY_SIZE define in tools/include/linux/kernel.h and kselftest_harness.h
- Patches 2-12 do the cleanup and depend on patch 1, hence will have to go through kselftest tree.

Shuah Khan (12):
tools: fix ARRAY_SIZE defines in tools and selftests hdrs selftests/arm64: remove ARRAY_SIZE define from vec-syscfg.c selftests/cgroup: remove ARRAY_SIZE define from cgroup_util.h selftests/core: remove ARRAY_SIZE define from close_range_test.c selftests/ir: remove ARRAY_SIZE define from ir_loopback.c selftests/landlock: remove ARRAY_SIZE define from common.h selftests/net: remove ARRAY_SIZE define from individual tests selftests/rseq: remove ARRAY_SIZE define from individual tests selftests/seccomp: remove ARRAY_SIZE define from seccomp_benchmark selftests/sparc64: remove ARRAY_SIZE define from adi-test selftests/timens: remove ARRAY_SIZE define from individual tests selftests/vm: remove ARRAY_SIZE define from individual tests

 tools/include/linux/kernel.h                          | 2 ++
 tools/testing/selftests/arm64/fp/vec-syscfg.c         | 2 --
 tools/testing/selftests/cgroup/cgroup_util.h          | 4 ++--
 tools/testing/selftests/core/close_range_test.c       | 4 ----
 tools/testing/selftests/ir/ir_loopback.c              | 1 -
 tools/testing/selftests/kselftest.h                   | 4 ++++
 tools/testing/selftests/kselftest_harness.h           | 2 ++
 tools/testing/selftests/landlock/common.h             | 4 ----
 tools/testing/selftests/net/gro.c                     | 3 ++-
 tools/testing/selftests/net/ipsec.c                   | 1 -
 tools/testing/selftests/net/reuseport_bpf.c           | 4 +---
 tools/testing/selftests/net/rxtimestamp.c             | 2 +-
 tools/testing/selftests/net/socket.c                  | 3 ++-
 tools/testing/selftests/net/tcp_fastopen_backup_key.c | 6 ++----
 tools/testing/selftests/rseq/basic_percpu_ops_test.c  | 3 +--
 tools/testing/selftests/rseq/rseq.c                   | 3 +--
 tools/testing/selftests/seccomp/seccomp_benchmark.c   | 2 +-
 tools/testing/selftests/sparc64/drivers/adi-test.c    | 4 ----
 tools/testing/selftests/timens/procfs.c               | 2 --
 tools/testing/selftests/timens/timens.c               | 2 --
 tools/testing/selftests/vm/mremap_test.c              | 1 -
 tools/testing/selftests/vm/pkey-helpers.h             | 3 ++-
 tools/testing/selftests/vm/va_128TBswitch.c           | 2 +-
 23 files changed, 24 insertions(+), 40 deletions(-)
Signature · 1 line
2.32.0