selftests/bpf: Move ARRAY_SIZE to bpf_misc.h
Subsystems (3)
Jiri Olsa
reviewerPATCH v2 1/1 selftests/bpf: Move ARRAY_SIZE to bpf_misc.h
ARRAY_SIZE is used on multiple places, move its definition in bpf_misc.h header.
Reviewed-by Alan Maguire <[email protected]>
Signed-off-by Jiri Olsa <[email protected]>
---
v2 changes:
- wrap ARRAY_SIZE macro in ifndef/endif [Alan]
tools/testing/selftests/bpf/progs/bpf_misc.h | 4 ++++ tools/testing/selftests/bpf/progs/iters.c | 2 -- tools/testing/selftests/bpf/progs/kprobe_multi_session.c | 3 +-- tools/testing/selftests/bpf/progs/linked_list.c | 5 +---- tools/testing/selftests/bpf/progs/netif_receive_skb.c | 5 +---- tools/testing/selftests/bpf/progs/profiler.inc.h | 5 +---- tools/testing/selftests/bpf/progs/setget_sockopt.c | 5 +---- tools/testing/selftests/bpf/progs/test_bpf_ma.c | 4 ---- tools/testing/selftests/bpf/progs/test_sysctl_loop1.c | 5 +---- tools/testing/selftests/bpf/progs/test_sysctl_loop2.c | 5 +---- tools/testing/selftests/bpf/progs/test_sysctl_prog.c | 5 +---- .../testing/selftests/bpf/progs/test_tcp_custom_syncookie.c | 1 + .../testing/selftests/bpf/progs/test_tcp_custom_syncookie.h | 2 -- .../testing/selftests/bpf/progs/verifier_subprog_precision.c | 2 -- 14 files changed, 13 insertions(+), 40 deletions(-)
tools/testing/selftests/bpf/progs/bpf_misc.h +4 -0
@@ -140,4 +140,8 @@/* make it look to compiler like value is read and written */ #define __sink (expr) asm volatile("" : "+g"(expr)) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) +#endif +#endif
tools/testing/selftests/bpf/progs/iters.c +0 -2
@@ -7,8 +7,6 @@#include "bpf_misc.h" #include "bpf_compiler.h" -#define ARRAY_SIZE (x) (int)(sizeof(x) / sizeof((x)[0])) -static volatile int zero =0 ;int my_pid;
tools/testing/selftests/bpf/progs/kprobe_multi_session.c +1 -2
@@ -4,8 +4,7 @@#include <bpf/bpf_tracing.h> #include <stdbool.h> #include "bpf_kfuncs.h" - -#define ARRAY_SIZE (x) (int)(sizeof(x) / sizeof((x)[0])) +#include "bpf_misc.h" char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/linked_list.c +1 -4
@@ -4,10 +4,7 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_core_read.h> #include "bpf_experimental.h" - -#ifndef ARRAY_SIZE -#define ARRAY_SIZE (x) (int)(sizeof(x) / sizeof((x)[0])) -#endif +#include "bpf_misc.h" #include "linked_list.h"
tools/testing/selftests/bpf/progs/netif_receive_skb.c +1 -4
@@ -5,6 +5,7 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include <bpf/bpf_core_read.h> +#include "bpf_misc.h" #include <errno.h>
@@ -23,10 +24,6 @@ bool skip = false;#define BADPTR 0#endif -#ifndef ARRAY_SIZE -#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) -#endif -struct { __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); __uint(max_entries, 1);
tools/testing/selftests/bpf/progs/profiler.inc.h +1 -4
@@ -9,6 +9,7 @@#include "err.h" #include "bpf_experimental.h" #include "bpf_compiler.h" +#include "bpf_misc.h" #ifndef NULL #define NULL 0
@@ -133,10 +134,6 @@ struct {__uint (max_entries,16 ); } disallowed_exec_inodes SEC(".maps"); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE (arr) (int)(sizeof(arr) / sizeof(arr[0])) -#endif - static INLINE bool IS_ERR(const void* ptr) {return IS_ERR_VALUE ((unsigned long )ptr);
tools/testing/selftests/bpf/progs/setget_sockopt.c +1 -4
@@ -6,10 +6,7 @@#include <bpf/bpf_core_read.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> - -#ifndef ARRAY_SIZE -#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) -#endif +#include "bpf_misc.h" extern unsigned long CONFIG_HZ __kconfig;
tools/testing/selftests/bpf/progs/test_bpf_ma.c +0 -4
@@ -7,10 +7,6 @@#include "bpf_experimental.h" #include "bpf_misc.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) -#endif -struct generic_map_value {void *data; };
tools/testing/selftests/bpf/progs/test_sysctl_loop1.c +1 -4
@@ -10,10 +10,7 @@#include <bpf/bpf_helpers.h> #include "bpf_compiler.h" - -#ifndef ARRAY_SIZE -#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) -#endif +#include "bpf_misc.h" /* tcp_mem sysctl has only 3 ints, but this test is doing TCP_MEM_LOOPS */ #define TCP_MEM_LOOPS 28/* because 30 doesn't fit into 512 bytes of stack */
tools/testing/selftests/bpf/progs/test_sysctl_loop2.c +1 -4
@@ -10,10 +10,7 @@#include <bpf/bpf_helpers.h> #include "bpf_compiler.h" - -#ifndef ARRAY_SIZE -#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) -#endif +#include "bpf_misc.h" /* tcp_mem sysctl has only 3 ints, but this test is doing TCP_MEM_LOOPS */ #define TCP_MEM_LOOPS 20/* because 30 doesn't fit into 512 bytes of stack */
tools/testing/selftests/bpf/progs/test_sysctl_prog.c +1 -4
@@ -10,6 +10,7 @@#include <bpf/bpf_helpers.h> #include "bpf_compiler.h" +#include "bpf_misc.h" /* Max supported length of a string with unsigned long in base 10 (pow2 - 1). */ #define MAX_ULONG_STR_LEN 0xF
@@ -17,10 +18,6 @@/* Max supported length of sysctl value string (pow2). */ #define MAX_VALUE_STR_LEN 0x40 -#ifndef ARRAY_SIZE -#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) -#endif -const char tcp_mem_name[] ="net/ipv4/tcp_mem" ; static __always_inline int is_tcp_mem(struct bpf_sysctl *ctx) {
tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c +1 -0
@@ -9,6 +9,7 @@#include "bpf_kfuncs.h" #include "test_siphash.h" #include "test_tcp_custom_syncookie.h" +#include "bpf_misc.h" #define MAX_PACKET_OFF 0xffff
tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.h +0 -2
@@ -7,8 +7,6 @@#define __packed __attribute__((__packed__))#define __force -#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0])) -#define swap (a, b) \ do { \ typeof(a) __tmp = (a); \
tools/testing/selftests/bpf/progs/verifier_subprog_precision.c +0 -2
@@ -8,8 +8,6 @@#include "bpf_misc.h" #include <../../../tools/include/linux/filter.h> -#define ARRAY_SIZE (x) (sizeof(x) / sizeof(x[0])) - int vals[] SEC(".data.vals") = {1, 2, 3, 4};__naked __noinline__used
Signature · 1 line
2.45.2
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 10 lines · On Wed, 26 Jun 2024 15:47:19 +0200 you wrote:
ARRAY_SIZEis used on multiple places, move its definition inbpf_misc.hheader.Reviewed-by Alan Maguire <[email protected]>Signed-off-by Jiri Olsa <[email protected]>---
v2 changes:
- wrapARRAY_SIZEmacro in ifndef/endif [Alan][...]
Here is the summary with links:
- [PATCHv2,bpf-next] selftests/bpf: Move ARRAY_SIZE to bpf_misc.h
https://git.kernel.org/bpf/bpf-next/c/a12978712d90
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html