* [PATCH bpf-next] bpf, netns: Fix build without CONFIG_INET
@ 2020-07-21 10:07 Jakub Sitnicki
2020-07-21 14:00 ` Randy Dunlap
0 siblings, 1 reply; 3+ messages in thread
From: Jakub Sitnicki @ 2020-07-21 10:07 UTC (permalink / raw)
To: bpf
Cc: netdev, kernel-team, Alexei Starovoitov, Daniel Borkmann,
Randy Dunlap, Stephen Rothwell
When CONFIG_NET is set but CONFIG_INET isn't, build fails with:
ld: kernel/bpf/net_namespace.o: in function `netns_bpf_attach_type_unneed':
kernel/bpf/net_namespace.c:32: undefined reference to `bpf_sk_lookup_enabled'
ld: kernel/bpf/net_namespace.o: in function `netns_bpf_attach_type_need':
kernel/bpf/net_namespace.c:43: undefined reference to `bpf_sk_lookup_enabled'
This is because without CONFIG_INET bpf_sk_lookup_enabled symbol is not
available. Wrap references to bpf_sk_lookup_enabled with preprocessor
conditionals.
Fixes: 1559b4aa1db4 ("inet: Run SK_LOOKUP BPF program on socket lookup")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
---
kernel/bpf/net_namespace.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/bpf/net_namespace.c b/kernel/bpf/net_namespace.c
index 4e1bcaa2c3cb..71405edd667c 100644
--- a/kernel/bpf/net_namespace.c
+++ b/kernel/bpf/net_namespace.c
@@ -28,9 +28,11 @@ DEFINE_MUTEX(netns_bpf_mutex);
static void netns_bpf_attach_type_unneed(enum netns_bpf_attach_type type)
{
switch (type) {
+#ifdef CONFIG_INET
case NETNS_BPF_SK_LOOKUP:
static_branch_dec(&bpf_sk_lookup_enabled);
break;
+#endif
default:
break;
}
@@ -39,9 +41,11 @@ static void netns_bpf_attach_type_unneed(enum netns_bpf_attach_type type)
static void netns_bpf_attach_type_need(enum netns_bpf_attach_type type)
{
switch (type) {
+#ifdef CONFIG_INET
case NETNS_BPF_SK_LOOKUP:
static_branch_inc(&bpf_sk_lookup_enabled);
break;
+#endif
default:
break;
}
--
2.25.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] bpf, netns: Fix build without CONFIG_INET
2020-07-21 10:07 [PATCH bpf-next] bpf, netns: Fix build without CONFIG_INET Jakub Sitnicki
@ 2020-07-21 14:00 ` Randy Dunlap
2020-07-21 16:14 ` Alexei Starovoitov
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2020-07-21 14:00 UTC (permalink / raw)
To: Jakub Sitnicki, bpf
Cc: netdev, kernel-team, Alexei Starovoitov, Daniel Borkmann,
Stephen Rothwell
On 7/21/20 3:07 AM, Jakub Sitnicki wrote:
> When CONFIG_NET is set but CONFIG_INET isn't, build fails with:
>
> ld: kernel/bpf/net_namespace.o: in function `netns_bpf_attach_type_unneed':
> kernel/bpf/net_namespace.c:32: undefined reference to `bpf_sk_lookup_enabled'
> ld: kernel/bpf/net_namespace.o: in function `netns_bpf_attach_type_need':
> kernel/bpf/net_namespace.c:43: undefined reference to `bpf_sk_lookup_enabled'
>
> This is because without CONFIG_INET bpf_sk_lookup_enabled symbol is not
> available. Wrap references to bpf_sk_lookup_enabled with preprocessor
> conditionals.
>
> Fixes: 1559b4aa1db4 ("inet: Run SK_LOOKUP BPF program on socket lookup")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Thanks.
> ---
> kernel/bpf/net_namespace.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/kernel/bpf/net_namespace.c b/kernel/bpf/net_namespace.c
> index 4e1bcaa2c3cb..71405edd667c 100644
> --- a/kernel/bpf/net_namespace.c
> +++ b/kernel/bpf/net_namespace.c
> @@ -28,9 +28,11 @@ DEFINE_MUTEX(netns_bpf_mutex);
> static void netns_bpf_attach_type_unneed(enum netns_bpf_attach_type type)
> {
> switch (type) {
> +#ifdef CONFIG_INET
> case NETNS_BPF_SK_LOOKUP:
> static_branch_dec(&bpf_sk_lookup_enabled);
> break;
> +#endif
> default:
> break;
> }
> @@ -39,9 +41,11 @@ static void netns_bpf_attach_type_unneed(enum netns_bpf_attach_type type)
> static void netns_bpf_attach_type_need(enum netns_bpf_attach_type type)
> {
> switch (type) {
> +#ifdef CONFIG_INET
> case NETNS_BPF_SK_LOOKUP:
> static_branch_inc(&bpf_sk_lookup_enabled);
> break;
> +#endif
> default:
> break;
> }
>
--
~Randy
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] bpf, netns: Fix build without CONFIG_INET
2020-07-21 14:00 ` Randy Dunlap
@ 2020-07-21 16:14 ` Alexei Starovoitov
0 siblings, 0 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2020-07-21 16:14 UTC (permalink / raw)
To: Randy Dunlap
Cc: Jakub Sitnicki, bpf, Network Development, kernel-team,
Alexei Starovoitov, Daniel Borkmann, Stephen Rothwell
On Tue, Jul 21, 2020 at 7:01 AM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> On 7/21/20 3:07 AM, Jakub Sitnicki wrote:
> > When CONFIG_NET is set but CONFIG_INET isn't, build fails with:
> >
> > ld: kernel/bpf/net_namespace.o: in function `netns_bpf_attach_type_unneed':
> > kernel/bpf/net_namespace.c:32: undefined reference to `bpf_sk_lookup_enabled'
> > ld: kernel/bpf/net_namespace.o: in function `netns_bpf_attach_type_need':
> > kernel/bpf/net_namespace.c:43: undefined reference to `bpf_sk_lookup_enabled'
> >
> > This is because without CONFIG_INET bpf_sk_lookup_enabled symbol is not
> > available. Wrap references to bpf_sk_lookup_enabled with preprocessor
> > conditionals.
> >
> > Fixes: 1559b4aa1db4 ("inet: Run SK_LOOKUP BPF program on socket lookup")
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
>
> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Applied. Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-21 16:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-21 10:07 [PATCH bpf-next] bpf, netns: Fix build without CONFIG_INET Jakub Sitnicki
2020-07-21 14:00 ` Randy Dunlap
2020-07-21 16:14 ` Alexei Starovoitov
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).