x86: vdso: sanitize asm helpers for vgetcpu.c
Subsystems (3)
PATCH 1/1 x86: vdso: sanitize asm helpers for vgetcpu.c
From: Arnd Bergmann <[email protected]>
The x86 vdso implementation includes a few include/linux/*.h kernel headers outside of the include/vdso/*.h space. This causes a new warning when building with clang, after the vgetcpu code is added to the vdso32 support on 64-bit kernels:
In file included from arch/x86/entry/vdso/vdso32/vgetcpu.c:2:
In file included from arch/x86/entry/vdso/vdso32/../vgetcpu.c:8:
In file included from include/linux/kernel.h:22:
In file included from include/linux/bitops.h:68:
In file included from arch/x86/include/asm/bitops.h:420:arch/x86/include/asm/arch_hweight.h:49:15: error: invalid input size for constraint 'D'
: REG_IN (w));
^In file included from arch/x86/entry/vdso/vdso32/vgetcpu.c:2:
In file included from arch/x86/entry/vdso/vdso32/../vgetcpu.c:8:
In file included from include/linux/kernel.h:25:
In file included from include/linux/math.h:6:arch/x86/include/asm/div64.h:85:34: error: invalid output size for constraint '=a'
asm ("mulq %2; divq %3" : "=a" (q)
^Unlike gcc, clang checks inline asm constraints before dead code elimination, which breaks both __arch_hweight64() and mul_u64_u64_div_u64() when these are included with CONFIG_64BIT set but compiled with clang -m32, even when there are no callers.
Change both affected headers to the check for 32-bit vs 64-bit is done correctly for vdso32. It would be nice to also limit the included headers further, to avoid subtle differences in the header contents, but that requires a larger cleanup.
--- arch/x86/entry/vdso/vdso32/vgetcpu.c | 2 ++ arch/x86/include/asm/arch_hweight.h | 4 ++-- arch/x86/include/asm/div64.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
arch/x86/entry/vdso/vdso32/vgetcpu.c +2 -0
@@ -1,2 +1,4 @@// SPDX-License-Identifier: GPL-2.0 +#define BUILD_VDSO32 +#include "../vgetcpu.c"
arch/x86/include/asm/arch_hweight.h +2 -2
@@ -4,7 +4,7 @@#include <asm/cpufeatures.h> -#ifdef CONFIG_64BIT +#if defined(CONFIG_64BIT ) && !defined(BUILD_VDSO32 )#define REG_IN "D"#define REG_OUT "a"#else
@@ -33,7 +33,7 @@ static inline unsigned int __arch_hweight8(unsigned int w)return __arch_hweight32 (w &0xff ); } -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86_32 ) || defined(BUILD_VDSO32 )static inline unsigned long __arch_hweight64 (__u64 w) { return __arch_hweight32((u32)w) +
arch/x86/include/asm/div64.h +1 -1
@@ -2,7 +2,7 @@#ifndef _ASM_X86_DIV64_H#define _ASM_X86_DIV64_H -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86_32 ) || defined(BUILD_VDSO32 )#include <linux/types.h> #include <linux/log2.h>
Signature · 1 line
2.39.1
Borislav Petkov
maintainerQuoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The x86 vdso implementation includes a few
include/linux/*.hkernel headers outside of theinclude/vdso/*.hspace. This causes a new warning when building with clang, after the vgetcpu code is added to the vdso32 support on 64-bit kernels:
...
https://lore.kernel.org/r/Y%[email protected]
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette