Commit 9a241805 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf bpf: Remove undefined behavior from bpf_perf_object__next() 



bpf_perf_object__next() folded the last element in the list test with the
empty list test. However, this meant that offsets were computed against
null and that a struct list_head was compared against a 'struct
bpf_perf_object'.

Working around this with clang's undefined behavior sanitizer required
-fno-sanitize=null and -fno-sanitize=object-size.

Remove the undefined behavior by using the regular Linux list APIs and
handling the starting case separately from the end testing case.

Looking at uses like bpf_perf_object__for_each(), as the constant NULL
or non-NULL argument can be constant propagated, the code is no less
efficient.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Christy Lee <christylee@fb.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Rix <trix@redhat.com>
Cc: bpf@vger.kernel.org
Cc: llvm@lists.linux.dev
Link: https://lore.kernel.org/r/20220726220921.2567761-1-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 882528d2

tools/perf/util/bpf-loader.c

+7 −11
Original line number Diff line number Diff line
@@ -63,20 +63,16 @@ static struct hashmap *bpf_map_hash; 
static struct bpf_perf_object *

bpf_perf_object__next(struct bpf_perf_object *prev)

{

	struct bpf_perf_object *next;



	if (!prev)

		next = list_first_entry(&bpf_objects_list,

					struct bpf_perf_object,

					list);

	else

		next = list_next_entry(prev, list);

	if (!prev) {

		if (list_empty(&bpf_objects_list))

			return NULL;



	/* Empty list is noticed here so don't need checking on entry. */

	if (&next->list == &bpf_objects_list)

		return list_first_entry(&bpf_objects_list, struct bpf_perf_object, list);

	}

	if (list_is_last(&prev->list, &bpf_objects_list))

		return NULL;



	return next;

	return list_next_entry(prev, list);

}



#define bpf_perf_object__for_each(perf_obj, tmp)	\