diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-11-09 07:19:32 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-11-09 07:19:32 -0700 |
| commit | 29701d69b98d0a132abd63fe2e51125f478fbc53 (patch) | |
| tree | 0650d3905c76124eb8c29d17c8434b5bb8954fe2 /kernel/entry/common.c | |
| parent | f8394f232b1eab649ce2df5c5f15b0e528c92091 (diff) | |
| parent | 114518eb6430b832d2f9f5a008043b913ccf0e24 (diff) | |
Merge tag 'core-entry-notify-signal' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into tif-task_work.arch
Core changes to support TASK_NOTIFY_SIGNAL
* tag 'core-entry-notify-signal' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
task_work: Use TIF_NOTIFY_SIGNAL if available
entry: Add support for TIF_NOTIFY_SIGNAL
signal: Add task_sigpending() helper
Diffstat (limited to 'kernel/entry/common.c')
| -rw-r--r-- | kernel/entry/common.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index e9e2df3f3f9e..33bb5f9f399c 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -135,7 +135,15 @@ static __always_inline void exit_to_user_mode(void) } /* Workaround to allow gradual conversion of architecture code */ -void __weak arch_do_signal(struct pt_regs *regs) { } +void __weak arch_do_signal_or_restart(struct pt_regs *regs, bool has_signal) { } + +static void handle_signal_work(struct pt_regs *regs, unsigned long ti_work) +{ + if (ti_work & _TIF_NOTIFY_SIGNAL) + tracehook_notify_signal(); + + arch_do_signal_or_restart(regs, ti_work & _TIF_SIGPENDING); +} static unsigned long exit_to_user_mode_loop(struct pt_regs *regs, unsigned long ti_work) @@ -157,8 +165,8 @@ static unsigned long exit_to_user_mode_loop(struct pt_regs *regs, if (ti_work & _TIF_PATCH_PENDING) klp_update_patch_state(current); - if (ti_work & _TIF_SIGPENDING) - arch_do_signal(regs); + if (ti_work & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) + handle_signal_work(regs, ti_work); if (ti_work & _TIF_NOTIFY_RESUME) { tracehook_notify_resume(regs); |