From: Daniel Borkmann <daniel@iogearbox.net>
To: Randy Dunlap <rdunlap@infradead.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
bpf <bpf@vger.kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>
Subject: Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)
Date: Tue, 25 May 2021 20:31:08 +0200 [thread overview]
Message-ID: <bd4198d8-f8d3-f2bb-0fcf-ecfb7ef41ca2@iogearbox.net> (raw)
In-Reply-To: <166d8da3-1f1f-c245-cc46-c40e12fb71ab@iogearbox.net>
Hi Randy,
On 5/25/21 8:26 PM, Daniel Borkmann wrote:
> On 5/25/21 7:30 PM, Randy Dunlap wrote:
>> On 5/18/21 10:02 AM, Randy Dunlap wrote:
>>> On 5/18/21 2:27 AM, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> Changes since 20210514:
>>>>
>>>
>>> on i386:
>>> # CONFIG_NET is not set
>>>
>>> ld: kernel/bpf/bpf_lsm.o: in function `bpf_lsm_func_proto':
>>> bpf_lsm.c:(.text+0x1a0): undefined reference to `bpf_sk_storage_get_proto'
>>> ld: bpf_lsm.c:(.text+0x1b8): undefined reference to `bpf_sk_storage_delete_proto'
>>>
>>>
>>> Full randconfig file is attached.
>>>
>>
>> Hi,
>> I am still seeing this build error in linux-next-20210525.
>
> Will take a look and get back.
This should resolve it:
diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c
index 5efb2b24012c..da471bf01b97 100644
--- a/kernel/bpf/bpf_lsm.c
+++ b/kernel/bpf/bpf_lsm.c
@@ -107,10 +107,12 @@ bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
return &bpf_inode_storage_get_proto;
case BPF_FUNC_inode_storage_delete:
return &bpf_inode_storage_delete_proto;
+#ifdef CONFIG_NET
case BPF_FUNC_sk_storage_get:
return &bpf_sk_storage_get_proto;
case BPF_FUNC_sk_storage_delete:
return &bpf_sk_storage_delete_proto;
+#endif /* CONFIG_NET */
case BPF_FUNC_spin_lock:
return &bpf_spin_lock_proto;
case BPF_FUNC_spin_unlock:
next prev parent reply other threads:[~2021-05-25 18:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 9:27 linux-next: Tree for May 18 Stephen Rothwell
2021-05-18 16:32 ` linux-next: Tree for May 18 (drivers/net/dsa/qca8k.c) Randy Dunlap
2021-05-18 16:43 ` Vladimir Oltean
2021-05-18 16:57 ` Randy Dunlap
2021-05-18 17:02 ` Vladimir Oltean
2021-05-18 17:33 ` Andrew Lunn
2021-05-18 18:53 ` John Crispin
2021-05-18 17:02 ` linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o) Randy Dunlap
2021-05-25 17:30 ` Randy Dunlap
2021-05-25 18:26 ` Daniel Borkmann
2021-05-25 18:31 ` Daniel Borkmann [this message]
2021-05-25 19:01 ` Randy Dunlap
2021-05-25 19:15 ` 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=bd4198d8-f8d3-f2bb-0fcf-ecfb7ef41ca2@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rdunlap@infradead.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).