Re: [PATCH 3/4] powerpc/64: make buildable without CONFIG_COMPAT
On Tue, 27 Aug 2019 22:21:08 +0200 Michal Suchanek wrote: > There are numerous references to 32bit functions in generic and 64bit > code so ifdef them out. > > Signed-off-by: Michal Suchanek > --- > 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(-) > > diff --git a/arch/powerpc/include/asm/syscall.h > b/arch/powerpc/include/asm/syscall.h > index 38d62acfdce7..3ed3b75541a1 100644 > --- a/arch/powerpc/include/asm/syscall.h > +++ b/arch/powerpc/include/asm/syscall.h > @@ -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) > { > diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile > index 1d646a94d96c..b0db365b83d8 100644 > --- a/arch/powerpc/kernel/Makefile > +++ b/arch/powerpc/kernel/Makefile > @@ -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 > diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S > index 2ec825a85f5b..a2dbf216f607 100644 > --- a/arch/powerpc/kernel/entry_64.S > +++ b/arch/powerpc/kernel/entry_64.S > @@ -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: > diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c > index 60436432399f..71f4f1794f86 100644 > --- a/arch/powerpc/kernel/signal.c > +++ b/arch/powerpc/kernel/signal.c > @@ -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) > 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)); > diff --git a/arch/powerpc/kernel/syscall_64.c > b/arch/powerpc/kernel/syscall_64.c > index 98ed970796d5..3f48262b512d 100644 > --- a/arch/powerpc/kernel/syscall_64.c > +++ b/arch/powerpc/kernel/syscall_64.c > @@ -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 &= 0xULL; > r8 &= 0xULL; > > - } else { > + } else > +#endif /* CONFIG_COMPAT */ > f = (void *)sys_call_table[r0]; > - } > > return f(r3, r4, r5, r6, r7, r8); >
[PATCH 3/4] powerpc/64: make buildable without CONFIG_COMPAT
There are numerous references to 32bit functions in generic and 64bit code so ifdef them out. Signed-off-by: Michal Suchanek --- 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(-) diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h index 38d62acfdce7..3ed3b75541a1 100644 --- a/arch/powerpc/include/asm/syscall.h +++ b/arch/powerpc/include/asm/syscall.h @@ -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) { diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 1d646a94d96c..b0db365b83d8 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -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 diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 2ec825a85f5b..a2dbf216f607 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -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: diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index 60436432399f..71f4f1794f86 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -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)); diff --git a/arch/powerpc/kernel/syscall_64.c b/arch/powerpc/kernel/syscall_64.c index 98ed970796d5..3f48262b512d 100644 --- a/arch/powerpc/kernel/syscall_64.c +++ b/arch/powerpc/kernel/syscall_64.c @@ -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 &= 0xULL; r8 &= 0xULL; - } else { + } else +#endif /* CONFIG_COMPAT */ f = (void *)sys_call_table[r0]; - } return f(r3, r4, r5, r6, r7, r8); } diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index d60598113a9f..2ab9327e44c4 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -667,7 +667,7 @@ static void __init vdso_setup_syscall_map(void) { unsigned int i; extern unsigned long *sys_call_table; -#ifdef CONFIG_PP