On Mon, Jan 8, 2018 at 3:05 PM, kernelci.org bot bot@kernelci.org wrote:
stable-rc/linux-4.4.y build: 178 builds: 7 failed, 171 passed, 8 errors (v4.4.110-23-g49278737d445) Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.4.y/kernel/v4.4.110-23-g... Tree: stable-rc Branch: linux-4.4.y Git Describe: v4.4.110-23-g49278737d445 Git Commit: 49278737d4458032fb523dfe5451b441c04c5b73 Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Built: 4 unique architectures
Build Failures Detected:
x86: gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.5) allnoconfig FAIL i386_defconfig FAIL tinyconfig FAIL
I missed these earlier, since the kernelci summary output doesn't print link errors:
arch/x86/kernel/setup.o: In function `vsyscall_enabled': setup.c:(.text+0x10): multiple definition of `vsyscall_enabled' arch/x86/kernel/time.o:time.c:(.text+0x10): first defined here arch/x86/kernel/rtc.o: In function `vsyscall_enabled': rtc.c:(.text+0x0): multiple definition of `vsyscall_enabled' arch/x86/kernel/time.o:time.c:(.text+0x10): first defined here arch/x86/kernel/cpu/built-in.o: In function `vsyscall_enabled': (.text+0xbc0): multiple definition of `vsyscall_enabled'
This comes from 0cbf2b590bea ("Map the vsyscall page with _PAGE_USER") which adds a line 'bool vsyscall_enabled(void) { return false; }' that presumably should have been 'static inline'.
Arnd
On Mon, Jan 08, 2018 at 03:43:11PM +0100, Arnd Bergmann wrote:
This comes from 0cbf2b590bea ("Map the vsyscall page with _PAGE_USER") which adds a line 'bool vsyscall_enabled(void) { return false; }' that presumably should have been 'static inline'.
Yeah, thanks Arnd.
@Greg, please fold this in:
--- diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index d10cabb..4865e10 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -19,7 +19,7 @@ static inline bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) { return false; } -bool vsyscall_enabled(void) { return false; } +static inline bool vsyscall_enabled(void) { return false; } #endif
#endif /* _ASM_X86_VSYSCALL_H */ ---
On Mon, Jan 08, 2018 at 05:06:46PM +0100, Borislav Petkov wrote:
On Mon, Jan 08, 2018 at 03:43:11PM +0100, Arnd Bergmann wrote:
This comes from 0cbf2b590bea ("Map the vsyscall page with _PAGE_USER") which adds a line 'bool vsyscall_enabled(void) { return false; }' that presumably should have been 'static inline'.
Yeah, thanks Arnd.
@Greg, please fold this in:
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index d10cabb..4865e10 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -19,7 +19,7 @@ static inline bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) { return false; } -bool vsyscall_enabled(void) { return false; } +static inline bool vsyscall_enabled(void) { return false; } #endif
#endif /* _ASM_X86_VSYSCALL_H */
Now folded in, many thanks!
greg k-h
* Borislav Petkov bp@suse.de wrote:
On Mon, Jan 08, 2018 at 03:43:11PM +0100, Arnd Bergmann wrote:
This comes from 0cbf2b590bea ("Map the vsyscall page with _PAGE_USER") which adds a line 'bool vsyscall_enabled(void) { return false; }' that presumably should have been 'static inline'.
Yeah, thanks Arnd.
@Greg, please fold this in:
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index d10cabb..4865e10 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -19,7 +19,7 @@ static inline bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) { return false; } -bool vsyscall_enabled(void) { return false; } +static inline bool vsyscall_enabled(void) { return false; }
Hm, which are the underlying upstream commits - am I missing something?
Thanks,
Ingo
On Mon, Jan 08, 2018 at 06:36:50PM +0100, Ingo Molnar wrote:
Hm, which are the underlying upstream commits - am I missing something?
Yeah, 4.4 has taken the kaiser patches and thus no upstream commits. Thus this patch doesn't affect upstream as upstream has solved it differently:
49275fef986a ("x86/vsyscall/64: Explicitly set _PAGE_USER in the pagetable hierarchy")
linux-stable-mirror@lists.linaro.org