Disable compat cruft on ppc64le
cover Disable compat cruft on ppc64le
With endian switch disabled by default the ppc64le compat supports ppc32le only which is something next to nobody has binaries for.
Less code means less bugs so drop the compat stuff.
I am not particularly sure about the best way to resolve the llseek situation. I don't see anything in the syscal tables making it 32bit-only so I suppose it should be available on 64bit as well.
This is tested on ppc64le top of
https://patchwork.ozlabs.org/cover/1141078/
https://patchwork.ozlabs.org/cover/1153556/
https://patchwork.ozlabs.org/cover/1150815/
Thanks
Michal
Michal Suchanek (4):
fs: always build llseek.
powerpc: move common register copy functions from signal_32.c to
signal.c
powerpc/64: make buildable without CONFIG_COMPAT powerpc/64: Disable COMPAT if littleendian.
arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/syscall.h | 2 + arch/powerpc/kernel/Makefile | 15 ++- arch/powerpc/kernel/entry_64.S | 2 + arch/powerpc/kernel/signal.c | 146 ++++++++++++++++++++++++++++- arch/powerpc/kernel/signal_32.c | 140 --------------------------- arch/powerpc/kernel/syscall_64.c | 5 +- arch/powerpc/kernel/vdso.c | 4 +- arch/powerpc/perf/callchain.c | 14 ++- fs/read_write.c | 2 - 10 files changed, 177 insertions(+), 155 deletions(-)
Signature · 1 line
2.22.0
PATCH 1/4 fs: always build llseek.
64bit !COMPAT does not build because the llseek syscall is in the tables.
--- fs/read_write.c | 2 -- 1 file changed, 2 deletions(-)
fs/read_write.c +0 -2
@@ -331,7 +331,6 @@ COMPAT_SYSCALL_DEFINE3(lseek, unsigned int, fd, compat_off_t, offset, unsigned i }#endif -#if !defined(CONFIG_64BIT ) || defined(CONFIG_COMPAT ) SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high, unsigned long, offset_low, loff_t __user *, result, unsigned int, whence)
@@ -360,7 +359,6 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,fdput_pos (f);return retval; } -#endif int rw_verify_area (int read_write,struct file *file,const loff_t *ppos,size_t count) {
Signature · 1 line
2.22.0
Re: [PATCH 1/4] fs: always build llseek.
Quoted 1 line · Michal Suchanek
64bit !COMPAT does not build because the llseek syscall is in the tables.
Well, this will bloat thinkgs like 64-bit RISC-V for no good reason. Please introduce a WANT_LSEEK like symbol that ppc64 can select instead.
Re: [PATCH 1/4] fs: always build llseek.
Quoted 5 lines · On Wed, 28 Aug 2019 08:15:52 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 1 line · Michal Suchanek
64bit !COMPAT does not build because the llseek syscall is in the tables.
Well, this will bloat thinkgs like 64-bit RISC-V for no good reason. Please introduce a
WANT_LSEEKlike symbol that ppc64 can select instead.
It also builds when llseek is marked as 32bit only in syscall.tbl
It seems it was handled specially in some way before syscall.tbl was added, though (removed in ab66dcc76d6ab8fae9d69d149ae38c42605e7fc5)
Thanks
Michal
Re: [PATCH 1/4] fs: always build llseek.
Quoted 6 lines · Michal Suchánek
Quoted 3 lines · On Wed, 28 Aug 2019 08:15:52 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 1 line · Michal Suchanek
64bit !COMPAT does not build because the llseek syscall is in the tables.
Quoted 7 lines
Quoted 2 lines
Well, this will bloat thinkgs like 64-bit RISC-V for no good reason. Please introduce a
WANT_LSEEKlike symbol that ppc64 can select instead.It also builds when llseek is marked as 32bit only in syscall.tbl
It seems it was handled specially in some way before syscall.tbl was added, though (removed in
ab66dcc76d6ab8fae9d69d149ae38c42605e7fc5)
Independ of if you need it on a purely 64-bit build on powerpc (which I'll let the experts figure out) it is not needed on a purely 64-bit build on other platforms. So please make sure it is still built conditional, just possibly with an opt-in for powerpc.
Re: [PATCH 1/4] fs: always build llseek.
Quoted 12 lines · On Wed, 28 Aug 2019 23:22:00 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 11 lines · Michal Suchánek
Quoted 5 lines · On Wed, 28 Aug 2019 08:15:52 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 1 line · Michal Suchanek
64bit !COMPAT does not build because the llseek syscall is in the tables.
Well, this will bloat thinkgs like 64-bit RISC-V for no good reason. Please introduce a
WANT_LSEEKlike symbol that ppc64 can select instead.It also builds when llseek is marked as 32bit only in syscall.tbl
Quoted 7 lines
Quoted 2 lines
It seems it was handled specially in some way before syscall.tbl was added, though (removed in
ab66dcc76d6ab8fae9d69d149ae38c42605e7fc5)Independ of if you need it on a purely 64-bit build on powerpc (which I'll let the experts figure out) it is not needed on a purely 64-bit build on other platforms. So please make sure it is still built conditional, just possibly with an opt-in for powerpc.
AFAICT it is needed for all 64bit platforms with unified syscall.tbl.
I modified the syscall.tbl for powerpc to not need the syscall with 64bit only build but other platforms are still broken. There are a few platforms that use multiple tables and on those the 64bit one indeed does not contain llseek.
Thanks
Michal
Re: [PATCH 1/4] fs: always build llseek.
In reply to Michal SuchanekQuoted 2 lines · Michal Suchanek
64bit !COMPAT does not build because the llseek syscall is in the tables.
Do I read this right you have a 128 bit offset to llseek on ppc64?
Looking at the signature it does not appear to make sense to build this function on any 64bit platform.
Perhaps the proper fix to to take llseek out of your syscall tables?
Eric
Quoted 25 lines
Signed-off-by Michal Suchanek <[email protected]>--- fs/read_write.c | 2 -- 1 file changed, 2 deletions(-)fs/read_write.c +0
-2@@ -331,7 +331,6 @@ COMPAT_SYSCALL_DEFINE3(lseek, unsigned int, fd, compat_off_t, offset, unsigned i }#endif -#if !defined(CONFIG_64BIT ) || defined(CONFIG_COMPAT ) SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high, unsigned long, offset_low, loff_t __user *, result, unsigned int, whence)@@ -360,7 +359,6 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,fdput_pos (f);return retval; } -#endif int rw_verify_area (int read_write,struct file *file,const loff_t *ppos,size_t count) {
Re: [PATCH 1/4] fs: always build llseek.
Quoted 11 lines · [email protected] (Eric W. Biederman) writes:
Quoted 2 lines · Michal Suchanek
64bit !COMPAT does not build because the llseek syscall is in the tables.
Do I read this right you have a 128 bit offset to llseek on ppc64?
Looking at the signature it does not appear to make sense to build this function on any 64bit platform.
Perhaps the proper fix to to take llseek out of your syscall tables?
Sorry I missed seeing the 2 newer version of the patchset in my inbox it seems you have already made the change I am suggesting.
Never mind.
Eric
PATCH 2/4 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.22.0
PATCH 3/4 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.
--- arch/powerpc/include/asm/syscall.h | 2 ++ arch/powerpc/kernel/Makefile | 15 ++++++++++++--- arch/powerpc/kernel/entry_64.S | 2 ++ arch/powerpc/kernel/signal.c | 5 +++-- arch/powerpc/kernel/syscall_64.c | 5 +++-- arch/powerpc/kernel/vdso.c | 4 +++- arch/powerpc/perf/callchain.c | 14 ++++++++++---- 7 files changed, 35 insertions(+), 12 deletions(-)
arch/powerpc/include/asm/syscall.h +2 -0
@@ -16,7 +16,9 @@/* ftrace syscalls requires exporting the sys_call_table */ extern const unsigned long sys_call_table[]; +#ifdef CONFIG_COMPAT extern const unsigned long compat_sys_call_table[]; +#endif static inline int syscall_get_nr (struct task_struct *task,struct pt_regs *regs) {
arch/powerpc/kernel/Makefile +12 -3
@@ -44,16 +44,25 @@ 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 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 \ +ifndef CONFIG_PPC64 +obj-y += signal_32.o +else +ifdef CONFIG_COMPAT +obj-y += signal_32.o +endif +endif +obj-$(CONFIG_PPC64) += setup_64.o signal_64.o \ paca.o nvram_64.o firmware.o \ syscall_64.o +ifdef CONFIG_COMPAT +obj-$(CONFIG_PPC64) += sys_ppc32.o ptrace32.o +endif 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
@@ -51,8 +51,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 +3 -2
@@ -277,14 +277,15 @@ static void do_signal(struct task_struct *tsk)rseq_signal_deliver (&ksig, tsk->thread.regs); +#ifdef CONFIG_COMPAT if (is32) {if (ksig.ka.sa.sa_flags &SA_SIGINFO ) ret =handle_rt_signal32 (&ksig, oldset, tsk);else ret =handle_signal32 (&ksig, oldset, tsk); - }else { + } else +#endif /* CONFIG_COMPAT */ ret =handle_rt_signal64 (&ksig, oldset, tsk); - } tsk->thread.regs->trap =0 ;signal_setup_done (ret, &ksig,test_thread_flag (TIF_SINGLESTEP ));
arch/powerpc/kernel/syscall_64.c +3 -2
@@ -100,6 +100,7 @@ long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8,/* May be faster to do array_index_nospec? */ barrier_nospec (); +#ifdef CONFIG_COMPAT if (unlikely (ti_flags & _TIF_32BIT)) { f = (void *)compat_sys_call_table[r0];
@@ -110,9 +111,9 @@ long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8, r7 &=0x00000000ffffffffULL ; r8 &= 0x00000000ffffffffULL; - }else { + } else +#endif /* CONFIG_COMPAT */ f = (void *)sys_call_table[r0]; - }return f (r3, r4, r5, r6, r7, r8); }
arch/powerpc/kernel/vdso.c +3 -1
@@ -667,7 +667,7 @@ static void __init vdso_setup_syscall_map(void) {unsigned int i;extern unsigned long *sys_call_table; -#ifdef CONFIG_PPC64 +#if defined(CONFIG_PPC64 ) && defined(CONFIG_COMPAT )extern unsigned long *compat_sys_call_table;#endif extern unsigned long sys_ni_syscall;
@@ -678,9 +678,11 @@ 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 ); +#ifdef CONFIG_COMPAT if (compat_sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_32[i >>5 ] |=0x80000000UL >> (i &0x1f ); +#endif /* CONFIG_COMPAT */ #else /* CONFIG_PPC64 */ if (sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_32[i >> 5] |=
arch/powerpc/perf/callchain.c +10 -4
@@ -15,7 +15,7 @@#include <asm/sigcontext.h> #include <asm/ucontext.h> #include <asm/vdso.h> -#ifdef CONFIG_PPC64 +#if defined(CONFIG_PPC64 ) && defined(CONFIG_COMPAT )#include "../kernel/ppc32.h" #endif #include <asm/pte-walk.h>
@@ -165,6 +165,7 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret)return read_user_stack_slow (ptr, ret,8 ); } +#ifdef CONFIG_COMPAT static int read_user_stack_32 (unsigned int __user *ptr,unsigned int *ret) { if ((unsigned long)ptr > TASK_SIZE - sizeof(unsigned int) ||
@@ -180,6 +181,7 @@ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) return read_user_stack_slow(ptr, ret, 4); } +#endif static inline int valid_user_sp (unsigned long sp,int is_64) {
@@ -341,6 +343,7 @@ static inline int valid_user_sp(unsigned long sp, int is_64)#endif /* CONFIG_PPC64 */ +#if !defined(CONFIG_PPC64 ) || defined(CONFIG_COMPAT )/* * Layout for non-RT signal frames */
@@ -482,12 +485,15 @@ static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, sp = next_sp; } } +#endif /* 32bit */ void perf_callchain_user (struct perf_callchain_entry_ctx *entry,struct pt_regs *regs) { -if (current_is_64bit ()) -perf_callchain_user_64 (entry, regs); -else +#if !defined(CONFIG_PPC64 ) || defined(CONFIG_COMPAT ) +if (!current_is_64bit ())perf_callchain_user_32 (entry, regs); + else +#endif +perf_callchain_user_64 (entry, regs); }
Signature · 1 line
2.22.0
Re: [PATCH 3/4] powerpc/64: make buildable without CONFIG_COMPAT
Quoted 81 lines · On Tue, 27 Aug 2019 22:21:08 +0200 Michal Suchanek <[email protected]> wrote:
There are numerous references to 32bit functions in generic and 64bit code so ifdef them out.
Signed-off-by Michal Suchanek <[email protected]>--- arch/powerpc/include/asm/syscall.h | 2 ++ arch/powerpc/kernel/Makefile | 15 ++++++++++++--- arch/powerpc/kernel/entry_64.S | 2 ++ arch/powerpc/kernel/signal.c | 5 +++-- arch/powerpc/kernel/syscall_64.c | 5 +++-- arch/powerpc/kernel/vdso.c | 4 +++- arch/powerpc/perf/callchain.c | 14 ++++++++++---- 7 files changed, 35 insertions(+), 12 deletions(-)arch/powerpc/include/asm/syscall.h +2
-0@@ -16,7 +16,9 @@/* ftrace syscalls requires exporting the sys_call_table */ extern const unsigned long sys_call_table[]; +#ifdef CONFIG_COMPAT extern const unsigned long compat_sys_call_table[]; +#endif static inline int syscall_get_nr (struct task_struct *task,struct pt_regs *regs) {arch/powerpc/kernel/Makefile +12
-3@@ -44,16 +44,25 @@ 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 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 \ +ifndef CONFIG_PPC64 +obj-y += signal_32.o +else +ifdef CONFIG_COMPAT +obj-y += signal_32.o +endif +endif +obj-$(CONFIG_PPC64) += setup_64.o signal_64.o \ paca.o nvram_64.o firmware.o \ syscall_64.o +ifdef CONFIG_COMPAT +obj-$(CONFIG_PPC64) += sys_ppc32.o ptrace32.o +endif obj-$(CONFIG_VDSO32) += vdso32/ obj-$(CONFIG_PPC_WATCHDOG) += watchdog.o obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.oarch/powerpc/kernel/entry_64.S +2
-0@@ -51,8 +51,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 +0
-0
arch/powerpc/kernel/signal.c static void do_signal(struct task_struct *tsk) · line 280
Quoted 4 lines
arch/powerpc/kernel/signal.c +1
-0@@ -277,14 +277,15 @@ static void do_signal(struct task_struct *tsk)rseq_signal_deliver (&ksig, tsk->thread.regs); +#ifdef CONFIG_COMPAT
This is common code so it needs
#if !defined(CONFIG_PPC64) || defined(CONFIG_COMPAT)
Quoted 118 lines
arch/powerpc/kernel/signal.c +2
-2if (is32) {if (ksig.ka.sa.sa_flags &SA_SIGINFO ) ret =handle_rt_signal32 (&ksig, oldset, tsk);else ret =handle_signal32 (&ksig, oldset, tsk); - }else { + } else +#endif /* CONFIG_COMPAT */ ret =handle_rt_signal64 (&ksig, oldset, tsk); - } tsk->thread.regs->trap =0 ;signal_setup_done (ret, &ksig,test_thread_flag (TIF_SINGLESTEP ));arch/powerpc/kernel/syscall_64.c +3
-2@@ -100,6 +100,7 @@ long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8,/* May be faster to do array_index_nospec? */ barrier_nospec (); +#ifdef CONFIG_COMPAT if (unlikely (ti_flags & _TIF_32BIT)) { f = (void *)compat_sys_call_table[r0];@@ -110,9 +111,9 @@ long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8, r7 &=0x00000000ffffffffULL ; r8 &= 0x00000000ffffffffULL; - }else { + } else +#endif /* CONFIG_COMPAT */ f = (void *)sys_call_table[r0]; - }return f (r3, r4, r5, r6, r7, r8); }arch/powerpc/kernel/vdso.c +3
-1@@ -667,7 +667,7 @@ static void __init vdso_setup_syscall_map(void) {unsigned int i;extern unsigned long *sys_call_table; -#ifdef CONFIG_PPC64 +#if defined(CONFIG_PPC64 ) && defined(CONFIG_COMPAT )extern unsigned long *compat_sys_call_table;#endif extern unsigned long sys_ni_syscall;@@ -678,9 +678,11 @@ 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 ); +#ifdef CONFIG_COMPAT if (compat_sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_32[i >>5 ] |=0x80000000UL >> (i &0x1f ); +#endif /* CONFIG_COMPAT */ #else /* CONFIG_PPC64 */ if (sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_32[i >> 5] |=arch/powerpc/perf/callchain.c +10
-4@@ -15,7 +15,7 @@#include <asm/sigcontext.h> #include <asm/ucontext.h> #include <asm/vdso.h> -#ifdef CONFIG_PPC64 +#if defined(CONFIG_PPC64 ) && defined(CONFIG_COMPAT )#include "../kernel/ppc32.h" #endif #include <asm/pte-walk.h> @@ -165,6 +165,7 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret)return read_user_stack_slow (ptr, ret,8 ); } +#ifdef CONFIG_COMPAT static int read_user_stack_32 (unsigned int __user *ptr,unsigned int *ret) { if ((unsigned long)ptr > TASK_SIZE - sizeof(unsigned int) ||@@ -180,6 +181,7 @@ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) return read_user_stack_slow(ptr, ret, 4); } +#endif static inline int valid_user_sp (unsigned long sp,int is_64) {@@ -341,6 +343,7 @@ static inline int valid_user_sp(unsigned long sp, int is_64)#endif /* CONFIG_PPC64 */ +#if !defined(CONFIG_PPC64 ) || defined(CONFIG_COMPAT )/* * Layout for non-RT signal frames */ @@ -482,12 +485,15 @@ static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, sp = next_sp; } } +#endif /* 32bit */ void perf_callchain_user (struct perf_callchain_entry_ctx *entry,struct pt_regs *regs) { -if (current_is_64bit ()) -perf_callchain_user_64 (entry, regs); -else +#if !defined(CONFIG_PPC64 ) || defined(CONFIG_COMPAT ) +if (!current_is_64bit ())perf_callchain_user_32 (entry, regs); + else +#endif +perf_callchain_user_64 (entry, regs); }
PATCH 4/4 powerpc/64: Disable COMPAT if littleendian.
In reply to Michal Suchanekppc32le was never really a thing. Endian swap is already disabled by default so this 32bit support is kind of useless on ppc64le.
--- arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/Kconfig +1 -1
@@ -265,7 +265,7 @@ config PANIC_TIMEOUT config COMPAT bool - default y if PPC64 + default y if PPC64 && !CPU_LITTLE_ENDIAN select COMPAT_BINFMT_ELF select ARCH_WANT_OLD_COMPAT_IPC select COMPAT_OLD_SIGACTION
Signature · 1 line
2.22.0