All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] bpftool: fix broken compile on s390 for linux-next repository
@ 2023-04-18  8:55 Thomas Richter
  2023-04-18  9:13 ` Quentin Monnet
  2023-04-19 14:50 ` Daniel Borkmann
  0 siblings, 2 replies; 9+ messages in thread
From: Thomas Richter @ 2023-04-18  8:55 UTC (permalink / raw)
  To: broonie, hca, sfr, liam.howlett, acme, ast, bpf, linux-next, quentin
  Cc: Thomas Richter

Commit 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
breaks the build of the perf tool on s390 in the linux-next repository.
Here is the make output:

make -C tools/perf
....
btf_dumper.c: In function 'dotlabel_puts':
DEBUG: btf_dumper.c:838:25: error: '__fallthrough' undeclared \
		(first use in this function); did you mean 'fallthrough'?
DEBUG:   838 |                         __fallthrough;
DEBUG:       |                         ^~~~~~~~~~~~~
DEBUG:       |                         fallthrough
DEBUG: btf_dumper.c:838:25: note: each undeclared identifier is reported \
		only once for each function it appears in
DEBUG: btf_dumper.c:837:25: warning: this statement may fall through \
                [-Wimplicit-fallthrough=]
DEBUG:   837 |                         putchar('\\');
DEBUG:       |                         ^~~~~~~~~~~~~
DEBUG: btf_dumper.c:839:17: note: here
DEBUG:   839 |                 default:
DEBUG:       |                 ^~~~~~~
DEBUG: make[3]: *** [Makefile:247: /builddir/build/BUILD/kernel-6.2.fc37/\
		        linux-6.2/tools/perf/util/bpf_skel/ \
		        .tmp/bootstrap/btf_dumper.o] Error 1

The compile fails because symbol __fallthrough unknown, but symbol
fallthrough is known and works fine.

Fix this and replace __fallthrough by fallthrough.

With this change, the compile works.

Output after:

 # make -C tools/perf
 ....
 CC      util/bpf-filter.o
 CC      util/bpf-filter-flex.o
 LD      util/perf-in.o
 LD      perf-in.o
 LINK    perf
 make: Leaving directory '/root/mirror-linux-next/tools/perf'
 #

Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
---
 tools/bpf/bpftool/btf_dumper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c
index 6c5e0e82da22..1b7f69714604 100644
--- a/tools/bpf/bpftool/btf_dumper.c
+++ b/tools/bpf/bpftool/btf_dumper.c
@@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s)
 		case '|':
 		case ' ':
 			putchar('\\');
-			__fallthrough;
+			fallthrough;
 		default:
 			putchar(*s);
 		}
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] bpftool: fix broken compile on s390 for linux-next repository
  2023-04-18  8:55 [PATCH] bpftool: fix broken compile on s390 for linux-next repository Thomas Richter
@ 2023-04-18  9:13 ` Quentin Monnet
  2023-04-19 14:50 ` Daniel Borkmann
  1 sibling, 0 replies; 9+ messages in thread
From: Quentin Monnet @ 2023-04-18  9:13 UTC (permalink / raw)
  To: Thomas Richter, broonie, hca, sfr, liam.howlett, acme, ast, bpf,
	linux-next

