netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Andrii Nakryiko <andrii@kernel.org>,
	Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH bpf-next] bpf, mips: Fix build errors about __NR_bpf undeclared
Date: Wed, 24 Nov 2021 12:50:49 -0800	[thread overview]
Message-ID: <CAEf4BzYGHczJ6xejqGnf8LrbCdF1P9dnD6uC5tmJTm+KDRbGGA@mail.gmail.com> (raw)
In-Reply-To: <1637744426-22044-1-git-send-email-yangtiezhu@loongson.cn>

On Wed, Nov 24, 2021 at 1:00 AM Tiezhu Yang <yangtiezhu@loongson.cn> wrote:
>
> Add the __NR_bpf definitions to fix the following build errors for mips.
>
>  $ cd tools/bpf/bpftool
>  $ make
>  [...]
>  bpf.c:54:4: error: #error __NR_bpf not defined. libbpf does not support your arch.
>   #  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); did you mean ‘__NR_brk’?
>    return syscall(__NR_bpf, cmd, attr, size);
>                   ^~~~~~~~
>                   __NR_brk
>  [...]
>  In file included from gen_loader.c:15:0:
>  skel_internal.h: In function ‘skel_sys_bpf’:
>  skel_internal.h:53:17: error: ‘__NR_bpf’ undeclared (first use in this function); did you mean ‘__NR_brk’?
>    return syscall(__NR_bpf, cmd, attr, size);
>                   ^~~~~~~~
>                   __NR_brk
>
> We can see the following generated definitions:
>
>  $ grep -r "#define __NR_bpf" arch/mips
>  arch/mips/include/generated/uapi/asm/unistd_o32.h:#define __NR_bpf (__NR_Linux + 355)
>  arch/mips/include/generated/uapi/asm/unistd_n64.h:#define __NR_bpf (__NR_Linux + 315)
>  arch/mips/include/generated/uapi/asm/unistd_n32.h:#define __NR_bpf (__NR_Linux + 319)
>
> So use the GCC pre-defined macro _ABIO32, _ABIN32 and _ABI64 [1] to define
> the corresponding __NR_bpf.
>
> This patch is similar with commit bad1926dd2f6 ("bpf, s390: fix build for
> libbpf and selftest suite").
>
> [1] https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/config/mips/mips.h#l549
>
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
> ---
>  tools/build/feature/test-bpf.c |  6 ++++++
>  tools/lib/bpf/bpf.c            |  6 ++++++
>  tools/lib/bpf/skel_internal.h  | 10 ++++++++++
>  3 files changed, 22 insertions(+)
>
> diff --git a/tools/build/feature/test-bpf.c b/tools/build/feature/test-bpf.c
> index 82070ea..ebc7a2a 100644
> --- a/tools/build/feature/test-bpf.c
> +++ b/tools/build/feature/test-bpf.c
> @@ -14,6 +14,12 @@
>  #  define __NR_bpf 349
>  # elif defined(__s390__)
>  #  define __NR_bpf 351
> +# elif defined(__mips__) && defined(_ABIO32)
> +#  define __NR_bpf (__NR_Linux + 355)
> +# elif defined(__mips__) && defined(_ABIN32)
> +#  define __NR_bpf (__NR_Linux + 319)
> +# elif defined(__mips__) && defined(_ABI64)
> +#  define __NR_bpf (__NR_Linux + 315)

Is it possible to use a final number without __NR_Linux? All the other
cases have final numbers, no relative numbers

>  # else
>  #  error __NR_bpf not defined. libbpf does not support your arch.
>  # endif
> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> index 94560ba..60422404 100644
> --- a/tools/lib/bpf/bpf.c
> +++ b/tools/lib/bpf/bpf.c
> @@ -50,6 +50,12 @@
>  #  define __NR_bpf 351
>  # elif defined(__arc__)
>  #  define __NR_bpf 280
> +# elif defined(__mips__) && defined(_ABIO32)
> +#  define __NR_bpf (__NR_Linux + 355)
> +# elif defined(__mips__) && defined(_ABIN32)
> +#  define __NR_bpf (__NR_Linux + 319)
> +# elif defined(__mips__) && defined(_ABI64)
> +#  define __NR_bpf (__NR_Linux + 315)
>  # else
>  #  error __NR_bpf not defined. libbpf does not support your arch.
>  # endif
> diff --git a/tools/lib/bpf/skel_internal.h b/tools/lib/bpf/skel_internal.h
> index 9cf6670..6ff4939 100644
> --- a/tools/lib/bpf/skel_internal.h
> +++ b/tools/lib/bpf/skel_internal.h
> @@ -7,6 +7,16 @@
>  #include <sys/syscall.h>
>  #include <sys/mman.h>
>
> +#ifndef __NR_bpf
> +# if defined(__mips__) && defined(_ABIO32)
> +#  define __NR_bpf (__NR_Linux + 355)
> +# elif defined(__mips__) && defined(_ABIN32)
> +#  define __NR_bpf (__NR_Linux + 319)
> +# elif defined(__mips__) && defined(_ABI64)
> +#  define __NR_bpf (__NR_Linux + 315)
> +# endif
> +#endif
> +
>  /* This file is a base header for auto-generated *.lskel.h files.
>   * Its contents will change and may become part of auto-generation in the future.
>   *
> --
> 2.1.0
>

      reply	other threads:[~2021-11-24 20:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-24  9:00 [PATCH bpf-next] bpf, mips: Fix build errors about __NR_bpf undeclared Tiezhu Yang
2021-11-24 20:50 ` Andrii Nakryiko [this message]

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=CAEf4BzYGHczJ6xejqGnf8LrbCdF1P9dnD6uC5tmJTm+KDRbGGA@mail.gmail.com \
    --to=andrii.nakryiko@gmail.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=yangtiezhu@loongson.cn \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).