2019-05-01 22:56:14

by Vineet Gupta

[permalink] [raw]
Subject: [PATCH] tools/bpf: fix perf build error with uClibc (seen on ARC)

When build perf for ARC recently, there was a build failure due to lack
of __NR_bpf.

| Auto-detecting system features:
|
| ... get_cpuid: [ OFF ]
| ... bpf: [ on ]
|
| # error __NR_bpf not defined. libbpf does not support your arch.
^~~~~
| bpf.c: In function 'sys_bpf':
| bpf.c:66:17: error: '__NR_bpf' undeclared (first use in this function)
| return syscall(__NR_bpf, cmd, attr, size);
| ^~~~~~~~
| sys_bpf

The fix is to define a fallbak __NR_bpf.

The obvious fix with be __arc__ specific value, but i think a better fix
is to use the asm-generic uapi value applicable to ARC as well as any new
arch (hopefully we don't add an old existing arch here). Otherwise I can
just add __arc__

Signed-off-by: Vineet Gupta <[email protected]>
---
tools/lib/bpf/bpf.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 9cd015574e83..2c5eb7928400 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -47,7 +47,10 @@
# elif defined(__s390__)
# define __NR_bpf 351
# else
-# error __NR_bpf not defined. libbpf does not support your arch.
+/*
+ * Any non listed arch (new) will have to asm-generic uapi complient
+ */
+# define __NR_bpf 280
# endif
#endif

--
2.7.4


2019-05-02 06:33:08

by Y Song

[permalink] [raw]
Subject: Re: [PATCH] tools/bpf: fix perf build error with uClibc (seen on ARC)

On Wed, May 1, 2019 at 3:55 PM Vineet Gupta <[email protected]> wrote:
>
> When build perf for ARC recently, there was a build failure due to lack
> of __NR_bpf.
>
> | Auto-detecting system features:
> |
> | ... get_cpuid: [ OFF ]
> | ... bpf: [ on ]
> |
> | # error __NR_bpf not defined. libbpf does not support your arch.
> ^~~~~
> | bpf.c: In function 'sys_bpf':
> | bpf.c:66:17: error: '__NR_bpf' undeclared (first use in this function)
> | return syscall(__NR_bpf, cmd, attr, size);
> | ^~~~~~~~
> | sys_bpf
>
> The fix is to define a fallbak __NR_bpf.
>
> The obvious fix with be __arc__ specific value, but i think a better fix
> is to use the asm-generic uapi value applicable to ARC as well as any new
> arch (hopefully we don't add an old existing arch here). Otherwise I can
> just add __arc__

I prefer explicitly guard with __arc__. We still have arm/sh with different
__NR_bpf values. This patch will give wrong bpf syscall values for these
two architectures.

Alternatively, you could add support for arm/sh together
with your current patch. Hopefully I did not miss other architectures.

>
> Signed-off-by: Vineet Gupta <[email protected]>
> ---
> tools/lib/bpf/bpf.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> index 9cd015574e83..2c5eb7928400 100644
> --- a/tools/lib/bpf/bpf.c
> +++ b/tools/lib/bpf/bpf.c
> @@ -47,7 +47,10 @@
> # elif defined(__s390__)
> # define __NR_bpf 351
> # else
> -# error __NR_bpf not defined. libbpf does not support your arch.
> +/*
> + * Any non listed arch (new) will have to asm-generic uapi complient
> + */
> +# define __NR_bpf 280
> # endif
> #endif
>
> --
> 2.7.4
>

2019-05-02 15:58:21

by Vineet Gupta

[permalink] [raw]
Subject: [PATCH v2] tools/bpf: fix perf build error with uClibc (seen on ARC)

When build perf for ARC recently, there was a build failure due to lack
of __NR_bpf.

| Auto-detecting system features:
|
| ... get_cpuid: [ OFF ]
| ... bpf: [ on ]
|
| # error __NR_bpf not defined. libbpf does not support your arch.
^~~~~
| bpf.c: In function 'sys_bpf':
| bpf.c:66:17: error: '__NR_bpf' undeclared (first use in this function)
| return syscall(__NR_bpf, cmd, attr, size);
| ^~~~~~~~
| sys_bpf

Signed-off-by: Vineet Gupta <[email protected]>
---
v1 -> v2
- Only add syscall nr for ARC, as asm-generic won't work with arm/sh [Y Song]
---
tools/lib/bpf/bpf.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 9cd015574e83..d82edadf7589 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -46,6 +46,8 @@
# define __NR_bpf 349
# elif defined(__s390__)
# define __NR_bpf 351
+# elif defined(__arc__)
+# define __NR_bpf 280
# else
# error __NR_bpf not defined. libbpf does not support your arch.
# endif
--
2.7.4

2019-05-02 20:21:10

by Y Song

[permalink] [raw]
Subject: Re: [PATCH v2] tools/bpf: fix perf build error with uClibc (seen on ARC)

On Thu, May 2, 2019 at 8:57 AM Vineet Gupta <[email protected]> wrote:
>
> When build perf for ARC recently, there was a build failure due to lack
> of __NR_bpf.
>
> | Auto-detecting system features:
> |
> | ... get_cpuid: [ OFF ]
> | ... bpf: [ on ]
> |
> | # error __NR_bpf not defined. libbpf does not support your arch.
> ^~~~~
> | bpf.c: In function 'sys_bpf':
> | bpf.c:66:17: error: '__NR_bpf' undeclared (first use in this function)
> | return syscall(__NR_bpf, cmd, attr, size);
> | ^~~~~~~~
> | sys_bpf
>
> Signed-off-by: Vineet Gupta <[email protected]>

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

> ---
> v1 -> v2
> - Only add syscall nr for ARC, as asm-generic won't work with arm/sh [Y Song]
> ---
> tools/lib/bpf/bpf.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> index 9cd015574e83..d82edadf7589 100644
> --- a/tools/lib/bpf/bpf.c
> +++ b/tools/lib/bpf/bpf.c
> @@ -46,6 +46,8 @@
> # define __NR_bpf 349
> # elif defined(__s390__)
> # define __NR_bpf 351
> +# elif defined(__arc__)
> +# define __NR_bpf 280
> # else
> # error __NR_bpf not defined. libbpf does not support your arch.
> # endif
> --
> 2.7.4
>

2019-05-05 07:07:50

by Alexei Starovoitov

[permalink] [raw]
Subject: Re: [PATCH v2] tools/bpf: fix perf build error with uClibc (seen on ARC)

On Thu, May 2, 2019 at 1:20 PM Y Song <[email protected]> wrote:
>
> On Thu, May 2, 2019 at 8:57 AM Vineet Gupta <[email protected]> wrote:
> >
> > When build perf for ARC recently, there was a build failure due to lack
> > of __NR_bpf.
> >
> > | Auto-detecting system features:
> > |
> > | ... get_cpuid: [ OFF ]
> > | ... bpf: [ on ]
> > |
> > | # error __NR_bpf not defined. libbpf does not support your arch.
> > ^~~~~
> > | bpf.c: In function 'sys_bpf':
> > | bpf.c:66:17: error: '__NR_bpf' undeclared (first use in this function)
> > | return syscall(__NR_bpf, cmd, attr, size);
> > | ^~~~~~~~
> > | sys_bpf
> >
> > Signed-off-by: Vineet Gupta <[email protected]>
>
> Acked-by: Yonghong Song <[email protected]>

Applied. Thanks