2023-04-18 10:55 UTC+0200 ~ Thomas Richter <tmricht@linux.ibm.com>
> Commit 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
> breaks the build of the perf tool on s390 in the linux-next repository.
> Here is the make output:
> 
> make -C tools/perf
> ....
> btf_dumper.c: In function 'dotlabel_puts':
> DEBUG: btf_dumper.c:838:25: error: '__fallthrough' undeclared \
> 		(first use in this function); did you mean 'fallthrough'?
> DEBUG:   838 |                         __fallthrough;
> DEBUG:       |                         ^~~~~~~~~~~~~
> DEBUG:       |                         fallthrough
> DEBUG: btf_dumper.c:838:25: note: each undeclared identifier is reported \
> 		only once for each function it appears in
> DEBUG: btf_dumper.c:837:25: warning: this statement may fall through \
>                 [-Wimplicit-fallthrough=]
> DEBUG:   837 |                         putchar('\\');
> DEBUG:       |                         ^~~~~~~~~~~~~
> DEBUG: btf_dumper.c:839:17: note: here
> DEBUG:   839 |                 default:
> DEBUG:       |                 ^~~~~~~
> DEBUG: make[3]: *** [Makefile:247: /builddir/build/BUILD/kernel-6.2.fc37/\
> 		        linux-6.2/tools/perf/util/bpf_skel/ \
> 		        .tmp/bootstrap/btf_dumper.o] Error 1
> 
> The compile fails because symbol __fallthrough unknown, but symbol
> fallthrough is known and works fine.
> 
> Fix this and replace __fallthrough by fallthrough.
> 
> With this change, the compile works.
> 
> Output after:
> 
>  # make -C tools/perf
>  ....
>  CC      util/bpf-filter.o
>  CC      util/bpf-filter-flex.o
>  LD      util/perf-in.o
>  LD      perf-in.o
>  LINK    perf
>  make: Leaving directory '/root/mirror-linux-next/tools/perf'
>  #
> 
> Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>

(Repost from
https://lore.kernel.org/all/20230412123636.2358949-1-tmricht@linux.ibm.com)

Acked-by: Quentin Monnet <quentin@isovalent.com>


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] bpftool: fix broken compile on s390 for linux-next repository
  2023-04-18  8:55 [PATCH] bpftool: fix broken compile on s390 for linux-next repository Thomas Richter
  2023-04-18  9:13 ` Quentin Monnet
@ 2023-04-19 14:50 ` Daniel Borkmann
  2023-04-20  0:39   ` Quentin Monnet
  1 sibling, 1 reply; 9+ messages in thread
From: Daniel Borkmann @ 2023-04-19 14:50 UTC (permalink / raw)
  To: Thomas Richter, broonie, hca, sfr, liam.howlett, acme, ast, bpf,
	linux-next, quentin

On 4/18/23 10:55 AM, Thomas Richter wrote:
> Commit 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
> breaks the build of the perf tool on s390 in the linux-next repository.
> Here is the make output:
> 
> make -C tools/perf
> ....
> btf_dumper.c: In function 'dotlabel_puts':
> DEBUG: btf_dumper.c:838:25: error: '__fallthrough' undeclared \
> 		(first use in this function); did you mean 'fallthrough'?
> DEBUG:   838 |                         __fallthrough;
> DEBUG:       |                         ^~~~~~~~~~~~~
> DEBUG:       |                         fallthrough
> DEBUG: btf_dumper.c:838:25: note: each undeclared identifier is reported \
> 		only once for each function it appears in
> DEBUG: btf_dumper.c:837:25: warning: this statement may fall through \
>                  [-Wimplicit-fallthrough=]
> DEBUG:   837 |                         putchar('\\');
> DEBUG:       |                         ^~~~~~~~~~~~~
> DEBUG: btf_dumper.c:839:17: note: here
> DEBUG:   839 |                 default:
> DEBUG:       |                 ^~~~~~~
> DEBUG: make[3]: *** [Makefile:247: /builddir/build/BUILD/kernel-6.2.fc37/\
> 		        linux-6.2/tools/perf/util/bpf_skel/ \
> 		        .tmp/bootstrap/btf_dumper.o] Error 1
> 
> The compile fails because symbol __fallthrough unknown, but symbol
> fallthrough is known and works fine.
> 
> Fix this and replace __fallthrough by fallthrough.
> 
> With this change, the compile works.
> 
> Output after:
> 
>   # make -C tools/perf
>   ....
>   CC      util/bpf-filter.o
>   CC      util/bpf-filter-flex.o
>   LD      util/perf-in.o
>   LD      perf-in.o
>   LINK    perf
>   make: Leaving directory '/root/mirror-linux-next/tools/perf'
>   #
> 
> Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> ---
>   tools/bpf/bpftool/btf_dumper.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c
> index 6c5e0e82da22..1b7f69714604 100644
> --- a/tools/bpf/bpftool/btf_dumper.c
> +++ b/tools/bpf/bpftool/btf_dumper.c
> @@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s)
>   		case '|':
>   		case ' ':
>   			putchar('\\');
> -			__fallthrough;
> +			fallthrough;

The problem is however for current bpf-next, where this change breaks CI:

https://github.com/kernel-patches/bpf/actions/runs/4737651765/jobs/8410684531

   [...]
     CC      /tmp/work/bpf/bpf/tools/testing/selftests/bpf/tools/build/bpftool/feature.o
     CC      /tmp/work/bpf/bpf/tools/testing/selftests/bpf/tools/build/bpftool/disasm.o
   btf_dumper.c:838:4: error: use of undeclared identifier 'fallthrough'
                           fallthrough;
                           ^
   1 error generated.
   [...]

I would suggest as a clean path that'll work for both to just change from
fallthrough; into /* fallthrough */ as done in objtool, then we can also
work around BPF CI issue and merge this change in time.

>   		default:
>   			putchar(*s);
>   		}
> 


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] bpftool: fix broken compile on s390 for linux-next repository
  2023-04-19 14:50 ` Daniel Borkmann
