remove asm-generic/ptrace.h
Hi all,
asm-generic/ptrace.h is a little weird in that it doesn't actually implement any functionality, but it provided multiple layers of macros that just implement trivial inline functions. We implement those directly in the few architectures and be off with a much simpler design.
PATCH 1/5 arm64: don't use asm-generic/ptrace.h
Doing the indirection through macros for the regs accessors just makes them harder to read, so implement the helpers directly.
Note that only the helpers actually used are implemented now.
--- arch/arm64/include/asm/ptrace.h | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
arch/arm64/include/asm/ptrace.h +19 -12
@@ -228,11 +228,12 @@ static inline void forget_syscall(struct pt_regs *regs)#define fast_interrupts_enabled (regs) \ (!((regs)->pstate & PSR_F_BIT)) -#define GET_USP (regs) \ - (!compat_user_mode(regs) ? (regs)->sp : (regs)->compat_sp) - -#define SET_USP (ptregs, value) \ - (!compat_user_mode(regs) ? ((regs)->sp = value) : ((regs)->compat_sp = value)) +static inline unsigned long user_stack_pointer (struct pt_regs *regs) +{ +if (compat_user_mode (regs)) +return regs->compat_sp; +return regs->sp; +}extern int regs_query_register_offset (const char *name); extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs,
@@ -309,13 +310,20 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)struct task_struct ;int valid_user_regs (struct user_pt_regs *regs,struct task_struct *task); -#define GET_IP (regs) ((unsigned long)(regs)->pc) -#define SET_IP (regs, value) ((regs)->pc = ((u64) (value))) - -#define GET_FP (ptregs) ((unsigned long)(ptregs)->regs[29]) -#define SET_FP (ptregs, value) ((ptregs)->regs[29] = ((u64) (value))) +static inline unsigned long instruction_pointer (struct pt_regs *regs) +{ +return regs->pc; +} +static inline void instruction_pointer_set (struct pt_regs *regs, +unsigned long val) +{ + regs->pc = val; +} -#include <asm-generic/ptrace.h> +static inline unsigned long frame_pointer (struct pt_regs *regs) +{ +return regs->regs[29 ]; +}#define procedure_link_pointer (regs) ((regs)->regs[30])
@@ -325,7 +333,6 @@ static inline void procedure_link_pointer_set(struct pt_regs *regs, procedure_link_pointer(regs) = val; } -#undef profile_pcextern unsigned long profile_pc (struct pt_regs *regs);#endif /* __ASSEMBLY__ */
Signature · 1 line
2.20.1
Re: [PATCH 1/5] arm64: don't use asm-generic/ptrace.h
Quoted 6 lines · Christoph Hellwig
Doing the indirection through macros for the regs accessors just makes them harder to read, so implement the helpers directly.
Note that only the helpers actually used are implemented now.
Signed-off-by Christoph Hellwig <[email protected]>
PATCH 2/5 powerpc: don't use asm-generic/ptrace.h
In reply to Christoph HellwigDoing the indirection through macros for the regs accessors just makes them harder to read, so implement the helpers directly.
Note that only the helpers actually used are implemented now.
--- arch/powerpc/include/asm/ptrace.h | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/ptrace.h +22 -7
@@ -108,18 +108,33 @@ struct pt_regs#ifndef __ASSEMBLY__ -#define GET_IP (regs) ((regs)->nip) -#define GET_USP (regs) ((regs)->gpr[1]) -#define GET_FP (regs) (0) -#define SET_FP (regs, val) +static inline unsigned long instruction_pointer (struct pt_regs *regs) +{ +return regs->nip; +} + +static inline void instruction_pointer_set (struct pt_regs *regs, +unsigned long val) +{ + regs->nip = val; +} + +static inline unsigned long user_stack_pointer (struct pt_regs *regs) +{ +return regs->gpr[1 ]; +} + +static inline unsigned long frame_pointer (struct pt_regs *regs) +{ +return 0 ; +}#ifdef CONFIG_SMP extern unsigned long profile_pc (struct pt_regs *regs); -#define profile_pc profile_pc +#else +#define profile_pc (regs) instruction_pointer(regs)#endif -#include <asm-generic/ptrace.h> -#define kernel_stack_pointer (regs) ((regs)->gpr[1])static inline int is_syscall_success (struct pt_regs *regs) {
Signature · 1 line
2.20.1
Re: [PATCH 2/5] powerpc: don't use asm-generic/ptrace.h
Quoted 9 lines · Christoph Hellwig
Doing the indirection through macros for the regs accessors just makes them harder to read, so implement the helpers directly.
Note that only the helpers actually used are implemented now.
Signed-off-by Christoph Hellwig <[email protected]>--- arch/powerpc/include/asm/ptrace.h | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)
Looks fine, thanks.
cheers
Quoted 47 lines
arch/powerpc/include/asm/ptrace.h +22
-7@@ -108,18 +108,33 @@ struct pt_regs#ifndef __ASSEMBLY__ -#define GET_IP (regs) ((regs)->nip) -#define GET_USP (regs) ((regs)->gpr[1]) -#define GET_FP (regs) (0) -#define SET_FP (regs, val) +static inline unsigned long instruction_pointer (struct pt_regs *regs) +{ +return regs->nip; +} + +static inline void instruction_pointer_set (struct pt_regs *regs, +unsigned long val) +{ + regs->nip = val; +} + +static inline unsigned long user_stack_pointer (struct pt_regs *regs) +{ +return regs->gpr[1 ]; +} + +static inline unsigned long frame_pointer (struct pt_regs *regs) +{ +return 0 ; +}#ifdef CONFIG_SMP extern unsigned long profile_pc (struct pt_regs *regs); -#define profile_pc profile_pc +#else +#define profile_pc (regs) instruction_pointer(regs)#endif -#include <asm-generic/ptrace.h> -#define kernel_stack_pointer (regs) ((regs)->gpr[1])static inline int is_syscall_success (struct pt_regs *regs) {Signature · 1 line
2.20.1
PATCH 3/5 sh: don't use asm-generic/ptrace.h
In reply to Christoph HellwigDoing the indirection through macros for the regs accessors just makes them harder to read, so implement the helpers directly.
Note that only the helpers actually used are implemented now.
--- arch/sh/include/asm/ptrace.h | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
arch/sh/include/asm/ptrace.h +25 -4
@@ -16,8 +16,31 @@#define user_mode (regs) (((regs)->sr & 0x40000000)==0)#define kernel_stack_pointer (_regs) ((unsigned long)(_regs)->regs[15]) -#define GET_FP (regs) ((regs)->regs[14]) -#define GET_USP (regs) ((regs)->regs[15]) +static inline unsigned long instruction_pointer (struct pt_regs *regs) +{ +return regs->pc; +} +static inline void instruction_pointer_set (struct pt_regs *regs, +unsigned long val) +{ + regs->pc = val; +} + +static inline unsigned long frame_pointer (struct pt_regs *regs) +{ +return regs->regs[14 ]; +} + +static inline unsigned long user_stack_pointer (struct pt_regs *regs) +{ +return regs->regs[15 ]; +} + +static inline void user_stack_pointer_set (struct pt_regs *regs, +unsigned long val) +{ + regs->regs[15 ] = val; +}#define arch_has_single_step () (1)
@@ -112,7 +135,5 @@ static inline unsigned long profile_pc(struct pt_regs *regs) return pc; } -#define profile_pc profile_pc -#include <asm-generic/ptrace.h> #endif /* __ASM_SH_PTRACE_H */
Signature · 1 line
2.20.1
PATCH 4/5 x86: don't use asm-generic/ptrace.h
In reply to Christoph HellwigDoing the indirection through macros for the regs accessors just makes them harder to read, so implement the helpers directly.
Note that only the helpers actually used are implemented now.
--- arch/x86/include/asm/ptrace.h | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
arch/x86/include/asm/ptrace.h +24 -5
@@ -98,7 +98,6 @@ struct cpuinfo_x86;struct task_struct ;extern unsigned long profile_pc (struct pt_regs *regs); -#define profile_pc profile_pcextern unsigned long convert_ip_to_linear (struct task_struct *child,struct pt_regs *regs);
@@ -175,11 +174,31 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) }#endif -#define GET_IP (regs) ((regs)->ip) -#define GET_FP (regs) ((regs)->bp) -#define GET_USP (regs) ((regs)->sp) +static inline unsigned long instruction_pointer (struct pt_regs *regs) +{ +return regs->ip; +} +static inline void instruction_pointer_set (struct pt_regs *regs, +unsigned long val) +{ + regs->ip = val; +} + +static inline unsigned long frame_pointer (struct pt_regs *regs) +{ +return regs->bp; +} -#include <asm-generic/ptrace.h> +static inline unsigned long user_stack_pointer (struct pt_regs *regs) +{ +return regs->sp; +} + +static inline void user_stack_pointer_set (struct pt_regs *regs, +unsigned long val) +{ + regs->sp = val; +}/* Query offset/name of register from its name/offset */ extern int regs_query_register_offset (const char *name);
Signature · 1 line
2.20.1
Re: [PATCH 4/5] x86: don't use asm-generic/ptrace.h
Quoted 24 lines · Christoph Hellwig
Doing the indirection through macros for the regs accessors just makes them harder to read, so implement the helpers directly.
Note that only the helpers actually used are implemented now.
Signed-off-by Christoph Hellwig <[email protected]>--- arch/x86/include/asm/ptrace.h | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)arch/x86/include/asm/ptrace.h +0
-1@@ -98,7 +98,6 @@ struct cpuinfo_x86;struct task_struct ;extern unsigned long profile_pc (struct pt_regs *regs); -#define profile_pc profile_pcextern unsigned long convert_ip_to_linear (struct task_struct *child,struct pt_regs *regs);@@ -175,11 +174,31 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) }
arch/x86/include/asm/ptrace.h static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) · line 181
Quoted 10 lines
arch/x86/include/asm/ptrace.h +5
-3#endif -#define GET_IP (regs) ((regs)->ip) -#define GET_FP (regs) ((regs)->bp) -#define GET_USP (regs) ((regs)->sp) +static inline unsigned long instruction_pointer (struct pt_regs *regs) +{ +return regs->ip; +} +static inline void instruction_pointer_set(struct pt_regs *regs,
Nit: missing newline between inline functions.
Quoted 11 lines
arch/x86/include/asm/ptrace.h +9
-1+ unsigned long val) +{ + regs->ip = val; +} + +static inline unsigned long frame_pointer (struct pt_regs *regs) +{ +return regs->bp; +} -#include <asm-generic/ptrace.h>
arch/x86/include/asm/ptrace.h static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) · line 201
Quoted 10 lines
arch/x86/include/asm/ptrace.h +10
-0+static inline unsigned long user_stack_pointer (struct pt_regs *regs) +{ +return regs->sp; +} + +static inline void user_stack_pointer_set (struct pt_regs *regs, +unsigned long val) +{ + regs->sp = val; +}
Other than that:
Thanks,
Ingo
PATCH 5/5 asm-generic: remove ptrace.h
In reply to Christoph HellwigNo one is using this helper anymore.
--- MAINTAINERS | 1 - arch/mips/include/asm/ptrace.h | 5 --- include/asm-generic/ptrace.h | 74 ---------------------------------- 3 files changed, 80 deletions(-) delete mode 100644 include/asm-generic/ptrace.h
MAINTAINERS +0 -1
@@ -12586,7 +12586,6 @@ F: include/linux/regset.h F: include/linux/tracehook.h F: include/uapi/linux/ptrace.h F: include/uapi/linux/ptrace.h -F: include/asm-generic/ptrace.h F: kernel/ptrace.c F: arch/*/ptrace*.c F: arch/*/*/ptrace*.c
arch/mips/include/asm/ptrace.h +0 -5
@@ -56,11 +56,6 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)return regs->regs[31 ]; } -/* -* Don't use asm-generic/ptrace.h it defines FP accessors that don't make -* sense on MIPS. We rather want an error if they get invoked. -*/ -static inline void instruction_pointer_set (struct pt_regs *regs,unsigned long val) {
include/asm-generic/ptrace.h deleted +0 -74
74 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH 5/5] asm-generic: remove ptrace.h
Quoted 4 lines · Christoph Hellwig
No one is using this helper anymore.
Signed-off-by Christoph Hellwig <[email protected]>
Oleg Nesterov
maintainerQuoted 8 lines · Christoph Hellwig
Hi all,
asm-generic/ptrace.his a little weird in that it doesn't actually implement any functionality, but it provided multiple layers of macros that just implement trivial inline functions. We implement those directly in the few architectures and be off with a much simpler design.
Oh, thanks, I was always confused by these macros ;)
Oleg.