* [PATCH v1 -next] kasan: fix a missing header include of static_keys.h
@ 2022-03-01 15:45 Joey Gouly
2022-03-02 11:16 ` Catalin Marinas
2022-03-07 22:03 ` Will Deacon
0 siblings, 2 replies; 6+ messages in thread
From: Joey Gouly @ 2022-03-01 15:45 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: nd, catalin.marinas, mark.rutland, pcc, will, Joey Gouly
The kasan-enabled.h header relies on static keys, so make sure
to include the header to avoid compilation errors (with JUMP_LABEL=n).
It fixes the following:
./include/linux/kasan-enabled.h:9:1: warning: data definition has no type or storage class
9 | DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
| ^~~~~~~~~~~~~~~~~~~~~~~~
error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int]
Fixes: f9b5e46f4097 ("kasan: split kasan_*enabled() functions into a separate header")
Cc: Peter Collingbourne <pcc@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
---
include/linux/kasan-enabled.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h
index 4b6615375022..6f612d69ea0c 100644
--- a/include/linux/kasan-enabled.h
+++ b/include/linux/kasan-enabled.h
@@ -2,6 +2,8 @@
#ifndef _LINUX_KASAN_ENABLED_H
#define _LINUX_KASAN_ENABLED_H
+#include <linux/static_key.h>
+
#ifdef CONFIG_KASAN_HW_TAGS
DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v1 -next] kasan: fix a missing header include of static_keys.h
2022-03-01 15:45 [PATCH v1 -next] kasan: fix a missing header include of static_keys.h Joey Gouly
@ 2022-03-02 11:16 ` Catalin Marinas
2022-03-02 15:25 ` Andrey Konovalov
2022-03-07 22:03 ` Will Deacon
1 sibling, 1 reply; 6+ messages in thread
From: Catalin Marinas @ 2022-03-02 11:16 UTC (permalink / raw)
To: Joey Gouly; +Cc: linux-arm-kernel, nd, mark.rutland, pcc, will, andreyknvl
On Tue, Mar 01, 2022 at 03:45:18PM +0000, Joey Gouly wrote:
> The kasan-enabled.h header relies on static keys, so make sure
> to include the header to avoid compilation errors (with JUMP_LABEL=n).
>
> It fixes the following:
> ./include/linux/kasan-enabled.h:9:1: warning: data definition has no type or storage class
> 9 | DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int]
>
> Fixes: f9b5e46f4097 ("kasan: split kasan_*enabled() functions into a separate header")
> Cc: Peter Collingbourne <pcc@google.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> ---
> include/linux/kasan-enabled.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h
> index 4b6615375022..6f612d69ea0c 100644
> --- a/include/linux/kasan-enabled.h
> +++ b/include/linux/kasan-enabled.h
> @@ -2,6 +2,8 @@
> #ifndef _LINUX_KASAN_ENABLED_H
> #define _LINUX_KASAN_ENABLED_H
>
> +#include <linux/static_key.h>
> +
> #ifdef CONFIG_KASAN_HW_TAGS
>
> DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
The patch looks fine but you should cc the kasan maintainers (just run
the patch through scripts/get_maintainer.pl). Adding Andrey as he acked
the patch being fixed here.
--
Catalin
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 -next] kasan: fix a missing header include of static_keys.h
2022-03-02 11:16 ` Catalin Marinas
@ 2022-03-02 15:25 ` Andrey Konovalov
0 siblings, 0 replies; 6+ messages in thread
From: Andrey Konovalov @ 2022-03-02 15:25 UTC (permalink / raw)
To: Catalin Marinas, Joey Gouly
Cc: Linux ARM, nd, Mark Rutland, Peter Collingbourne, Will Deacon
On Wed, Mar 2, 2022 at 12:16 PM Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> On Tue, Mar 01, 2022 at 03:45:18PM +0000, Joey Gouly wrote:
> > The kasan-enabled.h header relies on static keys, so make sure
> > to include the header to avoid compilation errors (with JUMP_LABEL=n).
> >
> > It fixes the following:
> > ./include/linux/kasan-enabled.h:9:1: warning: data definition has no type or storage class
> > 9 | DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~
> > error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int]
> >
> > Fixes: f9b5e46f4097 ("kasan: split kasan_*enabled() functions into a separate header")
> > Cc: Peter Collingbourne <pcc@google.com>
> > Cc: Mark Rutland <mark.rutland@arm.com>
> > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > Cc: Will Deacon <will@kernel.org>
> > ---
> > include/linux/kasan-enabled.h | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h
> > index 4b6615375022..6f612d69ea0c 100644
> > --- a/include/linux/kasan-enabled.h
> > +++ b/include/linux/kasan-enabled.h
> > @@ -2,6 +2,8 @@
> > #ifndef _LINUX_KASAN_ENABLED_H
> > #define _LINUX_KASAN_ENABLED_H
> >
> > +#include <linux/static_key.h>
> > +
> > #ifdef CONFIG_KASAN_HW_TAGS
> >
> > DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
>
> The patch looks fine but you should cc the kasan maintainers (just run
> the patch through scripts/get_maintainer.pl). Adding Andrey as he acked
> the patch being fixed here.
Thanks, Catalin.
Assuming linux/static_key.h is low-level enough to be included into
arch/arm64/include/asm/mte.h via linux/kasan-enabled.h,
Acked-by: Andrey Konovalov <andreyknvl@gmail.com>
for the fix.
Thank you!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 -next] kasan: fix a missing header include of static_keys.h
2022-03-01 15:45 [PATCH v1 -next] kasan: fix a missing header include of static_keys.h Joey Gouly
2022-03-02 11:16 ` Catalin Marinas
@ 2022-03-07 22:03 ` Will Deacon
2022-03-09 9:49 ` Joey Gouly
1 sibling, 1 reply; 6+ messages in thread
From: Will Deacon @ 2022-03-07 22:03 UTC (permalink / raw)
To: Joey Gouly, linux-arm-kernel
Cc: catalin.marinas, kernel-team, Will Deacon, pcc, nd, mark.rutland
On Tue, 1 Mar 2022 15:45:18 +0000, Joey Gouly wrote:
> The kasan-enabled.h header relies on static keys, so make sure
> to include the header to avoid compilation errors (with JUMP_LABEL=n).
>
> It fixes the following:
> ./include/linux/kasan-enabled.h:9:1: warning: data definition has no type or storage class
> 9 | DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int]
>
> [...]
Applied to arm64 (for-next/mte), thanks!
[1/1] kasan: fix a missing header include of static_keys.h
https://git.kernel.org/arm64/c/1a7b2121ebd3
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 -next] kasan: fix a missing header include of static_keys.h
2022-03-07 22:03 ` Will Deacon
@ 2022-03-09 9:49 ` Joey Gouly
2022-03-09 12:14 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Joey Gouly @ 2022-03-09 9:49 UTC (permalink / raw)
To: Will Deacon
Cc: linux-arm-kernel, catalin.marinas, kernel-team, pcc, nd,
mark.rutland, sfr
Hi Will,
On Mon, Mar 07, 2022 at 10:03:30PM +0000, Will Deacon wrote:
> On Tue, 1 Mar 2022 15:45:18 +0000, Joey Gouly wrote:
> > The kasan-enabled.h header relies on static keys, so make sure
> > to include the header to avoid compilation errors (with JUMP_LABEL=n).
> >
> > It fixes the following:
> > ./include/linux/kasan-enabled.h:9:1: warning: data definition has no type or storage class
> > 9 | DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~
> > error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int]
> >
> > [...]
>
> Applied to arm64 (for-next/mte), thanks!
>
> [1/1] kasan: fix a missing header include of static_keys.h
> https://git.kernel.org/arm64/c/1a7b2121ebd3
I accidentally deleted my sign off when adding the Fixes tag, spotted when merging into next:
https://lore.kernel.org/lkml/20220309081719.54964469@canb.auug.org.au/
So here it is:
Signed-off-by: Joey Gouly <joey.gouly@arm.com>
Let me know if I should resend the patch, or what I should do.
Thanks,
Joey
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 -next] kasan: fix a missing header include of static_keys.h
2022-03-09 9:49 ` Joey Gouly
@ 2022-03-09 12:14 ` Will Deacon
0 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2022-03-09 12:14 UTC (permalink / raw)
To: Joey Gouly
Cc: linux-arm-kernel, catalin.marinas, kernel-team, pcc, nd,
mark.rutland, sfr
On Wed, Mar 09, 2022 at 09:49:07AM +0000, Joey Gouly wrote:
> Hi Will,
>
> On Mon, Mar 07, 2022 at 10:03:30PM +0000, Will Deacon wrote:
> > On Tue, 1 Mar 2022 15:45:18 +0000, Joey Gouly wrote:
> > > The kasan-enabled.h header relies on static keys, so make sure
> > > to include the header to avoid compilation errors (with JUMP_LABEL=n).
> > >
> > > It fixes the following:
> > > ./include/linux/kasan-enabled.h:9:1: warning: data definition has no type or storage class
> > > 9 | DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~
> > > error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int]
> > >
> > > [...]
> >
> > Applied to arm64 (for-next/mte), thanks!
> >
> > [1/1] kasan: fix a missing header include of static_keys.h
> > https://git.kernel.org/arm64/c/1a7b2121ebd3
>
> I accidentally deleted my sign off when adding the Fixes tag, spotted when merging into next:
> https://lore.kernel.org/lkml/20220309081719.54964469@canb.auug.org.au/
>
> So here it is:
> Signed-off-by: Joey Gouly <joey.gouly@arm.com>
Thanks, I'll add that to the patch.
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-09 12:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01 15:45 [PATCH v1 -next] kasan: fix a missing header include of static_keys.h Joey Gouly
2022-03-02 11:16 ` Catalin Marinas
2022-03-02 15:25 ` Andrey Konovalov
2022-03-07 22:03 ` Will Deacon
2022-03-09 9:49 ` Joey Gouly
2022-03-09 12:14 ` Will Deacon
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).