From: Jiri Olsa <jolsa@redhat.com>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andriin@fb.com>,
Tony Ambardar <tony.ambardar@gmail.com>,
Thadeu Lima de Souza Cascardo <cascardo@canonical.com>,
Aurelien Jarno <aurelien@aurel32.net>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>
Subject: Re: [PATCH] libbpf: Fix VERSIONED_SYM_COUNT number parsing
Date: Thu, 19 Nov 2020 10:48:21 +0100 [thread overview]
Message-ID: <20201119094821.GB1475102@krava> (raw)
In-Reply-To: <CAEf4BzYdQz7p3khLPbNA_1cKbVJv-XJCcKtpxbsoXzExo+g_DQ@mail.gmail.com>
On Wed, Nov 18, 2020 at 05:57:25PM -0800, Andrii Nakryiko wrote:
> On Wed, Nov 18, 2020 at 1:15 PM Jiri Olsa <jolsa@kernel.org> wrote:
> >
> > 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] aa915931ac3e ("libbpf: Fix readelf output parsing for Fedora")
> > [2] 746f534a4809 ("tools/libbpf: Avoid counting local symbols in ABI check")
> >
> > Cc: Tony Ambardar <tony.ambardar@gmail.com>
> > Cc: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
> > Cc: Aurelien Jarno <aurelien@aurel32.net>
> > Fixes: 746f534a4809 ("tools/libbpf: Avoid counting local symbols in ABI check")
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
>
> LGTM. For the future, though, please specify the destination tree: [PATCH bpf].
ugh, sry will do
jirka
>
> Acked-by: Andrii Nakryiko <andrii@kernel.org>
>
>
> > tools/lib/bpf/Makefile | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> > index 5f9abed3e226..55bd78b3496f 100644
> > --- a/tools/lib/bpf/Makefile
> > +++ b/tools/lib/bpf/Makefile
> > @@ -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; \
> > --
> > 2.26.2
> >
>
next prev parent reply other threads:[~2020-11-19 9:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 21:13 [PATCH] libbpf: Fix VERSIONED_SYM_COUNT number parsing Jiri Olsa
2020-11-19 1:57 ` Andrii Nakryiko
2020-11-19 9:48 ` Jiri Olsa [this message]
2020-11-19 17:00 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201119094821.GB1475102@krava \
--to=jolsa@redhat.com \
--cc=andrii.nakryiko@gmail.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=aurelien@aurel32.net \
--cc=bpf@vger.kernel.org \
--cc=cascardo@canonical.com \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=tony.ambardar@gmail.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.