From: Randy Dunlap <rdunlap@infradead.org>
To: KP Singh <kpsingh@chromium.org>,
linux-security-module@vger.kernel.org,
linux-next@vger.kernel.org, bpf@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Florent Revest <revest@chromium.org>,
Brendan Jackman <jackmanb@chromium.org>
Subject: Re: [PATCH bpf-next] bpf: Fix bpf_prog_test_run_tracing for !CONFIG_NET
Date: Thu, 5 Mar 2020 15:12:42 -0800 [thread overview]
Message-ID: <92937298-69c1-be6f-3e40-75af1bc72d9e@infradead.org> (raw)
In-Reply-To: <20200305220127.29109-1-kpsingh@chromium.org>
On 3/5/20 2:01 PM, KP Singh wrote:
> From: KP Singh <kpsingh@google.com>
>
> test_run.o is not built when CONFIG_NET is not set and
> bpf_prog_test_run_tracing being referenced in bpf_trace.o causes the
> linker error:
>
> ld: kernel/trace/bpf_trace.o:(.rodata+0x38): undefined reference to
> `bpf_prog_test_run_tracing'
>
> Add a __weak function in bpf_trace.c to handle this.
>
> Fixes: da00d2f117a0 ("bpf: Add test ops for BPF_PROG_TYPE_TRACING")
> Signed-off-by: KP Singh <kpsingh@google.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Thanks.
> ---
> kernel/trace/bpf_trace.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
> index 363e0a2c75cf..6a490d8ce9de 100644
> --- a/kernel/trace/bpf_trace.c
> +++ b/kernel/trace/bpf_trace.c
> @@ -1252,6 +1252,13 @@ static bool tracing_prog_is_valid_access(int off, int size,
> return btf_ctx_access(off, size, type, prog, info);
> }
>
> +int __weak bpf_prog_test_run_tracing(struct bpf_prog *prog,
> + const union bpf_attr *kattr,
> + union bpf_attr __user *uattr)
> +{
> + return -ENOTSUPP;
> +}
> +
> const struct bpf_verifier_ops raw_tracepoint_verifier_ops = {
> .get_func_proto = raw_tp_prog_func_proto,
> .is_valid_access = raw_tp_prog_is_valid_access,
>
--
~Randy
next prev parent reply other threads:[~2020-03-05 23:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 22:01 [PATCH bpf-next] bpf: Fix bpf_prog_test_run_tracing for !CONFIG_NET KP Singh
2020-03-05 22:43 ` Alexei Starovoitov
2020-03-05 23:12 ` Randy Dunlap [this message]
2020-03-05 23:16 ` Alexei Starovoitov
2020-03-05 23:22 ` KP Singh
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=92937298-69c1-be6f-3e40-75af1bc72d9e@infradead.org \
--to=rdunlap@infradead.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jackmanb@chromium.org \
--cc=kpsingh@chromium.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=revest@chromium.org \
--cc=sfr@canb.auug.org.au \
/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).