@ 2023-04-20  0:39   ` Quentin Monnet
  0 siblings, 0 replies; 9+ messages in thread
From: Quentin Monnet @ 2023-04-20  0:39 UTC (permalink / raw)
  To: Daniel Borkmann
  Cc: Thomas Richter, broonie, hca, sfr, liam.howlett, acme, ast, bpf,
	linux-next

On Wed, 19 Apr 2023 at 15:51, Daniel Borkmann <daniel@iogearbox.net> wrote:
>
> On 4/18/23 10:55 AM, Thomas Richter wrote:

> > -                     __fallthrough;
> > +                     fallthrough;
>
> The problem is however for current bpf-next, where this change breaks CI:
>
> https://github.com/kernel-patches/bpf/actions/runs/4737651765/jobs/8410684531
>
>    [...]
>      CC      /tmp/work/bpf/bpf/tools/testing/selftests/bpf/tools/build/bpftool/feature.o
>      CC      /tmp/work/bpf/bpf/tools/testing/selftests/bpf/tools/build/bpftool/disasm.o
>    btf_dumper.c:838:4: error: use of undeclared identifier 'fallthrough'
>                            fallthrough;
>                            ^
>    1 error generated.
>    [...]
>
> I would suggest as a clean path that'll work for both to just change from
> fallthrough; into /* fallthrough */ as done in objtool, then we can also
> work around BPF CI issue and merge this change in time.
>
> >               default:
> >                       putchar(*s);
> >               }
> >
>

Thanks Daniel for pointing this out. I just submitted the patch you suggested:
https://lore.kernel.org/bpf/20230420003333.90901-1-quentin@isovalent.com/

Quentin

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] bpftool: fix broken compile on s390 for linux-next repository
  2023-04-14 16:53     ` Mark Brown
@ 2023-04-14 16:58       ` Quentin Monnet
  0 siblings, 0 replies; 9+ messages in thread
From: Quentin Monnet @ 2023-04-14 16:58 UTC (permalink / raw)
  To: Mark Brown, Heiko Carstens
  Cc: Stephen Rothwell, Liam Howlett, Arnaldo Carvalho de Melo,
	Alexei Starovoitov, Thomas Richter, bpf, linux-next

Hi Mark,

2023-04-14 17:53 UTC+0100 ~ Mark Brown <broonie@kernel.org>
> On Fri, Apr 14, 2023 at 10:47:02AM +0200, Heiko Carstens wrote:
>> Full quote below for reference.
>>
>> Mark or Stephen could you please add the patch below to linux-next?
> 
> Could someone please send me whatever patch is being referenced here?
> This looks like a quoted backtrace of some discussion.

Here it is on Patchwork:
https://patchwork.kernel.org/project/netdevbpf/patch/20230412123636.2358949-1-tmricht@linux.ibm.com/

Lore:
https://lore.kernel.org/all/20230412123636.2358949-1-tmricht@linux.ibm.com/

Thanks,
Quentin

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] bpftool: fix broken compile on s390 for linux-next repository
  2023-04-14  8:47   ` Heiko Carstens
