Skip to content

Commit

Permalink
entry: rseq: Call rseq_handle_notify_resume() in tracehook_notify_res…
Browse files Browse the repository at this point in the history
…ume()

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 a42c6de
("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 <[email protected]>
Signed-off-by: Sean Christopherson <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
sean-jc authored and bonzini committed Sep 22, 2021
1 parent 8646e53 commit a68de80
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 19 deletions.
1 change: 0 additions & 1 deletion arch/arm/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 1 addition & 3 deletions arch/arm64/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 1 addition & 3 deletions arch/csky/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
4 changes: 1 addition & 3 deletions arch/mips/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
4 changes: 1 addition & 3 deletions arch/powerpc/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions include/linux/tracehook.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ static inline void tracehook_notify_resume(struct pt_regs *regs)

mem_cgroup_handle_over_high();
blkcg_maybe_throttle_current();

rseq_handle_notify_resume(NULL, regs);
}

/*
Expand Down
4 changes: 1 addition & 3 deletions kernel/entry/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,8 @@ static unsigned long exit_to_user_mode_loop(struct pt_regs *regs,
if (ti_work & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL))
handle_signal_work(regs, ti_work);

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

/* Architecture specific TIF work */
arch_exit_to_user_mode_work(regs, ti_work);
Expand Down
4 changes: 1 addition & 3 deletions kernel/entry/kvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti_work)
if (ti_work & _TIF_NEED_RESCHED)
schedule();

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

ret = arch_xfer_to_guest_mode_handle_work(vcpu, ti_work);
if (ret)
Expand Down

0 comments on commit a68de80

Please sign in to comment.