Commit 1fd6cee1 authored Nov 18, 2020 by Jiri Olsa Committed by Alexei Starovoitov Nov 19, 2020

libbpf: Fix VERSIONED_SYM_COUNT number parsing



We remove "other info" from "readelf -s --wide" output when
parsing GLOBAL_SYM_COUNT variable, which was added in [1].
But we don't do that for VERSIONED_SYM_COUNT and it's failing
the check_abi target on powerpc Fedora 33.

The extra "other info" wasn't problem for VERSIONED_SYM_COUNT
parsing until commit [2] added awk in the pipe, which assumes
that the last column is symbol, but it can be "other info".

Adding "other info" removal for VERSIONED_SYM_COUNT the same
way as we did for GLOBAL_SYM_COUNT parsing.

[1] aa915931 ("libbpf: Fix readelf output parsing for Fedora")
[2] 746f534a ("tools/libbpf: Avoid counting local symbols in ABI check")

Fixes: 746f534a ("tools/libbpf: Avoid counting local symbols in ABI check")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20201118211350.1493421-1-jolsa@kernel.org

parent 4363023d

tools/lib/bpf/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) \| \
		awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' \| \
		sort -u \| wc -l)
		VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so \| \
		sed 's/\[.*\]//' \| \
		awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' \| \
		grep -Eo '[^ ]+@LIBBPF_' \| cut -d@ -f1 \| sort -u \| wc -l)

		@@ -214,6 +215,7 @@ check_abi: $(OUTPUT)libbpf.so
		awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'\| \
		sort -u > $(OUTPUT)libbpf_global_syms.tmp; \
		readelf --dyn-syms --wide $(OUTPUT)libbpf.so \| \
		sed 's/\[.*\]//' \| \
		awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'\| \
		grep -Eo '[^ ]+@LIBBPF_' \| cut -d@ -f1 \| \
		sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) \| \
		awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' \| \
		sort -u \| wc -l)
		VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so \| \
		sed 's/\[.*\]//' \| \
		awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' \| \
		grep -Eo '[^ ]+@LIBBPF_' \| cut -d@ -f1 \| sort -u \| wc -l)

		@@ -214,6 +215,7 @@ check_abi: $(OUTPUT)libbpf.so
		awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'\| \
		sort -u > $(OUTPUT)libbpf_global_syms.tmp; \
		readelf --dyn-syms --wide $(OUTPUT)libbpf.so \| \
		sed 's/\[.*\]//' \| \
		awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'\| \
		grep -Eo '[^ ]+@LIBBPF_' \| cut -d@ -f1 \| \
		sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \

Admin message