Fix the following warnings seen with "make W=1":
kernel/sysctl.c:183:13: warning: no previous prototype for ‘unpriv_ebpf_notify’ [-Wmissing-prototypes]
183 | void __weak unpriv_ebpf_notify(int new_state)
| ^~~~~~~~~~~~~~~~~~
arch/x86/kernel/cpu/bugs.c:659:6: warning: no previous prototype for ‘unpriv_ebpf_notify’ [-Wmissing-prototypes]
659 | void unpriv_ebpf_notify(int new_state)
| ^~~~~~~~~~~~~~~~~~
Fixes: 44a3918c8245 ("x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Josh Poimboeuf <[email protected]>
---
include/linux/bpf.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index bdb5298735ce..ecc3d3ec41cf 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -2085,6 +2085,8 @@ void bpf_offload_dev_netdev_unregister(struct bpf_offload_dev *offdev,
struct net_device *netdev);
bool bpf_offload_dev_match(struct bpf_prog *prog, struct net_device *netdev);
+void unpriv_ebpf_notify(int new_state);
+
#if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)
int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr);
--
2.34.1
On Tue, Apr 26, 2022 at 6:36 AM Borislav Petkov <[email protected]> wrote:
>
> + [email protected]
>
> Let's sync with bpf folks on who takes this. I could route it through tip ...
I don't remember seeing the original patch on the bpf list.
I'm guessing it was done in private as part of bhb series?
Feel free to land it via tip.
Hopefully there will be no conflicts.
> On Mon, Apr 25, 2022 at 04:40:02PM -0700, Josh Poimboeuf wrote:
> > Fix the following warnings seen with "make W=1":
> >
> > kernel/sysctl.c:183:13: warning: no previous prototype for ‘unpriv_ebpf_notify’ [-Wmissing-prototypes]
> > 183 | void __weak unpriv_ebpf_notify(int new_state)
> > | ^~~~~~~~~~~~~~~~~~
> >
> > arch/x86/kernel/cpu/bugs.c:659:6: warning: no previous prototype for ‘unpriv_ebpf_notify’ [-Wmissing-prototypes]
> > 659 | void unpriv_ebpf_notify(int new_state)
> > | ^~~~~~~~~~~~~~~~~~
> >
> > Fixes: 44a3918c8245 ("x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting")
> > Reported-by: kernel test robot <[email protected]>
> > Signed-off-by: Josh Poimboeuf <[email protected]>
> > ---
> > include/linux/bpf.h | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/include/linux/bpf.h b/include/linux/bpf.h
> > index bdb5298735ce..ecc3d3ec41cf 100644
> > --- a/include/linux/bpf.h
> > +++ b/include/linux/bpf.h
> > @@ -2085,6 +2085,8 @@ void bpf_offload_dev_netdev_unregister(struct bpf_offload_dev *offdev,
> > struct net_device *netdev);
> > bool bpf_offload_dev_match(struct bpf_prog *prog, struct net_device *netdev);
> >
> > +void unpriv_ebpf_notify(int new_state);
> > +
> > #if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)
> > int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr);
> >
> > --
>
> --
> Regards/Gruss,
> Boris.
>
> https://people.kernel.org/tglx/notes-about-netiquette
+ [email protected]
Let's sync with bpf folks on who takes this. I could route it through tip ...
On Mon, Apr 25, 2022 at 04:40:02PM -0700, Josh Poimboeuf wrote:
> Fix the following warnings seen with "make W=1":
>
> kernel/sysctl.c:183:13: warning: no previous prototype for ‘unpriv_ebpf_notify’ [-Wmissing-prototypes]
> 183 | void __weak unpriv_ebpf_notify(int new_state)
> | ^~~~~~~~~~~~~~~~~~
>
> arch/x86/kernel/cpu/bugs.c:659:6: warning: no previous prototype for ‘unpriv_ebpf_notify’ [-Wmissing-prototypes]
> 659 | void unpriv_ebpf_notify(int new_state)
> | ^~~~~~~~~~~~~~~~~~
>
> Fixes: 44a3918c8245 ("x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting")
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Josh Poimboeuf <[email protected]>
> ---
> include/linux/bpf.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/bpf.h b/include/linux/bpf.h
> index bdb5298735ce..ecc3d3ec41cf 100644
> --- a/include/linux/bpf.h
> +++ b/include/linux/bpf.h
> @@ -2085,6 +2085,8 @@ void bpf_offload_dev_netdev_unregister(struct bpf_offload_dev *offdev,
> struct net_device *netdev);
> bool bpf_offload_dev_match(struct bpf_prog *prog, struct net_device *netdev);
>
> +void unpriv_ebpf_notify(int new_state);
> +
> #if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)
> int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr);
>
> --
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
On Tue, Apr 26, 2022 at 04:36:08PM -0700, Alexei Starovoitov wrote:
> I don't remember seeing the original patch on the bpf list.
> I'm guessing it was done in private as part of bhb series?
Yap.
> Feel free to land it via tip.
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 2147c438fde135d6c145a96e373d9348e7076f7f
Gitweb: https://git.kernel.org/tip/2147c438fde135d6c145a96e373d9348e7076f7f
Author: Josh Poimboeuf <[email protected]>
AuthorDate: Mon, 25 Apr 2022 16:40:02 -07:00
Committer: Borislav Petkov <[email protected]>
CommitterDate: Thu, 28 Apr 2022 11:12:17 +02:00
x86/speculation: Add missing prototype for unpriv_ebpf_notify()
Fix the following warnings seen with "make W=1":
kernel/sysctl.c:183:13: warning: no previous prototype for ‘unpriv_ebpf_notify’ [-Wmissing-prototypes]
183 | void __weak unpriv_ebpf_notify(int new_state)
| ^~~~~~~~~~~~~~~~~~
arch/x86/kernel/cpu/bugs.c:659:6: warning: no previous prototype for ‘unpriv_ebpf_notify’ [-Wmissing-prototypes]
659 | void unpriv_ebpf_notify(int new_state)
| ^~~~~~~~~~~~~~~~~~
Fixes: 44a3918c8245 ("x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Josh Poimboeuf <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Link: https://lore.kernel.org/r/5689d065f739602ececaee1e05e68b8644009608.1650930000.git.jpoimboe@redhat.com
---
include/linux/bpf.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index bdb5298..ecc3d3e 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -2085,6 +2085,8 @@ void bpf_offload_dev_netdev_unregister(struct bpf_offload_dev *offdev,
struct net_device *netdev);
bool bpf_offload_dev_match(struct bpf_prog *prog, struct net_device *netdev);
+void unpriv_ebpf_notify(int new_state);
+
#if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)
int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr);