Commit 23457b37 authored by Feng Yang's avatar Feng Yang Committed by Andrii Nakryiko
Browse files

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: default avatarFeng Yang <yangfeng@kylinos.cn>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240903072559.292607-1-yangfeng59949@163.com
parent 6fee7a7e

tools/testing/selftests/bpf/prog_tests/fexit_stress.c

+2 −1
Original line number Diff line number Diff line 
// 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;

tools/testing/selftests/bpf/prog_tests/log_buf.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

tools/testing/selftests/bpf/prog_tests/raw_tp_writable_reject_nbd_invalid.c

+2 −1
Original line number Diff line number Diff line
@@ -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))

tools/testing/selftests/bpf/prog_tests/raw_tp_writable_test_run.c

+3 −2
Original line number Diff line number Diff line
@@ -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))