selftests/bpf: Use ARRAY_SIZE for array length
Subsystems (3)
PATCH v2 1/1 selftests/bpf: Use ARRAY_SIZE for array length
Use of macro ARRAY_SIZE to calculate array size minimizes the redundant code and improves code reusability.
./tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c:98:34-35: WARNING: Use ARRAY_SIZE. ./tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c:93:29-30: WARNING: Use ARRAY_SIZE. ./tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c:101:34-35: WARNING: Use ARRAY_SIZE.
---
Changes in v2:
-Modify the header file "kselftest.h" to "linux/kernel.h".
tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c +4 -3
@@ -7,6 +7,7 @@#include <sys/syscall.h> #include <bpf/libbpf.h> #include <bpf/btf.h> +#include <linux/kernel.h> #include "test_progs.h" #include "test_btf.h"
@@ -90,15 +91,15 @@ static void test_bad_local_id(void) attr.prog_type =BPF_TRACE_RAW_TP ; attr.license = (__u64 )"GPL" ; attr.insns = (__u64)&insns; - attr.insn_cnt =sizeof (insns) /sizeof (*insns); + attr.insn_cnt =ARRAY_SIZE (insns); attr.log_buf = (__u64 )log; attr.log_size =sizeof (log); attr.log_level = log_level; attr.func_info = (__u64 )funcs; - attr.func_info_cnt =sizeof (funcs) /sizeof (*funcs); + attr.func_info_cnt =ARRAY_SIZE (funcs); attr.func_info_rec_size =sizeof (*funcs); attr.core_relos = (__u64 )relos; - attr.core_relo_cnt =sizeof (relos) /sizeof (*relos); + attr.core_relo_cnt =ARRAY_SIZE (relos); attr.core_relo_rec_size =sizeof (*relos); prog_fd =sys_bpf_prog_load (&attr,sizeof (attr),1 ); saved_errno = errno;
Signature · 1 line
2.32.0.3.g01195cf9f
Quoted 22 lines · Jiapeng Chong
Use of macro
ARRAY_SIZEto calculate array size minimizes the redundant code and improves code reusability../tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c:98:34-35: WARNING: Use
ARRAY_SIZE. ./tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c:93:29-30: WARNING: UseARRAY_SIZE. ./tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c:101:34-35: WARNING: UseARRAY_SIZE.Reported-by Abaci Robot <[email protected]>Signed-off-by Jiapeng Chong <[email protected]>---
Changes in v2:
-Modify the header file "kselftest.h" to "linux/kernel.h".tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c +0
-0
tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c line 10
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c +1
-0@@ -7,6 +7,7 @@#include <sys/syscall.h> #include <bpf/libbpf.h> #include <bpf/btf.h> +#include <linux/kernel.h>
Hi Jiapeng,
I don't believe adding this header is needed, since ARRAY_SIZE is defined in bpf_utils.h and already pulled in by test_progs.h below. Maybe try without "#include <linux/kernel.h"> to check?
Take care,
Tony
Quoted 25 lines
tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c +3
-3#include "test_progs.h" #include "test_btf.h" @@ -90,15 +91,15 @@ static void test_bad_local_id(void) attr.prog_type =BPF_TRACE_RAW_TP ; attr.license = (__u64 )"GPL" ; attr.insns = (__u64)&insns; - attr.insn_cnt =sizeof (insns) /sizeof (*insns); + attr.insn_cnt =ARRAY_SIZE (insns); attr.log_buf = (__u64 )log; attr.log_size =sizeof (log); attr.log_level = log_level; attr.func_info = (__u64 )funcs; - attr.func_info_cnt =sizeof (funcs) /sizeof (*funcs); + attr.func_info_cnt =ARRAY_SIZE (funcs); attr.func_info_rec_size =sizeof (*funcs); attr.core_relos = (__u64 )relos; - attr.core_relo_cnt =sizeof (relos) /sizeof (*relos); + attr.core_relo_cnt =ARRAY_SIZE (relos); attr.core_relo_rec_size =sizeof (*relos); prog_fd =sys_bpf_prog_load (&attr,sizeof (attr),1 ); saved_errno = errno;Signature · 1 line
2.32.0.3.g01195cf9f