selftests: bpf: Replace sizeof(arr)/sizeof(arr[0]) with ARRAY_SIZE
The ARRAY_SIZE macro is more compact and more formal in linux source. Signed-off-by: Feng Yang <yangfeng@kylinos.cn> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20240903072559.292607-1-yangfeng59949@163.com
This commit is contained in:
parent
6fee7a7e9a
commit
23457b37ec
@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/* Copyright (c) 2019 Facebook */
|
||||
#include <test_progs.h>
|
||||
#include "bpf_util.h"
|
||||
|
||||
void serial_test_fexit_stress(void)
|
||||
{
|
||||
@ -36,7 +37,7 @@ void serial_test_fexit_stress(void)
|
||||
for (i = 0; i < bpf_max_tramp_links; i++) {
|
||||
fexit_fd[i] = bpf_prog_load(BPF_PROG_TYPE_TRACING, NULL, "GPL",
|
||||
trace_program,
|
||||
sizeof(trace_program) / sizeof(struct bpf_insn),
|
||||
ARRAY_SIZE(trace_program),
|
||||
&trace_opts);
|
||||
if (!ASSERT_GE(fexit_fd[i], 0, "fexit load"))
|
||||
goto out;
|
||||
|
@ -5,6 +5,7 @@
|
||||
#include <bpf/btf.h>
|
||||
|
||||
#include "test_log_buf.skel.h"
|
||||
#include "bpf_util.h"
|
||||
|
||||
static size_t libbpf_log_pos;
|
||||
static char libbpf_log_buf[1024 * 1024];
|
||||
@ -143,11 +144,11 @@ static void bpf_prog_load_log_buf(void)
|
||||
BPF_MOV64_IMM(BPF_REG_0, 0),
|
||||
BPF_EXIT_INSN(),
|
||||
};
|
||||
const size_t good_prog_insn_cnt = sizeof(good_prog_insns) / sizeof(struct bpf_insn);
|
||||
const size_t good_prog_insn_cnt = ARRAY_SIZE(good_prog_insns);
|
||||
const struct bpf_insn bad_prog_insns[] = {
|
||||
BPF_EXIT_INSN(),
|
||||
};
|
||||
size_t bad_prog_insn_cnt = sizeof(bad_prog_insns) / sizeof(struct bpf_insn);
|
||||
size_t bad_prog_insn_cnt = ARRAY_SIZE(bad_prog_insns);
|
||||
LIBBPF_OPTS(bpf_prog_load_opts, opts);
|
||||
const size_t log_buf_sz = 1024 * 1024;
|
||||
char *log_buf;
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include <bpf/btf.h>
|
||||
#include "bpf/libbpf_internal.h"
|
||||
#include "cgroup_helpers.h"
|
||||
#include "bpf_util.h"
|
||||
|
||||
static const char *module_name = "bpf_testmod";
|
||||
static const char *symbol_name = "bpf_fentry_shadow_test";
|
||||
@ -100,7 +101,7 @@ void test_module_fentry_shadow(void)
|
||||
load_opts.attach_btf_obj_fd = btf_fd[i];
|
||||
prog_fd[i] = bpf_prog_load(BPF_PROG_TYPE_TRACING, NULL, "GPL",
|
||||
trace_program,
|
||||
sizeof(trace_program) / sizeof(struct bpf_insn),
|
||||
ARRAY_SIZE(trace_program),
|
||||
&load_opts);
|
||||
if (!ASSERT_GE(prog_fd[i], 0, "bpf_prog_load"))
|
||||
goto out;
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
#include <test_progs.h>
|
||||
#include <linux/nbd.h>
|
||||
#include "bpf_util.h"
|
||||
|
||||
void test_raw_tp_writable_reject_nbd_invalid(void)
|
||||
{
|
||||
@ -25,7 +26,7 @@ void test_raw_tp_writable_reject_nbd_invalid(void)
|
||||
);
|
||||
|
||||
bpf_fd = bpf_prog_load(BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE, NULL, "GPL v2",
|
||||
program, sizeof(program) / sizeof(struct bpf_insn),
|
||||
program, ARRAY_SIZE(program),
|
||||
&opts);
|
||||
if (CHECK(bpf_fd < 0, "bpf_raw_tracepoint_writable load",
|
||||
"failed: %d errno %d\n", bpf_fd, errno))
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
#include <test_progs.h>
|
||||
#include <linux/nbd.h>
|
||||
#include "bpf_util.h"
|
||||
|
||||
/* NOTE: conflict with other tests. */
|
||||
void serial_test_raw_tp_writable_test_run(void)
|
||||
@ -24,7 +25,7 @@ void serial_test_raw_tp_writable_test_run(void)
|
||||
);
|
||||
|
||||
int bpf_fd = bpf_prog_load(BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE, NULL, "GPL v2",
|
||||
trace_program, sizeof(trace_program) / sizeof(struct bpf_insn),
|
||||
trace_program, ARRAY_SIZE(trace_program),
|
||||
&trace_opts);
|
||||
if (CHECK(bpf_fd < 0, "bpf_raw_tracepoint_writable loaded",
|
||||
"failed: %d errno %d\n", bpf_fd, errno))
|
||||
@ -41,7 +42,7 @@ void serial_test_raw_tp_writable_test_run(void)
|
||||
);
|
||||
|
||||
int filter_fd = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, NULL, "GPL v2",
|
||||
skb_program, sizeof(skb_program) / sizeof(struct bpf_insn),
|
||||
skb_program, ARRAY_SIZE(skb_program),
|
||||
&skb_opts);
|
||||
if (CHECK(filter_fd < 0, "test_program_loaded", "failed: %d errno %d\n",
|
||||
filter_fd, errno))
|
||||
|
@ -2384,7 +2384,7 @@ static int generate_dummy_prog(void)
|
||||
BPF_MOV64_IMM(BPF_REG_0, 0),
|
||||
BPF_EXIT_INSN(),
|
||||
};
|
||||
const size_t prog_insn_cnt = sizeof(prog_insns) / sizeof(struct bpf_insn);
|
||||
const size_t prog_insn_cnt = ARRAY_SIZE(prog_insns);
|
||||
LIBBPF_OPTS(bpf_prog_load_opts, opts);
|
||||
const size_t log_buf_sz = 256;
|
||||
char log_buf[log_buf_sz];
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include "test_unpriv_bpf_disabled.skel.h"
|
||||
|
||||
#include "cap_helpers.h"
|
||||
#include "bpf_util.h"
|
||||
|
||||
/* Using CAP_LAST_CAP is risky here, since it can get pulled in from
|
||||
* an old /usr/include/linux/capability.h and be < CAP_BPF; as a result
|
||||
@ -146,7 +147,7 @@ static void test_unpriv_bpf_disabled_negative(struct test_unpriv_bpf_disabled *s
|
||||
BPF_MOV64_IMM(BPF_REG_0, 0),
|
||||
BPF_EXIT_INSN(),
|
||||
};
|
||||
const size_t prog_insn_cnt = sizeof(prog_insns) / sizeof(struct bpf_insn);
|
||||
const size_t prog_insn_cnt = ARRAY_SIZE(prog_insns);
|
||||
LIBBPF_OPTS(bpf_prog_load_opts, load_opts);
|
||||
struct bpf_map_info map_info = {};
|
||||
__u32 map_info_len = sizeof(map_info);
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include <linux/btf.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include "bpf_misc.h"
|
||||
|
||||
char _license[] SEC("license") = "GPL";
|
||||
|
||||
@ -119,7 +120,7 @@ int load_prog(struct args *ctx)
|
||||
static __u64 value = 34;
|
||||
static union bpf_attr prog_load_attr = {
|
||||
.prog_type = BPF_PROG_TYPE_XDP,
|
||||
.insn_cnt = sizeof(insns) / sizeof(insns[0]),
|
||||
.insn_cnt = ARRAY_SIZE(insns),
|
||||
};
|
||||
int ret;
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include <linux/ptrace.h>
|
||||
#include <linux/bpf.h>
|
||||
#include <bpf/bpf_helpers.h>
|
||||
#include "bpf_misc.h"
|
||||
|
||||
const struct {
|
||||
unsigned a[4];
|
||||
@ -64,7 +65,7 @@ int full_loop(struct pt_regs *ctx)
|
||||
{
|
||||
/* prevent compiler to optimize everything out */
|
||||
unsigned * volatile p = (void *)&rdonly_values.a;
|
||||
int i = sizeof(rdonly_values.a) / sizeof(rdonly_values.a[0]);
|
||||
int i = ARRAY_SIZE(rdonly_values.a);
|
||||
unsigned iters = 0, sum = 0;
|
||||
|
||||
/* validate verifier can allow full loop as well */
|
||||
|
@ -87,7 +87,7 @@ int bits_memalloc(void)
|
||||
int *bit;
|
||||
|
||||
__builtin_memset(&data, 0xf0, sizeof(data)); /* 4 * 16 */
|
||||
bpf_for_each(bits, bit, &data[0], sizeof(data) / sizeof(u64))
|
||||
bpf_for_each(bits, bit, &data[0], ARRAY_SIZE(data))
|
||||
nr++;
|
||||
return nr;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user