Re: [patch V4 part 3 02/29] x86/traps: Mark sync_regs() noinstr

Masami Hiramatsu
2020-05-11T12:09:08Z

On Tue, 05 May 2020 15:43:56 +0200
Thomas Gleixner <tglx@linutronix.de> wrote:

> Replace the notrace and NOKPROBE annotations with noinstr.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Looks good to me.

Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>

Thanks!

> ---
> arch/x86/kernel/traps.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> --- a/arch/x86/kernel/traps.c
> +++ b/arch/x86/kernel/traps.c
> @@ -639,14 +639,13 @@ NOKPROBE_SYMBOL(do_int3);
> * to switch to the normal thread stack if the interrupted code was in
> * user mode. The actual stack switch is done in entry_64.S
> */
> -asmlinkage __visible notrace struct pt_regs *sync_regs(struct pt_regs *eregs)
> +asmlinkage __visible noinstr struct pt_regs *sync_regs(struct pt_regs *eregs)
> {
> struct pt_regs *regs = (struct pt_regs *)this_cpu_read(cpu_current_top_of_stack) - 1;
> if (regs != eregs)
> *regs = *eregs;
> return regs;
> }
> -NOKPROBE_SYMBOL(sync_regs);
>
> struct bad_iret_stack {
> void *error_entry_ret;
>

--
Masami Hiramatsu <mhiramat@kernel.org>