Commit dacbe41f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h

While in theory user_enable_single_step/user_disable_single_step/
user_enable_blockstep could also be provided as an inline or macro there's
no good reason to do so, and having the prototype in one places keeps code
size and confusion down.

Roland said:

  The original thought there was that user_enable_single_step() et al
  might well be only an instruction or three on a sane machine (as if we
  have any of those!), and since there is only one call site inlining
  would be beneficial.  But I agree that there is no strong reason to care
  about inlining it.

  As to the arch changes, there is only one thought I'd add to the
  record.  It was always my thinking that for an arch where
  PTRACE_SINGLESTEP does text-modifying breakpoint insertion,
  user_enable_single_step() should not be provided.  That is,
  arch_has_single_step()=>true means that there is an arch facility with
  "pure" semantics that does not have any unexpected side effects.
  Inserting a breakpoint might do very unexpected strange things in
  multi-threaded situations.  Aside from that, it is a peculiar side
  effect that user_{enable,disable}_single_step() should cause COW
  de-sharing of text pages and so forth.  For PTRACE_SINGLESTEP, all these
  peculiarities are the status quo ante for that arch, so having
  arch_ptrace() itself do those is one thing.  But for building other
  things in the future, it is nicer to have a uniform "pure" semantics
  that arch-independent code can expect.

  OTOH, all such arch issues are really up to the arch maintainer.  As
  of today, there is nothing but ptrace using user_enable_single_step() et
  al so it's a distinction without a practical difference.  If/when there
  are other facilities that use user_enable_single_step() and might care,
  the affected arch's can revisit the question when someone cares about
  the quality of the arch support for said new facility.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b3c1e01a
...@@ -84,8 +84,6 @@ extern void show_regs(struct pt_regs *); ...@@ -84,8 +84,6 @@ extern void show_regs(struct pt_regs *);
#define task_pt_regs(task) ((task)->thread.frame0) #define task_pt_regs(task) ((task)->thread.frame0)
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -319,11 +319,7 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) ...@@ -319,11 +319,7 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
ptrace_attach_sync_user_rbs(child) ptrace_attach_sync_user_rbs(child)
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
#define arch_has_block_step() (1) #define arch_has_block_step() (1)
extern void user_enable_block_step(struct task_struct *);
#endif /* !__KERNEL__ */ #endif /* !__KERNEL__ */
......
...@@ -87,18 +87,10 @@ struct switch_stack { ...@@ -87,18 +87,10 @@ struct switch_stack {
#define profile_pc(regs) instruction_pointer(regs) #define profile_pc(regs) instruction_pointer(regs)
extern void show_regs(struct pt_regs *); extern void show_regs(struct pt_regs *);
/*
* These are defined as per linux/ptrace.h.
*/
struct task_struct;
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
#define arch_has_block_step() (1) #define arch_has_block_step() (1)
extern void user_enable_block_step(struct task_struct *);
#endif #endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -99,8 +99,6 @@ struct task_struct; ...@@ -99,8 +99,6 @@ struct task_struct;
extern void show_regs(struct pt_regs *); extern void show_regs(struct pt_regs *);
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
#endif /* !__ASSEMBLY */ #endif /* !__ASSEMBLY */
......
...@@ -47,13 +47,8 @@ struct pt_regs { ...@@ -47,13 +47,8 @@ struct pt_regs {
#define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS)) #define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS))
struct task_struct;
#define arch_has_single_step() 1 #define arch_has_single_step() 1
void user_disable_single_step(struct task_struct *task);
void user_enable_single_step(struct task_struct *task);
#define arch_has_block_step() 1 #define arch_has_block_step() 1
void user_enable_block_step(struct task_struct *task);
/* XXX should we use iaoq[1] or iaoq[0] ? */ /* XXX should we use iaoq[1] or iaoq[0] ? */
#define user_mode(regs) (((regs)->iaoq[0] & 3) ? 1 : 0) #define user_mode(regs) (((regs)->iaoq[0] & 3) ? 1 : 0)
......
...@@ -137,15 +137,8 @@ do { \ ...@@ -137,15 +137,8 @@ do { \
} while (0) } while (0)
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
/*
* These are defined as per linux/ptrace.h, which see.
*/
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
#define arch_has_block_step() (!cpu_has_feature(CPU_FTR_601)) #define arch_has_block_step() (!cpu_has_feature(CPU_FTR_601))
extern void user_enable_single_step(struct task_struct *);
extern void user_enable_block_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
#define ARCH_HAS_USER_SINGLE_STEP_INFO #define ARCH_HAS_USER_SINGLE_STEP_INFO
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
...@@ -489,9 +489,6 @@ struct user_regs_struct ...@@ -489,9 +489,6 @@ struct user_regs_struct
* These are defined as per linux/ptrace.h, which see. * These are defined as per linux/ptrace.h, which see.
*/ */
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
struct task_struct;
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
extern void show_regs(struct pt_regs * regs); extern void show_regs(struct pt_regs * regs);
#define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
......
...@@ -90,8 +90,7 @@ extern int read_tsk_short(struct task_struct *, unsigned long, ...@@ -90,8 +90,7 @@ extern int read_tsk_short(struct task_struct *, unsigned long,
unsigned short *); unsigned short *);
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_SCORE_PTRACE_H */ #endif /* _ASM_SCORE_PTRACE_H */
...@@ -123,8 +123,6 @@ extern void show_regs(struct pt_regs *); ...@@ -123,8 +123,6 @@ extern void show_regs(struct pt_regs *);
struct task_struct; struct task_struct;
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
struct perf_event; struct perf_event;
struct perf_sample_data; struct perf_sample_data;
......
...@@ -274,14 +274,7 @@ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, ...@@ -274,14 +274,7 @@ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs,
return 0; return 0;
} }
/*
* These are defined as per linux/ptrace.h, which see.
*/
#define arch_has_single_step() (1) #define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
extern void user_enable_block_step(struct task_struct *);
#ifdef CONFIG_X86_DEBUGCTLMSR #ifdef CONFIG_X86_DEBUGCTLMSR
#define arch_has_block_step() (1) #define arch_has_block_step() (1)
#else #else
......
...@@ -264,6 +264,9 @@ static inline void user_enable_single_step(struct task_struct *task) ...@@ -264,6 +264,9 @@ static inline void user_enable_single_step(struct task_struct *task)
static inline void user_disable_single_step(struct task_struct *task) static inline void user_disable_single_step(struct task_struct *task)
{ {
} }
#else
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
#endif /* arch_has_single_step */ #endif /* arch_has_single_step */
#ifndef arch_has_block_step #ifndef arch_has_block_step
...@@ -291,6 +294,8 @@ static inline void user_enable_block_step(struct task_struct *task) ...@@ -291,6 +294,8 @@ static inline void user_enable_block_step(struct task_struct *task)
{ {
BUG(); /* This can never be called. */ BUG(); /* This can never be called. */
} }
#else
extern void user_enable_block_step(struct task_struct *);
#endif /* arch_has_block_step */ #endif /* arch_has_block_step */
#ifdef ARCH_HAS_USER_SINGLE_STEP_INFO #ifdef ARCH_HAS_USER_SINGLE_STEP_INFO
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment