Disable compat cruft on ppc64le v11
v11 cover Disable compat cruft on ppc64le v11
Less code means less bugs so add a knob to skip the compat stuff.
Changes in v2: saner CONFIG_COMPAT ifdefs
Changes in v3:
- change llseek to 32bit instead of builing it unconditionally in fs
- clanup the makefile conditionals
- remove some ifdefs or convert to IS_DEFINED where possible
Changes in v4:
- cleanup is_32bit_task and current_is_64bit
- more makefile cleanup
Changes in v5:
- more current_is_64bit cleanup
- split off callchain.c 32bit and 64bit parts
Changes in v6:
- cleanup makefile after split
- consolidate read_user_stack_32
- fix some checkpatch warnings
Changes in v7:
- add back __ARCH_WANT_SYS_LLSEEK to fix build with llseek
- remove leftover hunk
- add review tags
Changes in v8:
- consolidate valid_user_sp to fix it in the split callchain.c
- fix build errors/warnings with PPC64 !COMPAT and PPC32
Changes in v9:
- remove current_is_64bit()
Chanegs in v10:
- rebase, sent together with the syscall cleanup
Changes in v11:
- rebase
- add MAINTAINERS pattern for ppc perf
Michal Suchanek (8):
powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro
powerpc: move common register copy functions from signal_32.c to
signal.c
powerpc/perf: consolidate read_user_stack_32 powerpc/perf: consolidate valid_user_sp
powerpc/64: make buildable without CONFIG_COMPAT powerpc/64: Make COMPAT user-selectable disabled on littleendian by
default.
powerpc/perf: split callchain.c by bitness
MAINTAINERS: perf: Add pattern that matches ppc perf to the perf
entry.
MAINTAINERS | 2 + arch/powerpc/Kconfig | 5 +- arch/powerpc/include/asm/thread_info.h | 4 +- arch/powerpc/include/asm/unistd.h | 1 + arch/powerpc/kernel/Makefile | 6 +- arch/powerpc/kernel/entry_64.S | 2 + arch/powerpc/kernel/signal.c | 144 +++++++++- arch/powerpc/kernel/signal_32.c | 140 ---------- arch/powerpc/kernel/syscall_64.c | 6 +- arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/perf/Makefile | 5 +- arch/powerpc/perf/callchain.c | 356 +------------------------ arch/powerpc/perf/callchain.h | 20 ++ arch/powerpc/perf/callchain_32.c | 196 ++++++++++++++ arch/powerpc/perf/callchain_64.c | 174 ++++++++++++ fs/read_write.c | 3 +- 16 files changed, 556 insertions(+), 511 deletions(-) create mode 100644 arch/powerpc/perf/callchain.h create mode 100644 arch/powerpc/perf/callchain_32.c create mode 100644 arch/powerpc/perf/callchain_64.c
Signature · 1 line
2.23.0
PATCH v11 3/8 powerpc/perf: consolidate read_user_stack_32
There are two almost identical copies for 32bit and 64bit.
The function is used only in 32bit code which will be split out in next patch so consolidate to one function.
---
v6: new patch v8: move the consolidated function out of the ifdef block. v11: rebase on top of def0bfdbd603 --- arch/powerpc/perf/callchain.c | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-)
arch/powerpc/perf/callchain.c +24 -24
@@ -161,18 +161,6 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret)return read_user_stack_slow (ptr, ret,8 ); } -static int read_user_stack_32 (unsigned int __user *ptr,unsigned int *ret) -{ -if ((unsigned long )ptr >TASK_SIZE -sizeof (unsigned int ) || - ((unsigned long )ptr &3 )) -return -EFAULT ; - -if (!probe_user_read (ret, ptr,sizeof (*ret))) -return 0 ; - -return read_user_stack_slow (ptr, ret,4 ); -} -static inline int valid_user_sp (unsigned long sp,int is_64) {if (!sp || (sp &7 ) || sp > (is_64 ?TASK_SIZE :0x100000000UL ) -32 )
@@ -277,19 +265,9 @@ static void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, }#else /* CONFIG_PPC64 */ -/* -* On 32-bit we just access the address and let hash_page create a -* HPTE if necessary, so there is no need to fall back to reading -* the page tables. Since this is called at interrupt level, -* do_page_fault() won't treat a DSI as a page fault. -*/ -static int read_user_stack_32 (unsigned int __user *ptr,unsigned int *ret) +static int read_user_stack_slow (void __user *ptr,void *buf,int nb) { -if ((unsigned long )ptr >TASK_SIZE -sizeof (unsigned int ) || - ((unsigned long )ptr &3 )) -return -EFAULT ; - -return probe_user_read (ret, ptr,sizeof (*ret)); +return 0 ; } static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry,
@@ -312,6 +290,28 @@ static inline int valid_user_sp(unsigned long sp, int is_64)#endif /* CONFIG_PPC64 */ +/* +* On 32-bit we just access the address and let hash_page create a +* HPTE if necessary, so there is no need to fall back to reading +* the page tables. Since this is called at interrupt level, +* do_page_fault() won't treat a DSI as a page fault. +*/ +static int read_user_stack_32 (unsigned int __user *ptr,unsigned int *ret) +{ +int rc; + +if ((unsigned long )ptr >TASK_SIZE -sizeof (unsigned int ) || + ((unsigned long )ptr &3 )) +return -EFAULT ; + + rc =probe_user_read (ret, ptr,sizeof (*ret)); + +if (IS_ENABLED (CONFIG_PPC64 ) && rc) +return read_user_stack_slow (ptr, ret,4 ); + +return rc; +} +/* * Layout for non-RT signal frames */
Signature · 1 line
2.23.0
PATCH v11 6/8 powerpc/64: Make COMPAT user-selectable disabled on littleendian by default.
In reply to Michal SuchanekOn bigendian ppc64 it is common to have 32bit legacy binaries but much less so on littleendian.
---
v3: make configurable
--- arch/powerpc/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/powerpc/Kconfig +3 -2
@@ -264,8 +264,9 @@ config PANIC_TIMEOUT default 180 config COMPAT - bool - default y if PPC64 + bool "Enable support for 32bit binaries" + depends on PPC64 + default y if !CPU_LITTLE_ENDIAN select COMPAT_BINFMT_ELF select ARCH_WANT_OLD_COMPAT_IPC select COMPAT_OLD_SIGACTION
Signature · 1 line
2.23.0
PATCH v11 2/8 powerpc: move common register copy functions from signal_32.c to signal.c
In reply to Michal SuchanekThese functions are required for 64bit as well.
--- arch/powerpc/kernel/signal.c | 141 ++++++++++++++++++++++++++++++++ arch/powerpc/kernel/signal_32.c | 140 ------------------------------- 2 files changed, 141 insertions(+), 140 deletions(-)
arch/powerpc/kernel/signal.c +141 -0
@@ -18,12 +18,153 @@#include <linux/syscalls.h> #include <asm/hw_breakpoint.h> #include <linux/uaccess.h> +#include <asm/switch_to.h> #include <asm/unistd.h> #include <asm/debug.h> #include <asm/tm.h> #include "signal.h" +#ifdef CONFIG_VSX +unsigned long copy_fpr_to_user (void __user *to, +struct task_struct *task) +{ +u64 buf[ELF_NFPREG ]; +int i; + +/* save FPR copy to local buffer then write to the thread_struct */ +for (i =0 ; i < (ELF_NFPREG -1 ) ; i++) + buf[i] = task->thread.TS_FPR (i); + buf[i] = task->thread.fp_state.fpscr; +return __copy_to_user (to, buf,ELF_NFPREG *sizeof (double )); +} + +unsigned long copy_fpr_from_user (struct task_struct *task, +void __user *from) +{ +u64 buf[ELF_NFPREG ]; +int i; + +if (__copy_from_user (buf, from,ELF_NFPREG *sizeof (double ))) +return 1 ; +for (i =0 ; i < (ELF_NFPREG -1 ) ; i++) + task->thread.TS_FPR (i) = buf[i]; + task->thread.fp_state.fpscr = buf[i]; + +return 0 ; +} + +unsigned long copy_vsx_to_user (void __user *to, +struct task_struct *task) +{ +u64 buf[ELF_NVSRHALFREG ]; +int i; + +/* save FPR copy to local buffer then write to the thread_struct */ +for (i =0 ; i <ELF_NVSRHALFREG ; i++) + buf[i] = task->thread.fp_state.fpr[i][TS_VSRLOWOFFSET ]; +return __copy_to_user (to, buf,ELF_NVSRHALFREG *sizeof (double )); +} + +unsigned long copy_vsx_from_user (struct task_struct *task, +void __user *from) +{ +u64 buf[ELF_NVSRHALFREG ]; +int i; + +if (__copy_from_user (buf, from,ELF_NVSRHALFREG *sizeof (double ))) +return 1 ; +for (i =0 ; i <ELF_NVSRHALFREG ; i++) + task->thread.fp_state.fpr[i][TS_VSRLOWOFFSET ] = buf[i]; +return 0 ; +} + +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +unsigned long copy_ckfpr_to_user (void __user *to, +struct task_struct *task) +{ +u64 buf[ELF_NFPREG ]; +int i; + +/* save FPR copy to local buffer then write to the thread_struct */ +for (i =0 ; i < (ELF_NFPREG -1 ) ; i++) + buf[i] = task->thread.TS_CKFPR (i); + buf[i] = task->thread.ckfp_state.fpscr; +return __copy_to_user (to, buf,ELF_NFPREG *sizeof (double )); +} + +unsigned long copy_ckfpr_from_user (struct task_struct *task, +void __user *from) +{ +u64 buf[ELF_NFPREG ]; +int i; + +if (__copy_from_user (buf, from,ELF_NFPREG *sizeof (double ))) +return 1 ; +for (i =0 ; i < (ELF_NFPREG -1 ) ; i++) + task->thread.TS_CKFPR (i) = buf[i]; + task->thread.ckfp_state.fpscr = buf[i]; + +return 0 ; +} + +unsigned long copy_ckvsx_to_user (void __user *to, +struct task_struct *task) +{ +u64 buf[ELF_NVSRHALFREG ]; +int i; + +/* save FPR copy to local buffer then write to the thread_struct */ +for (i =0 ; i <ELF_NVSRHALFREG ; i++) + buf[i] = task->thread.ckfp_state.fpr[i][TS_VSRLOWOFFSET ]; +return __copy_to_user (to, buf,ELF_NVSRHALFREG *sizeof (double )); +} + +unsigned long copy_ckvsx_from_user (struct task_struct *task, +void __user *from) +{ +u64 buf[ELF_NVSRHALFREG ]; +int i; + +if (__copy_from_user (buf, from,ELF_NVSRHALFREG *sizeof (double ))) +return 1 ; +for (i =0 ; i <ELF_NVSRHALFREG ; i++) + task->thread.ckfp_state.fpr[i][TS_VSRLOWOFFSET ] = buf[i]; +return 0 ; +} +#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ +#else +inline unsigned long copy_fpr_to_user (void __user *to, +struct task_struct *task) +{ +return __copy_to_user (to, task->thread.fp_state.fpr, +ELF_NFPREG *sizeof (double )); +} + +inline unsigned long copy_fpr_from_user (struct task_struct *task, +void __user *from) +{ +return __copy_from_user (task->thread.fp_state.fpr, from, +ELF_NFPREG *sizeof (double )); +} + +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +inline unsigned long copy_ckfpr_to_user (void __user *to, +struct task_struct *task) +{ +return __copy_to_user (to, task->thread.ckfp_state.fpr, +ELF_NFPREG *sizeof (double )); +} + +inline unsigned long copy_ckfpr_from_user (struct task_struct *task, +void __user *from) +{ +return __copy_from_user (task->thread.ckfp_state.fpr, from, +ELF_NFPREG *sizeof (double )); +} +#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ +#endif +/* Log an error when sending an unhandled signal to a process. Controlled * through debug.exception-trace sysctl. */
arch/powerpc/kernel/signal_32.c +0 -140
146 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v11 8/8 MAINTAINERS: perf: Add pattern that matches ppc perf to the perf entry.
In reply to Michal Suchanek---
v10: new patch
--- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+)
MAINTAINERS +2 -0
@@ -13088,6 +13088,8 @@ F: arch/*/kernel/*/perf_event*.c F: arch/*/kernel/*/*/perf_event*.c F: arch/*/include/asm/perf_event.h F: arch/*/kernel/perf_callchain.c +F: arch/*/perf/* +F: arch/*/perf/*/* F: arch/*/events/* F: arch/*/events/*/* F: tools/perf/
Signature · 1 line
2.23.0
PATCH v11 7/8 powerpc/perf: split callchain.c by bitness
In reply to Michal SuchanekBuilding callchain.c with !COMPAT proved quite ugly with all the defines. Splitting out the 32bit and 64bit parts looks better.
No code change intended.
---
v6:
- move current_is_64bit consolidetaion to earlier patch
- move defines to the top of callchain_32.c
- Makefile cleanup
v8:
- fix valid_user_sp
v11:
- rebase on top of def0bfdbd603
--- arch/powerpc/perf/Makefile | 5 +- arch/powerpc/perf/callchain.c | 357 +------------------------------ arch/powerpc/perf/callchain.h | 20 ++ arch/powerpc/perf/callchain_32.c | 196 +++++++++++++++++ arch/powerpc/perf/callchain_64.c | 174 +++++++++++++++ 5 files changed, 395 insertions(+), 357 deletions(-) create mode 100644 arch/powerpc/perf/callchain.h create mode 100644 arch/powerpc/perf/callchain_32.c create mode 100644 arch/powerpc/perf/callchain_64.c
arch/powerpc/perf/Makefile +4 -1
@@ -1,6 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_PERF_EVENTS) += callchain.o perf_regs.o +obj-$(CONFIG_PERF_EVENTS) += callchain.o callchain_$(BITS).o perf_regs.o +ifdef CONFIG_COMPAT +obj-$(CONFIG_PERF_EVENTS) += callchain_32.o +endif obj-$(CONFIG_PPC_PERF_CTRS) += core-book3s.o bhrb.o obj64-$(CONFIG_PPC_PERF_CTRS) += ppc970-pmu.o power5-pmu.o \
arch/powerpc/perf/callchain.c +1 -356
371 lines not on this page · raw message
arch/powerpc/perf/callchain.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _POWERPC_PERF_CALLCHAIN_H +#define _POWERPC_PERF_CALLCHAIN_H + +int read_user_stack_slow (void __user *ptr,void *buf,int nb); +void perf_callchain_user_64 (struct perf_callchain_entry_ctx *entry, +struct pt_regs *regs); +void perf_callchain_user_32 (struct perf_callchain_entry_ctx *entry, +struct pt_regs *regs); + +static inline int valid_user_sp (unsigned long sp) +{ +bool is_64 = !is_32bit_task (); + +if (!sp || (sp & (is_64 ?7 :3 )) || sp >STACK_TOP - (is_64 ?32 :16 )) +return 0 ; +return 1 ; +} + +#endif /* _POWERPC_PERF_CALLCHAIN_H */
arch/powerpc/perf/callchain_32.c new file +196 -0
196 lines not on this page · raw message
arch/powerpc/perf/callchain_64.c new file +174 -0
174 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v11 5/8 powerpc/64: make buildable without CONFIG_COMPAT
In reply to Michal SuchanekThere are numerous references to 32bit functions in generic and 64bit code so ifdef them out.
---
v2:
- fix 32bit ifdef condition in signal.c
- simplify the compat ifdef condition in vdso.c - 64bit is redundant
- simplify the compat ifdef condition in callchain.c - 64bit is redundant v3:
- use IS_ENABLED and maybe_unused where possible
- do not ifdef declarations
- clean up Makefile
v4:
- further makefile cleanup
- simplify is_32bit_task conditions
- avoid ifdef in condition by using return
v5:
- avoid unreachable code on 32bit
- make is_current_64bit constant on !COMPAT
- add stub perf_callchain_user_32 to avoid some ifdefs
v6:
- consolidate current_is_64bit
v7:
- remove leftover perf_callchain_user_32 stub from previous series version v8:
- fix build again - too trigger-happy with stub removal
- remove a vdso.c hunk that causes warning according to kbuild test robot v9:
- removed current_is_64bit in previous patch
v10:
- rebase on top of 70ed86f4de5bd
--- arch/powerpc/include/asm/thread_info.h | 4 ++-- arch/powerpc/kernel/Makefile | 6 +++--- arch/powerpc/kernel/entry_64.S | 2 ++ arch/powerpc/kernel/signal.c | 3 +-- arch/powerpc/kernel/syscall_64.c | 6 ++---- arch/powerpc/kernel/vdso.c | 3 ++- arch/powerpc/perf/callchain.c | 8 +++++++- 7 files changed, 19 insertions(+), 13 deletions(-)
arch/powerpc/include/asm/thread_info.h +2 -2
@@ -162,10 +162,10 @@ static inline bool test_thread_local_flags(unsigned int flags)return (ti->local_flags & flags) !=0 ; } -#ifdef CONFIG_PPC64 +#ifdef CONFIG_COMPAT #define is_32bit_task () (test_thread_flag(TIF_32BIT))#else -#define is_32bit_task () (1) +#define is_32bit_task () (IS_ENABLED(CONFIG_PPC32))#endif #if defined(CONFIG_PPC64 )
arch/powerpc/kernel/Makefile +3 -3
@@ -42,16 +42,16 @@ CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING endif obj-y := cputable.o ptrace.o syscalls.o \ - irq.o align.o signal_32.o pmc.o vdso.o \ + irq.o align.o signal_$(BITS).o pmc.o vdso.o \ process.o systbl.o idle.o \ signal.o sysfs.o cacheinfo.o time.o \ prom.o traps.o setup-common.o \ udbg.o misc.o io.o misc_$(BITS).o \ of_platform.o prom_parse.o -obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o \ - signal_64.o ptrace32.o \ +obj-$(CONFIG_PPC64) += setup_64.o \ paca.o nvram_64.o firmware.o note.o \ syscall_64.o +obj-$(CONFIG_COMPAT) += sys_ppc32.o ptrace32.o signal_32.o obj-$(CONFIG_VDSO32) += vdso32/ obj-$(CONFIG_PPC_WATCHDOG) += watchdog.o obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
arch/powerpc/kernel/entry_64.S +2 -0
@@ -52,8 +52,10 @@ SYS_CALL_TABLE: .tc sys_call_table[TC],sys_call_table +#ifdef CONFIG_COMPAT COMPAT_SYS_CALL_TABLE: .tc compat_sys_call_table[TC],compat_sys_call_table +#endif /* This value is used to mark exception frames on the stack. */ exception_marker:
arch/powerpc/kernel/signal.c +1 -2
@@ -247,7 +247,6 @@ static void do_signal(struct task_struct *tsk)sigset_t *oldset =sigmask_to_save ();struct ksignal ksig = { .sig =0 };int ret; -int is32 =is_32bit_task ();BUG_ON (tsk != current);
@@ -277,7 +276,7 @@ static void do_signal(struct task_struct *tsk)rseq_signal_deliver (&ksig, tsk->thread.regs); -if (is32) { +if (is_32bit_task ()) {if (ksig.ka.sa.sa_flags &SA_SIGINFO ) ret =handle_rt_signal32 (&ksig, oldset, tsk);else
arch/powerpc/kernel/syscall_64.c +2 -4
@@ -24,7 +24,6 @@ notrace long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8, unsigned long r0, struct pt_regs *regs) { - unsigned long ti_flags; syscall_fn f;if (IS_ENABLED (CONFIG_PPC_IRQ_SOFT_MASK_DEBUG ))
@@ -68,8 +67,7 @@ notrace long system_call_exception(long r3, long r4, long r5,local_irq_enable (); - ti_flags =current_thread_info ()->flags; -if (unlikely (ti_flags & _TIF_SYSCALL_DOTRACE)) { +if (unlikely (current_thread_info ()->flags & _TIF_SYSCALL_DOTRACE)) {/* * We use the return value of do_syscall_trace_enter() as the * syscall number. If the syscall was rejected for any reason
@@ -94,7 +92,7 @@ notrace long system_call_exception(long r3, long r4, long r5,/* May be faster to do array_index_nospec? */ barrier_nospec (); -if (unlikely (ti_flags & _TIF_32BIT)) { +if (unlikely (is_32bit_task ())) { f = (void *)compat_sys_call_table[r0]; r3 &=0x00000000ffffffffULL ;
arch/powerpc/kernel/vdso.c +2 -1
@@ -656,7 +656,8 @@ static void __init vdso_setup_syscall_map(void)if (sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_64[i >>5 ] |=0x80000000UL >> (i &0x1f ); -if (compat_sys_call_table[i] != sys_ni_syscall) +if (IS_ENABLED (CONFIG_COMPAT ) && + compat_sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_32[i >>5 ] |=0x80000000UL >> (i &0x1f );#else /* CONFIG_PPC64 */
arch/powerpc/perf/callchain.c +7 -1
@@ -15,7 +15,7 @@#include <asm/sigcontext.h> #include <asm/ucontext.h> #include <asm/vdso.h> -#ifdef CONFIG_PPC64 +#ifdef CONFIG_COMPAT #include "../kernel/ppc32.h" #endif #include <asm/pte-walk.h>
@@ -285,6 +285,7 @@ static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry#endif /* CONFIG_PPC64 */ +#if defined(CONFIG_PPC32 ) || defined(CONFIG_COMPAT )/* * On 32-bit we just access the address and let hash_page create a * HPTE if necessary, so there is no need to fall back to reading
@@ -448,6 +449,11 @@ static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, sp = next_sp; } } +#else /* 32bit */ +static void perf_callchain_user_32 (struct perf_callchain_entry_ctx *entry, +struct pt_regs *regs) +{} +#endif /* 32bit */ void perf_callchain_user (struct perf_callchain_entry_ctx *entry,struct pt_regs *regs)
Signature · 1 line
2.23.0
PATCH v11 4/8 powerpc/perf: consolidate valid_user_sp
In reply to Michal SuchanekMerge the 32bit and 64bit version.
Halve the check constants on 32bit.
Use STACK_TOP since it is defined.
Passing is_64 is now redundant since is_32bit_task() is used to determine which callchain variant should be used. Use STACK_TOP and is_32bit_task() directly.
This removes a page from the valid 32bit area on 64bit:
#define TASK_SIZE_USER32 (0x0000000100000000UL - (1 * PAGE_SIZE)) #define STACK_TOP_USER32 TASK_SIZE_USER32
---
v8: new patch
v11: simplify by using is_32bit_task()
--- arch/powerpc/perf/callchain.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
arch/powerpc/perf/callchain.c +11 -16
@@ -102,6 +102,15 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re } } +static inline int valid_user_sp (unsigned long sp) +{ +bool is_64 = !is_32bit_task (); + +if (!sp || (sp & (is_64 ?7 :3 )) || sp >STACK_TOP - (is_64 ?32 :16 )) +return 0 ; +return 1 ; +} +#ifdef CONFIG_PPC64 /* * On 64-bit we don't want to invoke hash_page on user addresses from
@@ -161,13 +170,6 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret)return read_user_stack_slow (ptr, ret,8 ); } -static inline int valid_user_sp (unsigned long sp,int is_64) -{ -if (!sp || (sp &7 ) || sp > (is_64 ?TASK_SIZE :0x100000000UL ) -32 ) -return 0 ; -return 1 ; -} -/* * 64-bit user processes use the same stack frame for RT and non-RT signals. */
@@ -226,7 +228,7 @@ static void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry,while (entry->nr < entry->max_stack) { fp = (unsigned long __user *) sp; -if (!valid_user_sp (sp,1 ) ||read_user_stack_64 (fp, &next_sp)) +if (!valid_user_sp (sp) ||read_user_stack_64 (fp, &next_sp))return ;if (level >0 &&read_user_stack_64 (&fp[2 ], &next_ip))return ;
@@ -275,13 +277,6 @@ static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry { } -static inline int valid_user_sp (unsigned long sp,int is_64) -{ -if (!sp || (sp &7 ) || sp >TASK_SIZE -32 ) -return 0 ; -return 1 ; -} -#define __SIGNAL_FRAMESIZE32 __SIGNAL_FRAMESIZE#define sigcontext32 sigcontext#define mcontext32 mcontext
@@ -423,7 +418,7 @@ static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry,while (entry->nr < entry->max_stack) { fp = (unsigned int __user *) (unsigned long ) sp; -if (!valid_user_sp (sp,0 ) ||read_user_stack_32 (fp, &next_sp)) +if (!valid_user_sp (sp) ||read_user_stack_32 (fp, &next_sp))return ;if (level >0 &&read_user_stack_32 (&fp[1 ], &next_ip))return ;
Signature · 1 line
2.23.0
PATCH v11 1/8 powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro
In reply to Michal SuchanekThis partially reverts commit caf6f9c8a326 ("asm-generic: Remove unneeded __ARCH_WANT_SYS_LLSEEK macro")
When CONFIG_COMPAT is disabled on ppc64 the kernel does not build.
There is resistance to both removing the llseek syscall from the 64bit syscall tables and building the llseek interface unconditionally.
---
v7: new patch
--- arch/powerpc/include/asm/unistd.h | 1 + fs/read_write.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/unistd.h +1 -0
@@ -31,6 +31,7 @@#define __ARCH_WANT_SYS_SOCKETCALL#define __ARCH_WANT_SYS_FADVISE64#define __ARCH_WANT_SYS_GETPGRP +#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT#define __ARCH_WANT_SYS_OLD_UNAME
fs/read_write.c +2 -1
@@ -331,7 +331,8 @@ COMPAT_SYSCALL_DEFINE3(lseek, unsigned int, fd, compat_off_t, offset, unsigned i }#endif -#if !defined(CONFIG_64BIT ) || defined(CONFIG_COMPAT ) +#if !defined(CONFIG_64BIT ) || defined(CONFIG_COMPAT ) || \ + defined(__ARCH_WANT_SYS_LLSEEK) SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high, unsigned long, offset_low, loff_t __user *, result, unsigned int, whence)
Signature · 1 line
2.23.0
Lost some headers so will resend.
Quoted 69 lines · Michal Suchanek
Less code means less bugs so add a knob to skip the compat stuff.
Changes in v2: saner
CONFIG_COMPATifdefs
Changes in v3:
- change llseek to 32bit instead of builing it unconditionally in fs
- clanup the makefile conditionals
- remove some ifdefs or convert toIS_DEFINEDwhere possible
Changes in v4:
- cleanupis_32bit_taskandcurrent_is_64bit
- more makefile cleanup
Changes in v5:
- morecurrent_is_64bitcleanup
- split offcallchain.c32bit and 64bit parts
Changes in v6:
- cleanup makefile after split
- consolidateread_user_stack_32
- fix some checkpatch warnings
Changes in v7:
- add back__ARCH_WANT_SYS_LLSEEKto fix build with llseek
- remove leftover hunk
- add review tags
Changes in v8:
- consolidatevalid_user_spto fix it in the splitcallchain.c
- fix build errors/warnings with PPC64 !COMPAT and PPC32
Changes in v9:
- removecurrent_is_64bit()
Chanegs in v10:
- rebase, sent together with the syscall cleanup
Changes in v11:
- rebase
- addMAINTAINERSpattern for ppc perfMichal Suchanek (8):
powerpc: Add back__ARCH_WANT_SYS_LLSEEKmacro
powerpc: move common register copy functions fromsignal_32.cto
signal.c
powerpc/perf: consolidateread_user_stack_32powerpc/perf: consolidatevalid_user_sp
powerpc/64: make buildable withoutCONFIG_COMPATpowerpc/64: Make COMPAT user-selectable disabled on littleendian by
default.
powerpc/perf: splitcallchain.cby bitness
MAINTAINERS: perf: Add pattern that matches ppc perf to the perf
entry.MAINTAINERS | 2 + arch/powerpc/Kconfig | 5 +- arch/powerpc/include/asm/thread_info.h | 4 +- arch/powerpc/include/asm/unistd.h | 1 + arch/powerpc/kernel/Makefile | 6 +- arch/powerpc/kernel/entry_64.S | 2 + arch/powerpc/kernel/signal.c | 144 +++++++++- arch/powerpc/kernel/signal_32.c | 140 ---------- arch/powerpc/kernel/syscall_64.c | 6 +- arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/perf/Makefile | 5 +- arch/powerpc/perf/callchain.c | 356 +------------------------ arch/powerpc/perf/callchain.h | 20 ++ arch/powerpc/perf/callchain_32.c | 196 ++++++++++++++ arch/powerpc/perf/callchain_64.c | 174 ++++++++++++ fs/read_write.c | 3 +- 16 files changed, 556 insertions(+), 511 deletions(-) create mode 100644 arch/powerpc/perf/callchain.h create mode 100644 arch/powerpc/perf/callchain_32.c create mode 100644 arch/powerpc/perf/callchain_64.cSignature · 1 line
2.23.0
Re: [PATCH v11 4/8] powerpc/perf: consolidate valid_user_sp
In reply to Michal SuchanekQuoted 14 lines · Michal Suchanek
Merge the 32bit and 64bit version.
Halve the check constants on 32bit.
Use
STACK_TOPsince it is defined.Passing
is_64is now redundant sinceis_32bit_task()is used to determine which callchain variant should be used. UseSTACK_TOPandis_32bit_task()directly.This removes a page from the valid 32bit area on 64bit:
#defineTASK_SIZE_USER32(0x0000000100000000UL- (1 *PAGE_SIZE)) #defineSTACK_TOP_USER32TASK_SIZE_USER32
...
arch/powerpc/perf/callchain.c perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re · line 112
Quoted 8 lines
arch/powerpc/perf/callchain.c +8
-0+static inline int valid_user_sp (unsigned long sp) +{ +bool is_64 = !is_32bit_task (); + +if (!sp || (sp & (is_64 ?7 :3 )) || sp >STACK_TOP - (is_64 ?32 :16 )) +return 0 ; +return 1 ; +}
Perhaps better to read
if (!sp)
return 0;
if (is_32bit_task()) {
if (sp & 0x03)
return 0;
if (sp > STACK_TOP - 16)
return 0;
} else {
...
}return 1;
Other possibility:
unsigned long align = is_32bit_task() ? 3 : 7; unsigned long top = STACK_TOP - (is_32bit_task() ? 16 : 32); return !(!sp || (sp & align) || sp > top);
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v11 4/8] powerpc/perf: consolidate valid_user_sp
Quoted 41 lines · Andy Shevchenko
Quoted 14 lines · Michal Suchanek
Merge the 32bit and 64bit version.
Halve the check constants on 32bit.
Use
STACK_TOPsince it is defined.Passing
is_64is now redundant sinceis_32bit_task()is used to determine which callchain variant should be used. UseSTACK_TOPandis_32bit_task()directly.This removes a page from the valid 32bit area on 64bit:
#defineTASK_SIZE_USER32(0x0000000100000000UL- (1 *PAGE_SIZE)) #defineSTACK_TOP_USER32TASK_SIZE_USER32...
arch/powerpc/perf/callchain.c perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re · line 112
Quoted 8 lines
arch/powerpc/perf/callchain.c +8
-0+static inline int valid_user_sp (unsigned long sp) +{ +bool is_64 = !is_32bit_task (); + +if (!sp || (sp & (is_64 ?7 :3 )) || sp >STACK_TOP - (is_64 ?32 :16 )) +return 0 ; +return 1 ; +}Perhaps better to read
if (!sp)
return 0;if (is_32bit_task()) { if (sp & 0x03) return 0; if (sp > STACK_TOP - 16) return 0; } else { ... }
Quoted 8 lines
return 1;
Other possibility:
unsigned long align = is_32bit_task() ? 3 : 7; unsigned long top = STACK_TOP - (is_32bit_task() ? 16 : 32); return !(!sp || (sp & align) || sp > top);
Sounds reasonale.
Thanks
Michal
Quoted 4 lines
Signature · 3 lines
-- With Best Regards, Andy Shevchenko
Re: [PATCH v11 4/8] powerpc/perf: consolidate valid_user_sp
In reply to Andy ShevchenkoLe 19/03/2020 à 14:35, Andy Shevchenko a écrit :
Quoted 43 lines · Michal Suchanek
Quoted 14 lines
Merge the 32bit and 64bit version.
Halve the check constants on 32bit.
Use
STACK_TOPsince it is defined.Passing
is_64is now redundant sinceis_32bit_task()is used to determine which callchain variant should be used. UseSTACK_TOPandis_32bit_task()directly.This removes a page from the valid 32bit area on 64bit:
#defineTASK_SIZE_USER32(0x0000000100000000UL- (1 *PAGE_SIZE)) #defineSTACK_TOP_USER32TASK_SIZE_USER32...
arch/powerpc/perf/callchain.c perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re · line 112
Quoted 8 lines
arch/powerpc/perf/callchain.c +8
-0+static inline int valid_user_sp (unsigned long sp) +{ +bool is_64 = !is_32bit_task (); + +if (!sp || (sp & (is_64 ?7 :3 )) || sp >STACK_TOP - (is_64 ?32 :16 )) +return 0 ; +return 1 ; +}Perhaps better to read
if (!sp) return 0; if (is_32bit_task()) { if (sp & 0x03) return 0; if (sp > STACK_TOP - 16) return 0; } else { ... } return 1;
Quoted 1 line
Other possibility:
I prefer this one.
Quoted 2 lines
unsigned long align = is_32bit_task() ? 3 : 7;
I would call it mask instead of align
Quoted 4 lines
unsigned long top = STACK_TOP - (is_32bit_task() ? 16 : 32); return !(!sp || (sp & align) || sp > top);
Christophe
Re: [PATCH v11 4/8] powerpc/perf: consolidate valid_user_sp
Quoted 32 lines · Christophe Leroy
Le 19/03/2020 à 14:35, Andy Shevchenko a écrit :
Quoted 18 lines · Michal Suchanek
Quoted 14 lines
Merge the 32bit and 64bit version.
Halve the check constants on 32bit.
Use
STACK_TOPsince it is defined.Passing
is_64is now redundant sinceis_32bit_task()is used to determine which callchain variant should be used. UseSTACK_TOPandis_32bit_task()directly.This removes a page from the valid 32bit area on 64bit:
#defineTASK_SIZE_USER32(0x0000000100000000UL- (1 *PAGE_SIZE)) #defineSTACK_TOP_USER32TASK_SIZE_USER32...
Quoted 10 lines
arch/powerpc/perf/callchain.c perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re · line 112
Quoted 8 lines
arch/powerpc/perf/callchain.c +8
-0+static inline int valid_user_sp (unsigned long sp) +{ +bool is_64 = !is_32bit_task (); + +if (!sp || (sp & (is_64 ?7 :3 )) || sp >STACK_TOP - (is_64 ?32 :16 )) +return 0 ; +return 1 ; +}Other possibility:
Quoted 10 lines
I prefer this one.
Quoted 2 lines
unsigned long align = is_32bit_task() ? 3 : 7;I would call it mask instead of align
Quoted 3 lines
unsigned long top = STACK_TOP - (is_32bit_task() ? 16 : 32); return !(!sp || (sp & align) || sp > top);
And we can avoid the inversion here as well as in !valid_user_sp(sp) by changing to invalid_user_sp.
Thanks
Michal