2022-03-17 03:38:50

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] arm64: fix clang warning about TRAMP_VALIAS

From: Arnd Bergmann <[email protected]>

The newly introduced TRAMP_VALIAS definition causes a build warning
with clang-14:

arch/arm64/include/asm/vectors.h:66:31: error: arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension [-Werror,-Wnull-pointer-arithmetic]
return (char *)TRAMP_VALIAS + SZ_2K * slot;

Change the addition to something clang does not complain about.

Fixes: bd09128d16fa ("arm64: Add percpu vectors for EL1")
Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm64/include/asm/vectors.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

I see this warning on 5.17-rc8, but did not test it on linux-next,
which may already have a fix.

diff --git a/arch/arm64/include/asm/vectors.h b/arch/arm64/include/asm/vectors.h
index f64613a96d53..bc9a2145f419 100644
--- a/arch/arm64/include/asm/vectors.h
+++ b/arch/arm64/include/asm/vectors.h
@@ -56,14 +56,14 @@ enum arm64_bp_harden_el1_vectors {
DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);

#ifndef CONFIG_UNMAP_KERNEL_AT_EL0
-#define TRAMP_VALIAS 0
+#define TRAMP_VALIAS 0ul
#endif

static inline const char *
arm64_get_bp_hardening_vector(enum arm64_bp_harden_el1_vectors slot)
{
if (arm64_kernel_unmapped_at_el0())
- return (char *)TRAMP_VALIAS + SZ_2K * slot;
+ return (char *)(TRAMP_VALIAS + SZ_2K * slot);

WARN_ON_ONCE(slot == EL1_VECTOR_KPTI);

--
2.29.2


2022-03-20 23:43:03

by Robin Murphy

[permalink] [raw]
Subject: Re: [PATCH] arm64: fix clang warning about TRAMP_VALIAS

On 2022-03-16 18:38, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The newly introduced TRAMP_VALIAS definition causes a build warning
> with clang-14:
>
> arch/arm64/include/asm/vectors.h:66:31: error: arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension [-Werror,-Wnull-pointer-arithmetic]

Tangentially, all the other GNU extensions we depend on throughout Linux
are also GNU extensions. Do we know what's special about this one?

Robin.

> return (char *)TRAMP_VALIAS + SZ_2K * slot;
>
> Change the addition to something clang does not complain about.
>
> Fixes: bd09128d16fa ("arm64: Add percpu vectors for EL1")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> arch/arm64/include/asm/vectors.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> I see this warning on 5.17-rc8, but did not test it on linux-next,
> which may already have a fix.
>
> diff --git a/arch/arm64/include/asm/vectors.h b/arch/arm64/include/asm/vectors.h
> index f64613a96d53..bc9a2145f419 100644
> --- a/arch/arm64/include/asm/vectors.h
> +++ b/arch/arm64/include/asm/vectors.h
> @@ -56,14 +56,14 @@ enum arm64_bp_harden_el1_vectors {
> DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);
>
> #ifndef CONFIG_UNMAP_KERNEL_AT_EL0
> -#define TRAMP_VALIAS 0
> +#define TRAMP_VALIAS 0ul
> #endif
>
> static inline const char *
> arm64_get_bp_hardening_vector(enum arm64_bp_harden_el1_vectors slot)
> {
> if (arm64_kernel_unmapped_at_el0())
> - return (char *)TRAMP_VALIAS + SZ_2K * slot;
> + return (char *)(TRAMP_VALIAS + SZ_2K * slot);
>
> WARN_ON_ONCE(slot == EL1_VECTOR_KPTI);
>

2022-03-21 03:08:33

by Nick Desaulniers

[permalink] [raw]
Subject: Re: [PATCH] arm64: fix clang warning about TRAMP_VALIAS

On Fri, Mar 18, 2022 at 12:11 PM Robin Murphy <[email protected]> wrote:
>
> On 2022-03-16 18:38, Arnd Bergmann wrote:
> > From: Arnd Bergmann <[email protected]>
> >
> > The newly introduced TRAMP_VALIAS definition causes a build warning
> > with clang-14:
> >
> > arch/arm64/include/asm/vectors.h:66:31: error: arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension [-Werror,-Wnull-pointer-arithmetic]
>
> Tangentially, all the other GNU extensions we depend on throughout Linux
> are also GNU extensions. Do we know what's special about this one?

My first thought is that -Wnull-pointer-arithmetic should be in the
-Wgnu flag group, such that -Wno-gnu (as set by Kbuild) implies
-Wno-null-pointer-arithmetic.

One issue seems to be that -Wnull-pointer-arithmetic seems to control
at least 2 different checks in clang.

https://godbolt.org/z/hdYYejj3d

So it's likely these two checks should have 2 distinct flags, such
that the warning we're observing can be grouped under -Wgnu.

Filed: https://github.com/llvm/llvm-project/issues/54444

>
> Robin.
>
> > return (char *)TRAMP_VALIAS + SZ_2K * slot;
> >
> > Change the addition to something clang does not complain about.
> >
> > Fixes: bd09128d16fa ("arm64: Add percpu vectors for EL1")
> > Signed-off-by: Arnd Bergmann <[email protected]>
> > ---
> > arch/arm64/include/asm/vectors.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > I see this warning on 5.17-rc8, but did not test it on linux-next,
> > which may already have a fix.
> >
> > diff --git a/arch/arm64/include/asm/vectors.h b/arch/arm64/include/asm/vectors.h
> > index f64613a96d53..bc9a2145f419 100644
> > --- a/arch/arm64/include/asm/vectors.h
> > +++ b/arch/arm64/include/asm/vectors.h
> > @@ -56,14 +56,14 @@ enum arm64_bp_harden_el1_vectors {
> > DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);
> >
> > #ifndef CONFIG_UNMAP_KERNEL_AT_EL0
> > -#define TRAMP_VALIAS 0
> > +#define TRAMP_VALIAS 0ul
> > #endif
> >
> > static inline const char *
> > arm64_get_bp_hardening_vector(enum arm64_bp_harden_el1_vectors slot)
> > {
> > if (arm64_kernel_unmapped_at_el0())
> > - return (char *)TRAMP_VALIAS + SZ_2K * slot;
> > + return (char *)(TRAMP_VALIAS + SZ_2K * slot);
> >
> > WARN_ON_ONCE(slot == EL1_VECTOR_KPTI);
> >



--
Thanks,
~Nick Desaulniers

2022-03-21 06:17:45

by Catalin Marinas

[permalink] [raw]
Subject: Re: [PATCH] arm64: fix clang warning about TRAMP_VALIAS

On Wed, 16 Mar 2022 19:38:18 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The newly introduced TRAMP_VALIAS definition causes a build warning
> with clang-14:
>
> arch/arm64/include/asm/vectors.h:66:31: error: arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension [-Werror,-Wnull-pointer-arithmetic]
> return (char *)TRAMP_VALIAS + SZ_2K * slot;
>
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64: fix clang warning about TRAMP_VALIAS
https://git.kernel.org/arm64/c/7f34b43e07cb

--
Catalin

2022-03-21 23:32:53

by James Morse

[permalink] [raw]
Subject: Re: [PATCH] arm64: fix clang warning about TRAMP_VALIAS

Hi Arnd,

On 3/16/22 6:38 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The newly introduced TRAMP_VALIAS definition causes a build warning
> with clang-14:
>
> arch/arm64/include/asm/vectors.h:66:31: error: arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension [-Werror,-Wnull-pointer-arithmetic]
> return (char *)TRAMP_VALIAS + SZ_2K * slot;

It is? Good to know!
(clang 11 doesn't seem to be so fussy)

Just for some more background:
TRAMP_VALIAS existed before, but it wasn't defined if KPTI is disabled at compile time, you can't
do that without CONFIG_EXPERT.
I thought these dummy definitions would be cleaner than #ifdef'ing the code.


> Change the addition to something clang does not complain about.

Acked-by: James Morse <[email protected]>


Thanks!

James



> I see this warning on 5.17-rc8, but did not test it on linux-next,
> which may already have a fix.
>
> diff --git a/arch/arm64/include/asm/vectors.h b/arch/arm64/include/asm/vectors.h
> index f64613a96d53..bc9a2145f419 100644
> --- a/arch/arm64/include/asm/vectors.h
> +++ b/arch/arm64/include/asm/vectors.h
> @@ -56,14 +56,14 @@ enum arm64_bp_harden_el1_vectors {
> DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);
>
> #ifndef CONFIG_UNMAP_KERNEL_AT_EL0
> -#define TRAMP_VALIAS 0
> +#define TRAMP_VALIAS 0ul
> #endif
>
> static inline const char *
> arm64_get_bp_hardening_vector(enum arm64_bp_harden_el1_vectors slot)
> {
> if (arm64_kernel_unmapped_at_el0())
> - return (char *)TRAMP_VALIAS + SZ_2K * slot;
> + return (char *)(TRAMP_VALIAS + SZ_2K * slot);
>
> WARN_ON_ONCE(slot == EL1_VECTOR_KPTI);
>
>

2022-03-23 08:50:52

by Nick Desaulniers

[permalink] [raw]
Subject: Re: [PATCH] arm64: fix clang warning about TRAMP_VALIAS

On Fri, Mar 18, 2022 at 12:52 PM Nick Desaulniers
<[email protected]> wrote:
>
> On Fri, Mar 18, 2022 at 12:11 PM Robin Murphy <[email protected]> wrote:
> >
> > On 2022-03-16 18:38, Arnd Bergmann wrote:
> > > From: Arnd Bergmann <[email protected]>
> > >
> > > The newly introduced TRAMP_VALIAS definition causes a build warning
> > > with clang-14:
> > >
> > > arch/arm64/include/asm/vectors.h:66:31: error: arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension [-Werror,-Wnull-pointer-arithmetic]
> >
> > Tangentially, all the other GNU extensions we depend on throughout Linux
> > are also GNU extensions. Do we know what's special about this one?
>
> My first thought is that -Wnull-pointer-arithmetic should be in the
> -Wgnu flag group, such that -Wno-gnu (as set by Kbuild) implies
> -Wno-null-pointer-arithmetic.
>
> One issue seems to be that -Wnull-pointer-arithmetic seems to control
> at least 2 different checks in clang.
>
> https://godbolt.org/z/hdYYejj3d
>
> So it's likely these two checks should have 2 distinct flags, such
> that the warning we're observing can be grouped under -Wgnu.
>
> Filed: https://github.com/llvm/llvm-project/issues/54444

Fix should be landing shortly:
https://reviews.llvm.org/D122224

--
Thanks,
~Nick Desaulniers