Skip to content

Commit

Permalink
Merge tag 'asm-generic-5.3' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/git/arnd/asm-generic

Pull asm-generic updates from Arnd Bergmann:
 "The asm-generic changes for 5.3 consist of a cleanup series to remove
  ptrace.h from Christoph Hellwig, who explains:

    '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.'

  at https://lore.kernel.org/lkml/[email protected]/"

* tag 'asm-generic-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: remove ptrace.h
  x86: don't use asm-generic/ptrace.h
  sh: don't use asm-generic/ptrace.h
  powerpc: don't use asm-generic/ptrace.h
  arm64: don't use asm-generic/ptrace.h
  • Loading branch information
torvalds committed Jul 12, 2019
2 parents aabfea8 + 7f3a8df commit 5f26f11
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 107 deletions.
1 change: 0 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -12930,7 +12930,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
Expand Down
31 changes: 19 additions & 12 deletions arch/arm64/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,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,
Expand Down Expand Up @@ -326,13 +327,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])

Expand All @@ -342,7 +350,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__ */
Expand Down
5 changes: 0 additions & 5 deletions arch/mips/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
29 changes: 22 additions & 7 deletions arch/powerpc/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
29 changes: 25 additions & 4 deletions arch/sh/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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 */
30 changes: 25 additions & 5 deletions arch/x86/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -170,11 +169,32 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
return regs->sp;
}

#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);
Expand Down
73 changes: 0 additions & 73 deletions include/asm-generic/ptrace.h

This file was deleted.

0 comments on commit 5f26f11

Please sign in to comment.