Commit 1456ddcc authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'selftests/bpf: make BPF_CFLAGS stricter with -Wall' 



Andrii Nakryiko says:

====================

Make BPF-side compiler flags stricter by adding -Wall. Fix tons of small
issues pointed out by compiler immediately after that. That includes newly
added bpf_for(), bpf_for_each(), and bpf_repeat() macros.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 63d78b7e 3d5a55dd

tools/testing/selftests/bpf/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -352,12 +352,12 @@ CLANG_TARGET_ARCH = --target=$(notdir $(CROSS_COMPILE:%-=%)) 
endif



CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH))

BPF_CFLAGS = -g -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) 		\

BPF_CFLAGS = -g -Wall -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN)	\

	     -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR)			\

	     -I$(abspath $(OUTPUT)/../usr/include)



CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \

	       -Wno-compare-distinct-pointer-types -Wuninitialized

	       -Wno-compare-distinct-pointer-types



$(OUTPUT)/test_l4lb_noinline.o: BPF_CFLAGS += -fno-inline

$(OUTPUT)/test_xdp_noinline.o: BPF_CFLAGS += -fno-inline

tools/testing/selftests/bpf/progs/bpf_iter_ksym.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ int dump_ksym(struct bpf_iter__ksym *ctx) 
	__u32 seq_num = ctx->meta->seq_num;

	unsigned long value;

	char type;

	int ret;



	if (!iter)

		return 0;

tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ int change_tcp_cc(struct bpf_iter__tcp *ctx) 
	char cur_cc[TCP_CA_NAME_MAX];

	struct tcp_sock *tp;

	struct sock *sk;

	int ret;



	if (!bpf_tcp_sk(ctx->sk_common))

		return 0;

tools/testing/selftests/bpf/progs/bpf_loop.c

+0 −2
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ static int callback_set_0f(int i, void *ctx) 
SEC("fentry/" SYS_PREFIX "sys_nanosleep")

int prog_non_constant_callback(void *ctx)

{

	struct callback_ctx data = {};



	if (bpf_get_current_pid_tgid() >> 32 != pid)

		return 0;

tools/testing/selftests/bpf/progs/bpf_misc.h

+9 −3
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ 
#define FUNC_REG_ARG_CNT 5

#endif



/* make it look to compiler like value is read and written */

#define __sink(expr) asm volatile("" : "+g"(expr))



struct bpf_iter_num;



extern int bpf_iter_num_new(struct bpf_iter_num *it, int start, int end) __ksym;
@@ -115,7 +118,8 @@ extern void bpf_iter_num_destroy(struct bpf_iter_num *it) __ksym; 
	struct bpf_iter_##type ___it __attribute__((aligned(8), /* enforce, just in case */,	\

						    cleanup(bpf_iter_##type##_destroy))),	\

	/* ___p pointer is just to call bpf_iter_##type##_new() *once* to init ___it */		\

			       *___p = (bpf_iter_##type##_new(&___it, ##args),			\

			       *___p __attribute__((unused)) = (				\

					bpf_iter_##type##_new(&___it, ##args),			\

	/* this is a workaround for Clang bug: it currently doesn't emit BTF */			\

	/* for bpf_iter_##type##_destroy() when used from cleanup() attribute */		\

					(void)bpf_iter_##type##_destroy, (void *)0);		\
@@ -143,7 +147,8 @@ extern void bpf_iter_num_destroy(struct bpf_iter_num *it) __ksym; 
	struct bpf_iter_num ___it __attribute__((aligned(8), /* enforce, just in case */	\

						 cleanup(bpf_iter_num_destroy))),		\

	/* ___p pointer is necessary to call bpf_iter_num_new() *once* to init ___it */		\

			    *___p = (bpf_iter_num_new(&___it, (start), (end)),			\

			    *___p __attribute__((unused)) = (					\

				bpf_iter_num_new(&___it, (start), (end)),			\

	/* this is a workaround for Clang bug: it currently doesn't emit BTF */			\

	/* for bpf_iter_num_destroy() when used from cleanup() attribute */			\

				(void)bpf_iter_num_destroy, (void *)0);				\
@@ -167,7 +172,8 @@ extern void bpf_iter_num_destroy(struct bpf_iter_num *it) __ksym; 
	struct bpf_iter_num ___it __attribute__((aligned(8), /* enforce, just in case */	\

						 cleanup(bpf_iter_num_destroy))),		\

	/* ___p pointer is necessary to call bpf_iter_num_new() *once* to init ___it */		\

			    *___p = (bpf_iter_num_new(&___it, 0, (N)),				\

			    *___p __attribute__((unused)) = (					\

				bpf_iter_num_new(&___it, 0, (N)),				\

	/* this is a workaround for Clang bug: it currently doesn't emit BTF */			\

	/* for bpf_iter_num_destroy() when used from cleanup() attribute */			\

				(void)bpf_iter_num_destroy, (void *)0);				\