@ 2023-04-14 16:53     ` Mark Brown
  2023-04-14 16:58       ` Quentin Monnet
  0 siblings, 1 reply; 9+ messages in thread
From: Mark Brown @ 2023-04-14 16:53 UTC (permalink / raw)
  To: Heiko Carstens
  Cc: Stephen Rothwell, Liam Howlett, Arnaldo Carvalho de Melo,
	Alexei Starovoitov, Thomas Richter, bpf, linux-next,
	Quentin Monnet

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

On Fri, Apr 14, 2023 at 10:47:02AM +0200, Heiko Carstens wrote:
> Full quote below for reference.
> 
> Mark or Stephen could you please add the patch below to linux-next?

Could someone please send me whatever patch is being referenced here?
This looks like a quoted backtrace of some discussion.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] bpftool: fix broken compile on s390 for linux-next repository
  2023-04-12 13:27 ` Quentin Monnet
@ 2023-04-14  8:47   ` Heiko Carstens
  2023-04-14 16:53     ` Mark Brown
  0 siblings, 1 reply; 9+ messages in thread
From: Heiko Carstens @ 2023-04-14  8:47 UTC (permalink / raw)
  To: Mark Brown, Stephen Rothwell, Liam Howlett,
	Arnaldo Carvalho de Melo, Alexei Starovoitov
  Cc: Thomas Richter, bpf, linux-next, Quentin Monnet

Full quote below for reference.

Mark or Stephen could you please add the patch below to linux-next?

This solves a merge conflict between perf tree commit f7a858bffcdd ("tools:
Rename __fallthrough to fallthrough") and bpf-next tree commit 9fd496848b1c
("bpftool: Support inline annotations when dumping the CFG of a program").

FWIW, the perf tree commit also seems to have missed an additional
occurence of __fallthrough in samples/bpf/hbm.c.

Thanks!

On Wed, Apr 12, 2023 at 02:27:23PM +0100, Quentin Monnet wrote:
> 2023-04-12 14:36 UTC+0200 ~ Thomas Richter <tmricht@linux.ibm.com>
> > Commit 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
> > breaks the build of the perf tool on s390 in the linux-next repository.
> > Here is the make output:
> > 
> > make -C tools/perf
> > ....
> > btf_dumper.c: In function 'dotlabel_puts':
> > DEBUG: btf_dumper.c:838:25: error: '__fallthrough' undeclared \
> > 		(first use in this function); did you mean 'fallthrough'?
> > DEBUG:   838 |                         __fallthrough;
> > DEBUG:       |                         ^~~~~~~~~~~~~
> > DEBUG:       |                         fallthrough
> > DEBUG: btf_dumper.c:838:25: note: each undeclared identifier is reported \
> > 		only once for each function it appears in
> > DEBUG: btf_dumper.c:837:25: warning: this statement may fall through \
> >                 [-Wimplicit-fallthrough=]
> > DEBUG:   837 |                         putchar('\\');
> > DEBUG:       |                         ^~~~~~~~~~~~~
> > DEBUG: btf_dumper.c:839:17: note: here
> > DEBUG:   839 |                 default:
> > DEBUG:       |                 ^~~~~~~
> > DEBUG: make[3]: *** [Makefile:247: /builddir/build/BUILD/kernel-6.2.fc37/\
> > 		        linux-6.2/tools/perf/util/bpf_skel/ \
> > 		        .tmp/bootstrap/btf_dumper.o] Error 1
> > 
> > The compile fails because symbol __fallthrough unknown, but symbol
> > fallthrough is known and works fine.
> > 
> > Fix this and replace __fallthrough by fallthrough.
> > 
> > With this change, the compile works.
> > 
> > Output after:
> > 
> >  # make -C tools/perf
> >  ....
> >  CC      util/bpf-filter.o
> >  CC      util/bpf-filter-flex.o
> >  LD      util/perf-in.o
> >  LD      perf-in.o
> >  LINK    perf
> >  make: Leaving directory '/root/mirror-linux-next/tools/perf'
> >  #
> > 
> > Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
> > Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> > ---
> >  tools/bpf/bpftool/btf_dumper.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c
> > index 6c5e0e82da22..1b7f69714604 100644
> > --- a/tools/bpf/bpftool/btf_dumper.c
> > +++ b/tools/bpf/bpftool/btf_dumper.c
> > @@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s)
> >  		case '|':
> >  		case ' ':
> >  			putchar('\\');
> > -			__fallthrough;
> > +			fallthrough;
> >  		default:
> >  			putchar(*s);
> >  		}
> 
> Also reported by Sven Schnelle, and discussed at
> https://lore.kernel.org/all/yt9dttxlwal7.fsf@linux.ibm.com/.
> 
> This is for linux-next, it cannot go through bpf-next given that commit
> f7a858bffcdd ("tools: Rename __fallthrough to fallthrough") is not in
> there yet.
> 
> Acked-by: Quentin Monnet <quentin@isovalent.com>
> 
> Thanks!
> Quentin

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] bpftool: fix broken compile on s390 for linux-next repository
  2023-04-12 12:36 Thomas Richter
@ 2023-04-12 13:27 ` Quentin Monnet
  2023-04-14  8:47   ` Heiko Carstens
  0 siblings, 1 reply; 9+ messages in thread
From: Quentin Monnet @ 2023-04-12 13:27 UTC (permalink / raw)
  To: Thomas Richter, hca, bpf, linux-next

2023-04-12 14:36 UTC+0200 ~ Thomas Richter <tmricht@linux.ibm.com>
> Commit 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
> breaks the build of the perf tool on s390 in the linux-next repository.
> Here is the make output:
> 
> make -C tools/perf
> ....
> btf_dumper.c: In function 'dotlabel_puts':
> DEBUG: btf_dumper.c:838:25: error: '__fallthrough' undeclared \
> 		(first use in this function); did you mean 'fallthrough'?
> DEBUG:   838 |                         __fallthrough;
> DEBUG:       |                         ^~~~~~~~~~~~~
> DEBUG:       |                         fallthrough
> DEBUG: btf_dumper.c:838:25: note: each undeclared identifier is reported \
> 		only once for each function it appears in
> DEBUG: btf_dumper.c:837:25: warning: this statement may fall through \
>                 [-Wimplicit-fallthrough=]
> DEBUG:   837 |                         putchar('\\');
> DEBUG:       |                         ^~~~~~~~~~~~~
> DEBUG: btf_dumper.c:839:17: note: here
> DEBUG:   839 |                 default:
> DEBUG:       |                 ^~~~~~~
> DEBUG: make[3]: *** [Makefile:247: /builddir/build/BUILD/kernel-6.2.fc37/\
> 		        linux-6.2/tools/perf/util/bpf_skel/ \
> 		        .tmp/bootstrap/btf_dumper.o] Error 1
> 
> The compile fails because symbol __fallthrough unknown, but symbol
> fallthrough is known and works fine.
> 
> Fix this and replace __fallthrough by fallthrough.
> 
> With this change, the compile works.
> 
> Output after:
> 
>  # make -C tools/perf
>  ....
>  CC      util/bpf-filter.o
>  CC      util/bpf-filter-flex.o
>  LD      util/perf-in.o
>  LD      perf-in.o
>  LINK    perf
>  make: Leaving directory '/root/mirror-linux-next/tools/perf'
>  #
> 
> Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> ---
>  tools/bpf/bpftool/btf_dumper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c
> index 6c5e0e82da22..1b7f69714604 100644
> --- a/tools/bpf/bpftool/btf_dumper.c
> +++ b/tools/bpf/bpftool/btf_dumper.c
> @@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s)
>  		case '|':
>  		case ' ':
>  			putchar('\\');
> -			__fallthrough;
> +			fallthrough;
>  		default:
>  			putchar(*s);
>  		}

Also reported by Sven Schnelle, and discussed at
https://lore.kernel.org/all/yt9dttxlwal7.fsf@linux.ibm.com/.

This is for linux-next, it cannot go through bpf-next given that commit
f7a858bffcdd ("tools: Rename __fallthrough to fallthrough") is not in
there yet.

Acked-by: Quentin Monnet <quentin@isovalent.com>

Thanks!
Quentin

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH] bpftool: fix broken compile on s390 for linux-next repository
@ 2023-04-12 12:36 Thomas Richter
  2023-04-12 13:27 ` Quentin Monnet
  0 siblings, 1 reply; 9+ messages in thread
