Skip to contentSkip to conversation

remove asm-generic/ptrace.h v3

PATCH In review Christoph Hellwig 4 participants 10 messages Jun 24, 2019 – Jul 1, 2019

Subsystems (7)
x86 PowerPC MIPS arm64 +3 more subsystems
lore
Share & tools
lore
#0 lore raw

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.

I'm not sure which tree is the right place, but may this can go through the asm-generic tree since it removes an asm-generic header?

Changes since v2:
- rebase to latest Linus' tree that added an SPDX tag to asm-generic/ptrace.h
- collected two more Acks from Oleg
Changes since v1:
- add a missing empty line between functions

#1 lore raw

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
index dad858b6adc6..5a1e5025db96 100644
@@ -217,11 +217,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,
@@ -320,13 +321,20 @@ static inline unsigned long regs_get_kernel_argument(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])
 
@@ -336,7 +344,6 @@ static inline void procedure_link_pointer_set(struct pt_regs *regs,
 	procedure_link_pointer(regs) = val;
 }
 
-#undef profile_pc
 extern unsigned long profile_pc(struct pt_regs *regs);
 
 #endif /* __ASSEMBLY__ */
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/5 powerpc: don't use asm-generic/ptrace.h

In reply to 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.

---
 arch/powerpc/include/asm/ptrace.h | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/ptrace.h +22 -7
index faa5a338ac5a..feee1b21bbd5 100644
@@ -111,18 +111,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
#3 lore raw

PATCH 3/5 sh: don't use asm-generic/ptrace.h

In reply to 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.

---
 arch/sh/include/asm/ptrace.h | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)
arch/sh/include/asm/ptrace.h +25 -4
index 9143c7babcbe..6c89e3e04cee 100644
@@ -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
#4 lore raw

PATCH 4/5 x86: don't use asm-generic/ptrace.h

In reply to 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.

---
 arch/x86/include/asm/ptrace.h | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)
arch/x86/include/asm/ptrace.h +25 -5
index 8a7fc0cca2d1..e22816e865ca 100644
@@ -98,7 +98,6 @@ struct cpuinfo_x86;
 struct task_struct;
 
 extern unsigned long profile_pc(struct pt_regs *regs);
-#define profile_pc profile_pc
 
 extern unsigned long
 convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs);
@@ -175,11 +174,32 @@ 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
Reviewed-by on v1 4/5
#5 lore raw

Re: [PATCH 4/5] x86: don't use asm-generic/ptrace.h

Quoted 8 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.

#6 lore raw

PATCH 5/5 asm-generic: remove ptrace.h

In reply to Christoph Hellwig

No one is using this header anymore.

---
 MAINTAINERS                    |  1 -
 arch/mips/include/asm/ptrace.h |  5 ---
 include/asm-generic/ptrace.h   | 73 ----------------------------------
 3 files changed, 79 deletions(-)
 delete mode 100644 include/asm-generic/ptrace.h
MAINTAINERS +0 -1
index d0ed735994a5..43e5b6e215a9 100644
@@ -12778,7 +12778,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
index b6578611dddb..1e76774b36dd 100644
@@ -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 -73

73 lines not on this page · raw message

Signature · 1 line
2.20.1
Acked-by on v1 5/5
#7 lore raw

Re: [PATCH 5/5] asm-generic: remove ptrace.h

Quoted 11 lines · Christoph Hellwig

No one is using this header anymore.

---
 MAINTAINERS                    |  1 -
 arch/mips/include/asm/ptrace.h |  5 ---
 include/asm-generic/ptrace.h   | 73 ----------------------------------
 3 files changed, 79 deletions(-)
 delete mode 100644 include/asm-generic/ptrace.h

FWIW:

Thanks,
Paul

Quoted 16 lines
arch/mips/include/asm/ptrace.h +0 -5
index b6578611dddb..1e76774b36dd 100644
@@ -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)
 {
#8 lore raw
In reply to Christoph Hellwig
Quoted 9 lines · Christoph Hellwig

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.

I'm not sure which tree is the right place, but may this can go through the asm-generic tree since it removes an asm-generic header?

Makes sense.

Thanks,

tglx

maintainer
#9 lore raw
Quoted 9 lines · Thomas Gleixner
Quoted 7 lines · Christoph Hellwig

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.

Quoted 4 lines
Quoted 2 lines

I'm not sure which tree is the right place, but may this can go through the asm-generic tree since it removes an asm-generic header?

Makes sense.

Applied and pushed to asm-generic.git/master now, sorry for the delay.

Arnd