2020-05-11 11:34:31

by Matteo Croce

[permalink] [raw]
Subject: [PATCH bpf] samples: bpf: fix build error

GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains
a symbol which clashes with libbpf:

/usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here
collect2: error: ld returned 1 exit status

bpf_log_buf here seems to be a leftover, so removing it.

Signed-off-by: Matteo Croce <[email protected]>
---
samples/bpf/lwt_len_hist_user.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/samples/bpf/lwt_len_hist_user.c b/samples/bpf/lwt_len_hist_user.c
index 587b68b1f8dd..430a4b7e353e 100644
--- a/samples/bpf/lwt_len_hist_user.c
+++ b/samples/bpf/lwt_len_hist_user.c
@@ -15,8 +15,6 @@
#define MAX_INDEX 64
#define MAX_STARS 38

-char bpf_log_buf[BPF_LOG_BUF_SIZE];
-
static void stars(char *str, long val, long max, int width)
{
int i;
--
2.26.2


2020-05-11 20:36:30

by Yonghong Song

[permalink] [raw]
Subject: Re: [PATCH bpf] samples: bpf: fix build error



On 5/11/20 4:32 AM, Matteo Croce wrote:
> GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains
> a symbol which clashes with libbpf:
>
> /usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here
> collect2: error: ld returned 1 exit status
>
> bpf_log_buf here seems to be a leftover, so removing it.
>
> Signed-off-by: Matteo Croce <[email protected]>

Acked-by: Yonghong Song <[email protected]>

2020-05-14 20:09:38

by Alexei Starovoitov

[permalink] [raw]
Subject: Re: [PATCH bpf] samples: bpf: fix build error

On Mon, May 11, 2020 at 1:32 PM Yonghong Song <[email protected]> wrote:
>
>
>
> On 5/11/20 4:32 AM, Matteo Croce wrote:
> > GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains
> > a symbol which clashes with libbpf:
> >
> > /usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here
> > collect2: error: ld returned 1 exit status
> >
> > bpf_log_buf here seems to be a leftover, so removing it.
> >
> > Signed-off-by: Matteo Croce <[email protected]>
>
> Acked-by: Yonghong Song <[email protected]>

Applied to bpf tree. Thanks