From: Thomas Richter @ 2023-04-12 12:36 UTC (permalink / raw)
  To: quentin, hca, bpf, linux-next; +Cc: Thomas Richter

Commit 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
breaks the build of the perf tool on s390 in the linux-next repository.
Here is the make output:

make -C tools/perf
....
btf_dumper.c: In function 'dotlabel_puts':
DEBUG: btf_dumper.c:838:25: error: '__fallthrough' undeclared \
		(first use in this function); did you mean 'fallthrough'?
DEBUG:   838 |                         __fallthrough;
DEBUG:       |                         ^~~~~~~~~~~~~
DEBUG:       |                         fallthrough
DEBUG: btf_dumper.c:838:25: note: each undeclared identifier is reported \
		only once for each function it appears in
DEBUG: btf_dumper.c:837:25: warning: this statement may fall through \
                [-Wimplicit-fallthrough=]
DEBUG:   837 |                         putchar('\\');
DEBUG:       |                         ^~~~~~~~~~~~~
DEBUG: btf_dumper.c:839:17: note: here
DEBUG:   839 |                 default:
DEBUG:       |                 ^~~~~~~
DEBUG: make[3]: *** [Makefile:247: /builddir/build/BUILD/kernel-6.2.fc37/\
		        linux-6.2/tools/perf/util/bpf_skel/ \
		        .tmp/bootstrap/btf_dumper.o] Error 1

