| Message ID | 20200507145652.190823-2-yauheni.kaliuta@redhat.com |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | libbpf: fix powerpc check_kabi rule | expand |
On Thu, May 7, 2020 at 7:57 AM Yauheni Kaliuta <yauheni.kaliuta@redhat.com> wrote: > > The patch makes it fail on the output when the comment is printed > after the symbol name (RHEL8 powerpc): > > 400: 000000000000c714 144 FUNC GLOBAL DEFAULT 1 bpf_object__open_file@LIBBPF_0.0.4 [<localentry>: 8] > > But after commit aa915931ac3e ("libbpf: Fix readelf output parsing > for Fedora") it is not needed anymore, the parsing should work in > both cases. > > This reverts commit 3464afdf11f9a1e031e7858a05351ceca1792fea. > > Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> > --- Looks good, though would be nice to have people originally involved in those fixes you mentioned to confirm it works fine still. Added them to cc. If no one shouts loudly in next few days: Acked-by: Andrii Nakryiko <andriin@fb.com> > tools/lib/bpf/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > index aee7f1a83c77..908dac9eb562 100644 > --- a/tools/lib/bpf/Makefile > +++ b/tools/lib/bpf/Makefile > @@ -149,7 +149,7 @@ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags) > GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ > cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ > sed 's/\[.*\]//' | \ > - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ > + awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \ > sort -u | wc -l) > VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ > grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) > @@ -216,7 +216,7 @@ check_abi: $(OUTPUT)libbpf.so > readelf -s --wide $(BPF_IN_SHARED) | \ > cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ > sed 's/\[.*\]//' | \ > - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ > + awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'| \ > sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ > readelf -s --wide $(OUTPUT)libbpf.so | \ > grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ > -- > 2.26.2 >
On Fri, May 08, 2020 at 02:46:56PM -0700, Andrii Nakryiko wrote: > On Thu, May 7, 2020 at 7:57 AM Yauheni Kaliuta > <yauheni.kaliuta@redhat.com> wrote: > > > > The patch makes it fail on the output when the comment is printed > > after the symbol name (RHEL8 powerpc): > > > > 400: 000000000000c714 144 FUNC GLOBAL DEFAULT 1 bpf_object__open_file@LIBBPF_0.0.4 [<localentry>: 8] > > > > But after commit aa915931ac3e ("libbpf: Fix readelf output parsing > > for Fedora") it is not needed anymore, the parsing should work in > > both cases. > > If it's working either way after aa915931ac3e, is there any specific reason for the revert? Cascardo. > > This reverts commit 3464afdf11f9a1e031e7858a05351ceca1792fea. > > > > Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> > > --- > > Looks good, though would be nice to have people originally involved in > those fixes you mentioned to confirm it works fine still. Added them > to cc. > > If no one shouts loudly in next few days: > > Acked-by: Andrii Nakryiko <andriin@fb.com> > > > > tools/lib/bpf/Makefile | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > > index aee7f1a83c77..908dac9eb562 100644 > > --- a/tools/lib/bpf/Makefile > > +++ b/tools/lib/bpf/Makefile > > @@ -149,7 +149,7 @@ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags) > > GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ > > cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ > > sed 's/\[.*\]//' | \ > > - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ > > + awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \ > > sort -u | wc -l) > > VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ > > grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) > > @@ -216,7 +216,7 @@ check_abi: $(OUTPUT)libbpf.so > > readelf -s --wide $(BPF_IN_SHARED) | \ > > cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ > > sed 's/\[.*\]//' | \ > > - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ > > + awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'| \ > > sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ > > readelf -s --wide $(OUTPUT)libbpf.so | \ > > grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ > > -- > > 2.26.2 > >
Hi, Thadeu! >>>>> On Fri, 8 May 2020 19:18:35 -0300, Thadeu Lima de Souza Cascardo wrote: > On Fri, May 08, 2020 at 02:46:56PM -0700, Andrii Nakryiko wrote: >> On Thu, May 7, 2020 at 7:57 AM Yauheni Kaliuta >> <yauheni.kaliuta@redhat.com> wrote: >> > >> > The patch makes it fail on the output when the comment is printed >> > after the symbol name (RHEL8 powerpc): >> > >> > 400: 000000000000c714 144 FUNC GLOBAL DEFAULT 1 >> > bpf_object__open_file@LIBBPF_0.0.4 [<localentry>: 8] >> > >> > But after commit aa915931ac3e ("libbpf: Fix readelf output parsing >> > for Fedora") it is not needed anymore, the parsing should work in >> > both cases. >> > > If it's working either way after aa915931ac3e, is there any > specific reason for the revert? Well, not really, agree. > Cascardo. >> > This reverts commit 3464afdf11f9a1e031e7858a05351ceca1792fea. >> > >> > Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> >> > --- >> >> Looks good, though would be nice to have people originally involved in >> those fixes you mentioned to confirm it works fine still. Added them >> to cc. >> >> If no one shouts loudly in next few days: >> >> Acked-by: Andrii Nakryiko <andriin@fb.com> >> >> >> > tools/lib/bpf/Makefile | 4 ++-- >> > 1 file changed, 2 insertions(+), 2 deletions(-) >> > >> > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile >> > index aee7f1a83c77..908dac9eb562 100644 >> > --- a/tools/lib/bpf/Makefile >> > +++ b/tools/lib/bpf/Makefile >> > @@ -149,7 +149,7 @@ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags) >> > GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ >> > cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ >> > sed 's/\[.*\]//' | \ >> > - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ >> > + awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \ >> > sort -u | wc -l) >> > VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ >> > grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) >> > @@ -216,7 +216,7 @@ check_abi: $(OUTPUT)libbpf.so >> > readelf -s --wide $(BPF_IN_SHARED) | \ >> > cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ >> > sed 's/\[.*\]//' | \ >> > - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ >> > + awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'| \ >> > sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ >> > readelf -s --wide $(OUTPUT)libbpf.so | \ >> > grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ >> > -- >> > 2.26.2 >> >
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index aee7f1a83c77..908dac9eb562 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -149,7 +149,7 @@ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags) GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ sed 's/\[.*\]//' | \ - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ + awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \ sort -u | wc -l) VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) @@ -216,7 +216,7 @@ check_abi: $(OUTPUT)libbpf.so readelf -s --wide $(BPF_IN_SHARED) | \ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ sed 's/\[.*\]//' | \ - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ + awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'| \ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ readelf -s --wide $(OUTPUT)libbpf.so | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \
The patch makes it fail on the output when the comment is printed after the symbol name (RHEL8 powerpc): 400: 000000000000c714 144 FUNC GLOBAL DEFAULT 1 bpf_object__open_file@LIBBPF_0.0.4 [<localentry>: 8] But after commit aa915931ac3e ("libbpf: Fix readelf output parsing for Fedora") it is not needed anymore, the parsing should work in both cases. This reverts commit 3464afdf11f9a1e031e7858a05351ceca1792fea. Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> --- tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)