| Message ID | 161615658087.306069.12036720803234007510.stgit@devnote2 (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | kprobes: Fix stacktrace with kretprobes on x86 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Fri, 19 Mar 2021 21:23:01 +0900 Masami Hiramatsu <mhiramat@kernel.org> wrote: > Add instruction_pointer_set() API for ia64. > > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> > --- > arch/ia64/include/asm/ptrace.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/arch/ia64/include/asm/ptrace.h b/arch/ia64/include/asm/ptrace.h > index b3aa46090101..e382f1a6bff3 100644 > --- a/arch/ia64/include/asm/ptrace.h > +++ b/arch/ia64/include/asm/ptrace.h > @@ -45,6 +45,7 @@ > #include <asm/current.h> > #include <asm/page.h> > > +# define ia64_psr(regs) ((struct ia64_psr *) &(regs)->cr_ipsr) > /* > * We use the ia64_psr(regs)->ri to determine which of the three > * instructions in bundle (16 bytes) took the sample. Generate > @@ -71,6 +72,12 @@ static inline long regs_return_value(struct pt_regs *regs) > return -regs->r8; > } > > +static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long val) > +{ > + ia64_psr(regs)->ri = (val & 0xf); > + regs->cr_iip = (val & ~0xfULL); > +} Oops, this caused a build error. Thanks for the kernel test bot. It seems that all code which accessing to the "struct ia64_psr" in asm/ptrace.h has to be a macro, because "struct ia64_psr" is defined in the asm/processor.h which includes asm/ptrace.h (for pt_regs?). If the code is defined as an inline function, the "struct ia64_psr" is evaluated at that point, and caused build error. arch/ia64/include/asm/ptrace.h:77:16: error: dereferencing pointer to incomplete type 'struct ia64_psr' But macro code evaluation is postponed until it is used... Let me update it. Thank you,
diff --git a/arch/ia64/include/asm/ptrace.h b/arch/ia64/include/asm/ptrace.h index b3aa46090101..e382f1a6bff3 100644 --- a/arch/ia64/include/asm/ptrace.h +++ b/arch/ia64/include/asm/ptrace.h @@ -45,6 +45,7 @@ #include <asm/current.h> #include <asm/page.h> +# define ia64_psr(regs) ((struct ia64_psr *) &(regs)->cr_ipsr) /* * We use the ia64_psr(regs)->ri to determine which of the three * instructions in bundle (16 bytes) took the sample. Generate @@ -71,6 +72,12 @@ static inline long regs_return_value(struct pt_regs *regs) return -regs->r8; } +static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long val) +{ + ia64_psr(regs)->ri = (val & 0xf); + regs->cr_iip = (val & ~0xfULL); +} + /* Conserve space in histogram by encoding slot bits in address * bits 2 and 3 rather than bits 0 and 1. */ @@ -87,7 +94,6 @@ static inline long regs_return_value(struct pt_regs *regs) /* given a pointer to a task_struct, return the user's pt_regs */ # define task_pt_regs(t) (((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1) -# define ia64_psr(regs) ((struct ia64_psr *) &(regs)->cr_ipsr) # define user_mode(regs) (((struct ia64_psr *) &(regs)->cr_ipsr)->cpl != 0) # define user_stack(task,regs) ((long) regs - (long) task == IA64_STK_OFFSET - sizeof(*regs)) # define fsys_mode(task,regs) \
Add instruction_pointer_set() API for ia64. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> --- arch/ia64/include/asm/ptrace.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)