The compile fails because symbol __fallthrough unknown, but symbol
fallthrough is known and works fine.

Fix this and replace __fallthrough by fallthrough.

With this change, the compile works.

Output after:

 # make -C tools/perf
 ....
 CC      util/bpf-filter.o
 CC      util/bpf-filter-flex.o
 LD      util/perf-in.o
 LD      perf-in.o
 LINK    perf
 make: Leaving directory '/root/mirror-linux-next/tools/perf'
 #

Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
---
 tools/bpf/bpftool/btf_dumper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c
index 6c5e0e82da22..1b7f69714604 100644
--- a/tools/bpf/bpftool/btf_dumper.c
+++ b/tools/bpf/bpftool/btf_dumper.c
@@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s)
 		case '|':
 		case ' ':
 			putchar('\\');
-			__fallthrough;
+			fallthrough;
 		default:
 			putchar(*s);
 		}
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2023-04-20  0:39 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-18  8:55 [PATCH] bpftool: fix broken compile on s390 for linux-next repository Thomas Richter
2023-04-18  9:13 ` Quentin Monnet
2023-04-19 14:50 ` Daniel Borkmann
2023-04-20  0:39   ` Quentin Monnet
  -- strict thread matches above, loose matches on Subject: below --
2023-04-12 12:36 Thomas Richter
2023-04-12 13:27 ` Quentin Monnet
2023-04-14  8:47   ` Heiko Carstens
2023-04-14 16:53     ` Mark Brown
2023-04-14 16:58       ` Quentin Monnet

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.