From 45c1ceefc7b3bebf494288425ed3046480dfb191 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 15 Dec 2019 21:25:29 -0500 Subject: [PATCH] fixes for 4.19 Signed-off-by: Sasha Levin --- ...ang-warnings-around-setjmp-and-longj.patch | 80 ++++++++++ .../powerpc-fix-vdso-clock_getres.patch | 138 ++++++++++++++++++ queue-4.19/series | 2 + 3 files changed, 220 insertions(+) create mode 100644 queue-4.19/powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch create mode 100644 queue-4.19/powerpc-fix-vdso-clock_getres.patch diff --git a/queue-4.19/powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch b/queue-4.19/powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch new file mode 100644 index 00000000000..9ee03d1b918 --- /dev/null +++ b/queue-4.19/powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch @@ -0,0 +1,80 @@ +From 6c9743d84823a1881533d61f2f20003939c577af Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 Nov 2019 21:57:11 -0700 +Subject: powerpc: Avoid clang warnings around setjmp and longjmp + +From: Nathan Chancellor + +[ Upstream commit c9029ef9c95765e7b63c4d9aa780674447db1ec0 ] + +Commit aea447141c7e ("powerpc: Disable -Wbuiltin-requires-header when +setjmp is used") disabled -Wbuiltin-requires-header because of a +warning about the setjmp and longjmp declarations. + +r367387 in clang added another diagnostic around this, complaining +that there is no jmp_buf declaration. + + In file included from ../arch/powerpc/xmon/xmon.c:47: + ../arch/powerpc/include/asm/setjmp.h:10:13: error: declaration of + built-in function 'setjmp' requires the declaration of the 'jmp_buf' + type, commonly provided in the header . + [-Werror,-Wincomplete-setjmp-declaration] + extern long setjmp(long *); + ^ + ../arch/powerpc/include/asm/setjmp.h:11:13: error: declaration of + built-in function 'longjmp' requires the declaration of the 'jmp_buf' + type, commonly provided in the header . + [-Werror,-Wincomplete-setjmp-declaration] + extern void longjmp(long *, long); + ^ + 2 errors generated. + +We are not using the standard library's longjmp/setjmp implementations +for obvious reasons; make this clear to clang by using -ffreestanding +on these files. + +Cc: stable@vger.kernel.org # 4.14+ +Suggested-by: Segher Boessenkool +Reviewed-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20191119045712.39633-3-natechancellor@gmail.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/Makefile | 4 ++-- + arch/powerpc/xmon/Makefile | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile +index eac18790d1b15..d450280e5c29c 100644 +--- a/arch/powerpc/kernel/Makefile ++++ b/arch/powerpc/kernel/Makefile +@@ -5,8 +5,8 @@ + + CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' + +-# Disable clang warning for using setjmp without setjmp.h header +-CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) ++# Avoid clang warnings around longjmp/setjmp declarations ++CFLAGS_crash.o += -ffreestanding + + subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror + +diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile +index 9ba44e190e5e4..365e711bebabb 100644 +--- a/arch/powerpc/xmon/Makefile ++++ b/arch/powerpc/xmon/Makefile +@@ -1,8 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + # Makefile for xmon + +-# Disable clang warning for using setjmp without setjmp.h header +-subdir-ccflags-y := $(call cc-disable-warning, builtin-requires-header) ++# Avoid clang warnings around longjmp/setjmp declarations ++subdir-ccflags-y := -ffreestanding + + subdir-ccflags-$(CONFIG_PPC_WERROR) += -Werror + +-- +2.20.1 + diff --git a/queue-4.19/powerpc-fix-vdso-clock_getres.patch b/queue-4.19/powerpc-fix-vdso-clock_getres.patch new file mode 100644 index 00000000000..fbdfdf7ca8e --- /dev/null +++ b/queue-4.19/powerpc-fix-vdso-clock_getres.patch @@ -0,0 +1,138 @@ +From f7b8087c510a41298ad40bd78c011fbb7b71b578 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 Dec 2019 07:57:29 +0000 +Subject: powerpc: Fix vDSO clock_getres() + +From: Vincenzo Frascino + +[ Upstream commit 552263456215ada7ee8700ce022d12b0cffe4802 ] + +clock_getres in the vDSO library has to preserve the same behaviour +of posix_get_hrtimer_res(). + +In particular, posix_get_hrtimer_res() does: + sec = 0; + ns = hrtimer_resolution; +and hrtimer_resolution depends on the enablement of the high +resolution timers that can happen either at compile or at run time. + +Fix the powerpc vdso implementation of clock_getres keeping a copy of +hrtimer_resolution in vdso data and using that directly. + +Fixes: a7f290dad32e ("[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel") +Cc: stable@vger.kernel.org +Signed-off-by: Vincenzo Frascino +Reviewed-by: Christophe Leroy +Acked-by: Shuah Khan +[chleroy: changed CLOCK_REALTIME_RES to CLOCK_HRTIMER_RES] +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/a55eca3a5e85233838c2349783bcb5164dae1d09.1575273217.git.christophe.leroy@c-s.fr +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/vdso_datapage.h | 2 ++ + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- + arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- + 5 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h +index bbc06bd72b1f2..4333b9a473dc4 100644 +--- a/arch/powerpc/include/asm/vdso_datapage.h ++++ b/arch/powerpc/include/asm/vdso_datapage.h +@@ -86,6 +86,7 @@ struct vdso_data { + __s32 wtom_clock_nsec; /* Wall to monotonic clock nsec */ + __s64 wtom_clock_sec; /* Wall to monotonic clock sec */ + struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */ ++ __u32 hrtimer_res; /* hrtimer resolution */ + __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */ + __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ + }; +@@ -107,6 +108,7 @@ struct vdso_data { + __s32 wtom_clock_nsec; + struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */ + __u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */ ++ __u32 hrtimer_res; /* hrtimer resolution */ + __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ + __u32 dcache_block_size; /* L1 d-cache block size */ + __u32 icache_block_size; /* L1 i-cache block size */ +diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c +index 7c3738d890e8b..50400f213bbf2 100644 +--- a/arch/powerpc/kernel/asm-offsets.c ++++ b/arch/powerpc/kernel/asm-offsets.c +@@ -379,6 +379,7 @@ int main(void) + OFFSET(WTOM_CLOCK_NSEC, vdso_data, wtom_clock_nsec); + OFFSET(STAMP_XTIME, vdso_data, stamp_xtime); + OFFSET(STAMP_SEC_FRAC, vdso_data, stamp_sec_fraction); ++ OFFSET(CLOCK_HRTIMER_RES, vdso_data, hrtimer_res); + OFFSET(CFG_ICACHE_BLOCKSZ, vdso_data, icache_block_size); + OFFSET(CFG_DCACHE_BLOCKSZ, vdso_data, dcache_block_size); + OFFSET(CFG_ICACHE_LOGBLOCKSZ, vdso_data, icache_log_block_size); +@@ -409,7 +410,6 @@ int main(void) + DEFINE(CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE); + DEFINE(CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE); + DEFINE(NSEC_PER_SEC, NSEC_PER_SEC); +- DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC); + + #ifdef CONFIG_BUG + DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); +diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c +index 7707990c4c169..8487ad6864621 100644 +--- a/arch/powerpc/kernel/time.c ++++ b/arch/powerpc/kernel/time.c +@@ -929,6 +929,7 @@ void update_vsyscall(struct timekeeper *tk) + vdso_data->wtom_clock_nsec = tk->wall_to_monotonic.tv_nsec; + vdso_data->stamp_xtime = xt; + vdso_data->stamp_sec_fraction = frac_sec; ++ vdso_data->hrtimer_res = hrtimer_resolution; + smp_wmb(); + ++(vdso_data->tb_update_count); + } +diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S +index afd516b572f86..49eecd28aef1e 100644 +--- a/arch/powerpc/kernel/vdso32/gettimeofday.S ++++ b/arch/powerpc/kernel/vdso32/gettimeofday.S +@@ -160,12 +160,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) + cror cr0*4+eq,cr0*4+eq,cr1*4+eq + bne cr0,99f + ++ mflr r12 ++ .cfi_register lr,r12 ++ bl __get_datapage@local /* get data page */ ++ lwz r5, CLOCK_HRTIMER_RES(r3) ++ mtlr r12 + li r3,0 + cmpli cr0,r4,0 + crclr cr0*4+so + beqlr +- lis r5,CLOCK_REALTIME_RES@h +- ori r5,r5,CLOCK_REALTIME_RES@l + stw r3,TSPC32_TV_SEC(r4) + stw r5,TSPC32_TV_NSEC(r4) + blr +diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S +index 1f324c28705bc..020e90d1079dd 100644 +--- a/arch/powerpc/kernel/vdso64/gettimeofday.S ++++ b/arch/powerpc/kernel/vdso64/gettimeofday.S +@@ -190,12 +190,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) + cror cr0*4+eq,cr0*4+eq,cr1*4+eq + bne cr0,99f + ++ mflr r12 ++ .cfi_register lr,r12 ++ bl V_LOCAL_FUNC(__get_datapage) ++ lwz r5, CLOCK_HRTIMER_RES(r3) ++ mtlr r12 + li r3,0 + cmpldi cr0,r4,0 + crclr cr0*4+so + beqlr +- lis r5,CLOCK_REALTIME_RES@h +- ori r5,r5,CLOCK_REALTIME_RES@l + std r3,TSPC64_TV_SEC(r4) + std r5,TSPC64_TV_NSEC(r4) + blr +-- +2.20.1 + diff --git a/queue-4.19/series b/queue-4.19/series index 5dea7c32d1e..3b5c262015d 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -126,3 +126,5 @@ mlxsw-spectrum_router-refresh-nexthop-neighbour-when.patch media-vimc-fix-component-match-compare.patch ath10k-fix-fw-crash-by-moving-chip-reset-after-napi-.patch regulator-88pm800-fix-warning-same-module-names.patch +powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch +powerpc-fix-vdso-clock_getres.patch -- 2.47.3