Commit a68de80f authored Sep 01, 2021 by Sean Christopherson Committed by Paolo Bonzini Sep 22, 2021

entry: rseq: Call rseq_handle_notify_resume() in tracehook_notify_resume()



Invoke rseq_handle_notify_resume() from tracehook_notify_resume() now
that the two function are always called back-to-back by architectures
that have rseq.  The rseq helper is stubbed out for architectures that
don't support rseq, i.e. this is a nop across the board.

Note, tracehook_notify_resume() is horribly named and arguably does not
belong in tracehook.h as literally every line of code in it has nothing
to do with tracing.  But, that's been true since commit a42c6ded
("move key_repace_session_keyring() into tracehook_notify_resume()")
first usurped tracehook_notify_resume() back in 2012.  Punt cleaning that
mess up to future patches.

No functional change intended.

Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20210901203030.1292304-3-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 8646e536

arch/arm/kernel/signal.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -628,7 +628,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
		uprobe_notify_resume(regs);
		} else {
		tracehook_notify_resume(regs);
		rseq_handle_notify_resume(NULL, regs);
		}
		}
		local_irq_disable();

arch/arm64/kernel/signal.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -940,10 +940,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags)
		if (thread_flags & (_TIF_SIGPENDING \| _TIF_NOTIFY_SIGNAL))
		do_signal(regs);

		if (thread_flags & _TIF_NOTIFY_RESUME) {
		if (thread_flags & _TIF_NOTIFY_RESUME)
		tracehook_notify_resume(regs);
		rseq_handle_notify_resume(NULL, regs);
		}

		if (thread_flags & _TIF_FOREIGN_FPSTATE)
		fpsimd_restore_current_state();

arch/csky/kernel/signal.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -260,8 +260,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs,
		if (thread_info_flags & (_TIF_SIGPENDING \| _TIF_NOTIFY_SIGNAL))
		do_signal(regs);

		if (thread_info_flags & _TIF_NOTIFY_RESUME) {
		if (thread_info_flags & _TIF_NOTIFY_RESUME)
		tracehook_notify_resume(regs);
		rseq_handle_notify_resume(NULL, regs);
		}
		}

arch/mips/kernel/signal.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -906,10 +906,8 @@ asmlinkage void do_notify_resume(struct pt_regs regs, void unused,
		if (thread_info_flags & (_TIF_SIGPENDING \| _TIF_NOTIFY_SIGNAL))
		do_signal(regs);

		if (thread_info_flags & _TIF_NOTIFY_RESUME) {
		if (thread_info_flags & _TIF_NOTIFY_RESUME)
		tracehook_notify_resume(regs);
		rseq_handle_notify_resume(NULL, regs);
		}

		user_enter();
		}

arch/powerpc/kernel/signal.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -293,10 +293,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
		do_signal(current);
		}

		if (thread_info_flags & _TIF_NOTIFY_RESUME) {
		if (thread_info_flags & _TIF_NOTIFY_RESUME)
		tracehook_notify_resume(regs);
		rseq_handle_notify_resume(NULL, regs);
		}
		}

		static unsigned long get_tm_stackpointer(struct task_struct *tsk)