* Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)
[not found] <20210518192729.3131eab0@canb.auug.org.au>
@ 2021-05-18 17:02 ` Randy Dunlap
2021-05-25 17:30 ` Randy Dunlap
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2021-05-18 17:02 UTC (permalink / raw)
To: Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, netdev@vger.kernel.org, bpf,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
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.
--
~Randy
Reported-by: Randy Dunlap <rdunlap@infradead.org>
[-- Attachment #2: config-r9369.gz --]
[-- Type: application/gzip, Size: 34789 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)
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
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2021-05-25 17:30 UTC (permalink / raw)
To: Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, netdev@vger.kernel.org, bpf,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko
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.
--
~Randy
Reported-by: Randy Dunlap <rdunlap@infradead.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)
2021-05-25 17:30 ` Randy Dunlap
@ 2021-05-25 18:26 ` Daniel Borkmann
2021-05-25 18:31 ` Daniel Borkmann
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Borkmann @ 2021-05-25 18:26 UTC (permalink / raw)
To: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, netdev@vger.kernel.org, bpf,
Alexei Starovoitov, Andrii Nakryiko
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)
2021-05-25 18:26 ` Daniel Borkmann
@ 2021-05-25 18:31 ` Daniel Borkmann
2021-05-25 19:01 ` Randy Dunlap
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Borkmann @ 2021-05-25 18:31 UTC (permalink / raw)
To: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, netdev@vger.kernel.org, bpf,
Alexei Starovoitov, Andrii Nakryiko
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:
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)
2021-05-25 18:31 ` Daniel Borkmann
@ 2021-05-25 19:01 ` Randy Dunlap
2021-05-25 19:15 ` Daniel Borkmann
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2021-05-25 19:01 UTC (permalink / raw)
To: Daniel Borkmann, Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, netdev@vger.kernel.org, bpf,
Alexei Starovoitov, Andrii Nakryiko
On 5/25/21 11:31 AM, Daniel Borkmann wrote:
> 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:
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Thanks.
>
> 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:
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)
2021-05-25 19:01 ` Randy Dunlap
@ 2021-05-25 19:15 ` Daniel Borkmann
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Borkmann @ 2021-05-25 19:15 UTC (permalink / raw)
To: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, netdev@vger.kernel.org, bpf,
Alexei Starovoitov, Andrii Nakryiko
On 5/25/21 9:01 PM, Randy Dunlap wrote:
> On 5/25/21 11:31 AM, Daniel Borkmann wrote:
>> 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:
>
> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Thanks Randy, fix pushed here [0].
[0] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=3c9e8fec3c5a7833d891ac8e58fd9f6c2df0be91
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-25 19:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210518192729.3131eab0@canb.auug.org.au>
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
2021-05-25 19:01 ` Randy Dunlap
2021-05-25 19:15 ` Daniel Borkmann
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).