* [PATCH bpf-next] bpf: Fix bpf_prog_test_run_tracing for !CONFIG_NET
@ 2020-03-05 22:01 KP Singh
2020-03-05 22:43 ` Alexei Starovoitov
2020-03-05 23:12 ` Randy Dunlap
0 siblings, 2 replies; 5+ messages in thread
From: KP Singh @ 2020-03-05 22:01 UTC (permalink / raw)
To: linux-security-module, linux-next, bpf
Cc: Alexei Starovoitov, Daniel Borkmann, Randy Dunlap,
Stephen Rothwell, Florent Revest, Brendan Jackman
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>
---
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,
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH bpf-next] bpf: Fix bpf_prog_test_run_tracing for !CONFIG_NET
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
1 sibling, 0 replies; 5+ messages in thread
From: Alexei Starovoitov @ 2020-03-05 22:43 UTC (permalink / raw)
To: KP Singh
Cc: linux-security-module, linux-next, bpf, Alexei Starovoitov,
Daniel Borkmann, Randy Dunlap, Stephen Rothwell, Florent Revest,
Brendan Jackman
On Thu, Mar 05, 2020 at 11:01:27PM +0100, 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>
Applied. Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH bpf-next] bpf: Fix bpf_prog_test_run_tracing for !CONFIG_NET
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
2020-03-05 23:16 ` Alexei Starovoitov
1 sibling, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2020-03-05 23:12 UTC (permalink / raw)
To: KP Singh, linux-security-module, linux-next, bpf
Cc: Alexei Starovoitov, Daniel Borkmann, Stephen Rothwell,
Florent Revest, Brendan Jackman
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH bpf-next] bpf: Fix bpf_prog_test_run_tracing for !CONFIG_NET
2020-03-05 23:12 ` Randy Dunlap
@ 2020-03-05 23:16 ` Alexei Starovoitov
2020-03-05 23:22 ` KP Singh
0 siblings, 1 reply; 5+ messages in thread
From: Alexei Starovoitov @ 2020-03-05 23:16 UTC (permalink / raw)
To: Randy Dunlap
Cc: KP Singh, LSM List, Linux-Next Mailing List, bpf,
Alexei Starovoitov, Daniel Borkmann, Stephen Rothwell,
Florent Revest, Brendan Jackman
On Thu, Mar 5, 2020 at 3:12 PM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> 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
Since it was at the top of the tree I amended the commit
with your tags.
Thanks for reporting and testing.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH bpf-next] bpf: Fix bpf_prog_test_run_tracing for !CONFIG_NET
2020-03-05 23:16 ` Alexei Starovoitov
@ 2020-03-05 23:22 ` KP Singh
0 siblings, 0 replies; 5+ messages in thread
From: KP Singh @ 2020-03-05 23:22 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: Randy Dunlap, LSM List, Linux-Next Mailing List, bpf,
Alexei Starovoitov, Daniel Borkmann, Stephen Rothwell,
Florent Revest, Brendan Jackman
On Fri, Mar 6, 2020 at 12:16 AM Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
>
> On Thu, Mar 5, 2020 at 3:12 PM Randy Dunlap <rdunlap@infradead.org> wrote:
> >
> > 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>
Thanks!
Apologies, I should have added the "Reported-by:" tag.
- KP
> > Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
>
> Since it was at the top of the tree I amended the commit
> with your tags.
> Thanks for reporting and testing.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-05 23:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2020-03-05 23:16 ` Alexei Starovoitov
2020-03-05 23:22 ` KP Singh
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).