Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Paul E. McKenney" <paulmck@kernel.org>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: davem@davemloft.net, daniel@iogearbox.net,
	netdev@vger.kernel.org, bpf@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH v2 bpf-next] bpf: Fix build without BPF_SYSCALL, but with BPF_JIT.
Date: Mon, 31 Aug 2020 09:15:52 -0700	[thread overview]
Message-ID: <20200831161552.GA2855@paulmck-ThinkPad-P72> (raw)
In-Reply-To: <20200831155155.62754-1-alexei.starovoitov@gmail.com>

On Mon, Aug 31, 2020 at 08:51:55AM -0700, Alexei Starovoitov wrote:
> From: Alexei Starovoitov <ast@kernel.org>
> 
> When CONFIG_BPF_SYSCALL is not set, but CONFIG_BPF_JIT=y
> the kernel build fails:
> In file included from ../kernel/bpf/trampoline.c:11:
> ../kernel/bpf/trampoline.c: In function ‘bpf_trampoline_update’:
> ../kernel/bpf/trampoline.c:220:39: error: ‘call_rcu_tasks_trace’ undeclared
> ../kernel/bpf/trampoline.c: In function ‘__bpf_prog_enter_sleepable’:
> ../kernel/bpf/trampoline.c:411:2: error: implicit declaration of function ‘rcu_read_lock_trace’
> ../kernel/bpf/trampoline.c: In function ‘__bpf_prog_exit_sleepable’:
> ../kernel/bpf/trampoline.c:416:2: error: implicit declaration of function ‘rcu_read_unlock_trace’
> 
> This is due to:
> obj-$(CONFIG_BPF_JIT) += trampoline.o
> obj-$(CONFIG_BPF_JIT) += dispatcher.o
> There is a number of functions that arch/x86/net/bpf_jit_comp.c is
> using from these two files, but none of them will be used when
> only cBPF is on (which is the case for BPF_SYSCALL=n BPF_JIT=y).
> 
> Add rcu_trace functions to rcupdate_trace.h. The JITed code won't execute them
> and BPF trampoline logic won't be used without BPF_SYSCALL.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Fixes: 1e6c62a88215 ("bpf: Introduce sleepable BPF programs")
> Acked-by: Paul E. McKenney <paulmck@kernel.org>
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>

Looks good, and unless someone tells me otherwise, I am assuming that
this one goes up the normal BPF patch route.

							Thanx, Paul

> ---
>  include/linux/rcupdate_trace.h | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/rcupdate_trace.h b/include/linux/rcupdate_trace.h
> index d9015aac78c6..aaaac8ac927c 100644
> --- a/include/linux/rcupdate_trace.h
> +++ b/include/linux/rcupdate_trace.h
> @@ -82,7 +82,14 @@ static inline void rcu_read_unlock_trace(void)
>  void call_rcu_tasks_trace(struct rcu_head *rhp, rcu_callback_t func);
>  void synchronize_rcu_tasks_trace(void);
>  void rcu_barrier_tasks_trace(void);
> -
> +#else
> +/*
> + * The BPF JIT forms these addresses even when it doesn't call these
> + * functions, so provide definitions that result in runtime errors.
> + */
> +static inline void call_rcu_tasks_trace(struct rcu_head *rhp, rcu_callback_t func) { BUG(); }
> +static inline void rcu_read_lock_trace(void) { BUG(); }
> +static inline void rcu_read_unlock_trace(void) { BUG(); }
>  #endif /* #ifdef CONFIG_TASKS_TRACE_RCU */
>  
>  #endif /* __LINUX_RCUPDATE_TRACE_H */
> -- 
> 2.23.0
> 

  reply	other threads:[~2020-08-31 16:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-31 15:51 Alexei Starovoitov
2020-08-31 16:15 ` Paul E. McKenney [this message]
2020-08-31 16:19   ` Alexei Starovoitov
2020-08-31 20:07 ` Daniel Borkmann

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=20200831161552.GA2855@paulmck-ThinkPad-P72 \
    --to=paulmck@kernel.org \
    --cc=alexei.starovoitov@gmail.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=kernel-team@fb.com \
    --cc=netdev@vger.kernel.org \
    --subject='Re: [PATCH v2 bpf-next] bpf: Fix build without BPF_SYSCALL, but with BPF_JIT.' \
    /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

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).