Message ID | 20220824020548.62625-9-rmclure@linux.ibm.com (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
Series | powerpc: Syscall wrapper and register clearing | expand |
On Wed Aug 24, 2022 at 12:05 PM AEST, Rohan McLure wrote: > Forward declare all syscall handler prototypes where a generic prototype > is not provided in either linux/syscalls.h or linux/compat.h in > asm/syscalls.h. This is required for compile-time type-checking for > syscall handlers, which is implemented later in this series. > > 32-bit compatibility syscall handlers are expressed in terms of types in > ppc32.h. Expose this header globally. > > Signed-off-by: Rohan McLure <rmclure@linux.ibm.com> > --- > V1 -> V2: Explicitly include prototypes. > V2 -> V3: Remove extraneous #include <asm/compat.h> and ppc_fallocate > prototype. Rename header. > --- > arch/powerpc/include/asm/syscalls.h | 90 +++++++++++++----- > .../ppc32.h => include/asm/syscalls_32.h} | 0 > arch/powerpc/kernel/signal_32.c | 2 +- > arch/powerpc/perf/callchain_32.c | 2 +- > 4 files changed, 70 insertions(+), 24 deletions(-) > > diff --git a/arch/powerpc/include/asm/syscalls.h b/arch/powerpc/include/asm/syscalls.h > index 3e3aff0835a6..91417dee534e 100644 > --- a/arch/powerpc/include/asm/syscalls.h > +++ b/arch/powerpc/include/asm/syscalls.h > @@ -8,45 +8,91 @@ > #include <linux/types.h> > #include <linux/compat.h> > > +#ifdef CONFIG_PPC64 > +#include <asm/syscalls_32.h> > +#endif > +#include <asm/unistd.h> > +#include <asm/ucontext.h> > + > struct rtas_args; > > +#ifndef CONFIG_ARCH_HAS_SYSCALL_WRAPPER Do you need this ifdef? > + > +/* > + * PowerPC architecture-specific syscalls > + */ > + > +long sys_rtas(struct rtas_args __user *uargs); > +long sys_ni_syscall(void); > + > +#ifdef CONFIG_PPC64 > +long sys_ppc64_personality(unsigned long personality); > +#ifdef CONFIG_COMPAT > +long compat_sys_ppc64_personality(unsigned long personality); > +#endif /* CONFIG_COMPAT */ > +#endif /* CONFIG_PPC64 */ > + > +/* Parameters are reordered for powerpc to avoid padding */ > +long sys_ppc_fadvise64_64(int fd, int advice, > + u32 offset_high, u32 offset_low, > + u32 len_high, u32 len_low); Should this be under PPC32 since you're adding the ifdefs? Because you added a new comment here... This is register padding to do with something, even/odd pair calling convention? I can't remember the details would you be able to expand the comment a bit because I'm sure I'll forget it again too. Thanks, Nick
> On 12 Sep 2022, at 8:33 pm, Nicholas Piggin <npiggin@gmail.com> wrote: > > On Wed Aug 24, 2022 at 12:05 PM AEST, Rohan McLure wrote: >> Forward declare all syscall handler prototypes where a generic prototype >> is not provided in either linux/syscalls.h or linux/compat.h in >> asm/syscalls.h. This is required for compile-time type-checking for >> syscall handlers, which is implemented later in this series. >> >> 32-bit compatibility syscall handlers are expressed in terms of types in >> ppc32.h. Expose this header globally. >> >> Signed-off-by: Rohan McLure <rmclure@linux.ibm.com> >> --- >> V1 -> V2: Explicitly include prototypes. >> V2 -> V3: Remove extraneous #include <asm/compat.h> and ppc_fallocate >> prototype. Rename header. >> --- >> arch/powerpc/include/asm/syscalls.h | 90 +++++++++++++----- >> .../ppc32.h => include/asm/syscalls_32.h} | 0 >> arch/powerpc/kernel/signal_32.c | 2 +- >> arch/powerpc/perf/callchain_32.c | 2 +- >> 4 files changed, 70 insertions(+), 24 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/syscalls.h b/arch/powerpc/include/asm/syscalls.h >> index 3e3aff0835a6..91417dee534e 100644 >> --- a/arch/powerpc/include/asm/syscalls.h >> +++ b/arch/powerpc/include/asm/syscalls.h >> @@ -8,45 +8,91 @@ >> #include <linux/types.h> >> #include <linux/compat.h> >> >> +#ifdef CONFIG_PPC64 >> +#include <asm/syscalls_32.h> >> +#endif >> +#include <asm/unistd.h> >> +#include <asm/ucontext.h> >> + >> struct rtas_args; >> >> +#ifndef CONFIG_ARCH_HAS_SYSCALL_WRAPPER > > Do you need this ifdef? Good spot. I’ll introduce that with syscall wrappers. >> + >> +/* >> + * PowerPC architecture-specific syscalls >> + */ >> + >> +long sys_rtas(struct rtas_args __user *uargs); >> +long sys_ni_syscall(void); >> + >> +#ifdef CONFIG_PPC64 >> +long sys_ppc64_personality(unsigned long personality); >> +#ifdef CONFIG_COMPAT >> +long compat_sys_ppc64_personality(unsigned long personality); >> +#endif /* CONFIG_COMPAT */ >> +#endif /* CONFIG_PPC64 */ >> + >> +/* Parameters are reordered for powerpc to avoid padding */ >> +long sys_ppc_fadvise64_64(int fd, int advice, >> + u32 offset_high, u32 offset_low, >> + u32 len_high, u32 len_low); > > Should this be under PPC32 since you're adding the ifdefs? > > Because you added a new comment here... This is register padding > to do with something, even/odd pair calling convention? I can't > remember the details would you be able to expand the comment a bit > because I'm sure I'll forget it again too. Cool. I’ll neaten this up and change that comment. > > Thanks, > Nick
diff --git a/arch/powerpc/include/asm/syscalls.h b/arch/powerpc/include/asm/syscalls.h index 3e3aff0835a6..91417dee534e 100644 --- a/arch/powerpc/include/asm/syscalls.h +++ b/arch/powerpc/include/asm/syscalls.h @@ -8,45 +8,91 @@ #include <linux/types.h> #include <linux/compat.h> +#ifdef CONFIG_PPC64 +#include <asm/syscalls_32.h> +#endif +#include <asm/unistd.h> +#include <asm/ucontext.h> + struct rtas_args; +#ifndef CONFIG_ARCH_HAS_SYSCALL_WRAPPER + +/* + * PowerPC architecture-specific syscalls + */ + +long sys_rtas(struct rtas_args __user *uargs); +long sys_ni_syscall(void); + +#ifdef CONFIG_PPC64 +long sys_ppc64_personality(unsigned long personality); +#ifdef CONFIG_COMPAT +long compat_sys_ppc64_personality(unsigned long personality); +#endif /* CONFIG_COMPAT */ +#endif /* CONFIG_PPC64 */ + +/* Parameters are reordered for powerpc to avoid padding */ +long sys_ppc_fadvise64_64(int fd, int advice, + u32 offset_high, u32 offset_low, + u32 len_high, u32 len_low); +long sys_swapcontext(struct ucontext __user *old_ctx, + struct ucontext __user *new_ctx, long ctx_size); long sys_mmap(unsigned long addr, size_t len, unsigned long prot, unsigned long flags, unsigned long fd, off_t offset); long sys_mmap2(unsigned long addr, size_t len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff); -long sys_ppc64_personality(unsigned long personality); -long sys_rtas(struct rtas_args __user *uargs); -long sys_ppc_fadvise64_64(int fd, int advice, u32 offset_high, u32 offset_low, - u32 len_high, u32 len_low); +long sys_switch_endian(void); -#ifdef CONFIG_COMPAT -unsigned long compat_sys_mmap2(unsigned long addr, size_t len, - unsigned long prot, unsigned long flags, - unsigned long fd, unsigned long pgoff); - -compat_ssize_t compat_sys_pread64(unsigned int fd, char __user *ubuf, compat_size_t count, - u32 reg6, u32 pos1, u32 pos2); +#ifdef CONFIG_PPC32 +long sys_sigreturn(void); +long sys_debug_setcontext(struct ucontext __user *ctx, int ndbg, + struct sig_dbg_op __user *dbg); +#endif -compat_ssize_t compat_sys_pwrite64(unsigned int fd, const char __user *ubuf, compat_size_t count, - u32 reg6, u32 pos1, u32 pos2); +long sys_rt_sigreturn(void); -compat_ssize_t compat_sys_readahead(int fd, u32 r4, u32 offset1, u32 offset2, u32 count); +long sys_subpage_prot(unsigned long addr, + unsigned long len, u32 __user *map); -int compat_sys_truncate64(const char __user *path, u32 reg4, - unsigned long len1, unsigned long len2); +#ifdef CONFIG_COMPAT +long compat_sys_swapcontext(struct ucontext32 __user *old_ctx, + struct ucontext32 __user *new_ctx, + int ctx_size); +long compat_sys_old_getrlimit(unsigned int resource, + struct compat_rlimit __user *rlim); +long compat_sys_sigreturn(void); +long compat_sys_rt_sigreturn(void); -int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long len1, - unsigned long len2); +/* Architecture-specific implementations in sys_ppc32.c */ +long compat_sys_mmap2(unsigned long addr, size_t len, + unsigned long prot, unsigned long flags, + unsigned long fd, unsigned long pgoff); +long compat_sys_ppc_pread64(unsigned int fd, + char __user *ubuf, compat_size_t count, + u32 reg6, u32 pos1, u32 pos2); +long compat_sys_ppc_pwrite64(unsigned int fd, + const char __user *ubuf, compat_size_t count, + u32 reg6, u32 pos1, u32 pos2); +long compat_sys_ppc_readahead(int fd, u32 r4, + u32 offset1, u32 offset2, u32 count); +long compat_sys_ppc_truncate64(const char __user *path, u32 reg4, + unsigned long len1, unsigned long len2); +long compat_sys_ppc_ftruncate64(unsigned int fd, u32 reg4, + unsigned long len1, unsigned long len2); long compat_sys_ppc32_fadvise64(int fd, u32 unused, u32 offset1, u32 offset2, size_t len, int advice); +long compat_sys_ppc_sync_file_range2(int fd, unsigned int flags, + unsigned int offset1, + unsigned int offset2, + unsigned int nbytes1, + unsigned int nbytes2); +#endif /* CONFIG_COMPAT */ -long compat_sys_sync_file_range2(int fd, unsigned int flags, - unsigned int offset1, unsigned int offset2, - unsigned int nbytes1, unsigned int nbytes2); -#endif +#endif /* CONFIG_ARCH_HAS_SYSCALL_WRAPPER */ #endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_SYSCALLS_H */ diff --git a/arch/powerpc/kernel/ppc32.h b/arch/powerpc/include/asm/syscalls_32.h similarity index 100% rename from arch/powerpc/kernel/ppc32.h rename to arch/powerpc/include/asm/syscalls_32.h diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 157a7403e3eb..c114c7f25645 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -43,7 +43,7 @@ #include <asm/tm.h> #include <asm/asm-prototypes.h> #ifdef CONFIG_PPC64 -#include "ppc32.h" +#include <asm/syscalls_32.h> #include <asm/unistd.h> #else #include <asm/ucontext.h> diff --git a/arch/powerpc/perf/callchain_32.c b/arch/powerpc/perf/callchain_32.c index b83c47b7947f..ea8cfe3806dc 100644 --- a/arch/powerpc/perf/callchain_32.c +++ b/arch/powerpc/perf/callchain_32.c @@ -19,7 +19,7 @@ #include "callchain.h" #ifdef CONFIG_PPC64 -#include "../kernel/ppc32.h" +#include <asm/syscalls_32.h> #else /* CONFIG_PPC64 */ #define __SIGNAL_FRAMESIZE32 __SIGNAL_FRAMESIZE
Forward declare all syscall handler prototypes where a generic prototype is not provided in either linux/syscalls.h or linux/compat.h in asm/syscalls.h. This is required for compile-time type-checking for syscall handlers, which is implemented later in this series. 32-bit compatibility syscall handlers are expressed in terms of types in ppc32.h. Expose this header globally. Signed-off-by: Rohan McLure <rmclure@linux.ibm.com> --- V1 -> V2: Explicitly include prototypes. V2 -> V3: Remove extraneous #include <asm/compat.h> and ppc_fallocate prototype. Rename header. --- arch/powerpc/include/asm/syscalls.h | 90 +++++++++++++----- .../ppc32.h => include/asm/syscalls_32.h} | 0 arch/powerpc/kernel/signal_32.c | 2 +- arch/powerpc/perf/callchain_32.c | 2 +- 4 files changed, 70 insertions(+), 24 deletions(-)