diff options
| author | Christian Brauner <brauner@kernel.org> | 2026-08-25 16:49:37 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2026-08-31 10:05:14 +0200 |
| commit | ba8aba4be4d1916f2f28a62e8243e5c0283ea262 (patch) | |
| tree | ab5dbcd4203bcd6a38311e1650778961680fda82 /include | |
| parent | cee9395acd8043be0644b25c34bfa86623f2b935 (diff) | |
| parent | 5c0985dd3c32fc2bbd0e8beaf13cf52cd97376a2 (diff) | |
Merge patch series "Stop TIF_NOTIFY_SIGNAL from interrupting work that can't be restarted"
Christian Brauner <brauner@kernel.org> says:
Stop TIF_NOTIFY_SIGNAL from interrupting work that can't be restarted
Ok, so I was looking into things and as usual got
side-tracked so here we are. Oleg, save me please.
TIF_NOTIFY_SIGNAL is used to kick a task in uninterruptible sleep to
return to userspace and run task work and then go back to sleep. This
mechanism works well but breaks coredumps. dump_interrupted() only
allows fatal signals to interrupt a coredump and the whole regular write
path going to actual filesystems is impervious to TIF_NOTIFY_SIGNAL as
well.
The core is that you can have quite deep callchains that end up calling
signal_pending() in both the pipe and the socket codepaths so it's like
we can just pass a flag through somehow.
For coredumps its very annoying because it means io_uring is - depending
on how much outstanding work you have - incompatible with generating
non-truncated coredumps. A process with too many file backed mappings
and io_uring requests in flight ends up losing most of the coredump.
While zap_threads() has cleared TIF_SIGPENDING for a long time, just
clearing TIF_NOTIFY_SIGNAL isn't going to work because the next
completion will just set it again.
The fun part also is that io_uring isn't actually the only case:
(1) io_uring
(2) klp_send_signals()
(3) bpf_task_work_schedule_signal()
(4) landlock's tsync
And technically, kthread_stop() and the printk kunit test set the bit
raw. So no simple way of just fixing this in one subsystem.
So, a fix for this issue has the following constraints:
(i) The places where a write is aborted are deep callchains that we
can't reasonably parameterize. For example, anon_pipe_write(),
unix_stream_sendmsg(), unix_stream_read_generic(),
sk_stream_wait_memory(), or a bare wait_event_interruptible() in
wait_for_dump_helpers(). All of them are shared with regular
syscalls that must stay interruptible.
IOW, the state has to be per-task and ambient.
An LLM would call this "load bearing"...
(ii) There are multiple ways TIF_NOTIFY_SIGNAL can get raised and they
can get set from irq context against any task. As said above we
have at least io_uring paths (poll task_work, msg_ring, tctx exit,
io-wq via __set_notify_signal()), bpf_task_work_schedule_signal(),
klp_send_signals(), landlock tsync, plus kthread_stop() and the
printk kunit stuff that set the bit raw.
So fixing this up in the individual subsystems is doomed to fail or
require constant audits in case some new variant shows up.
(iii) The coredump task is exiting and can't restart the work.
So here's some stuff that was considered but I think is not really
feasible:
(a) Check for task_is_coredumping(). That will end up forcing
task_work_add() users to know about coredumps. This seems like a
layering violation.
I have a patch for this as well but it's ugly. It races with the
dump starting unless the bit setter takes a lock in the io_uring
completion. I know someone that will disagree with this approach. ;)
(b) Oleg's old suggestion iirc. Just clear the bit at coredump entry.
That doesn't work because io_uring poll completions just raise it
again from irq context. So you also need synchronization with the
setter of which there are quite a few.
(c) Let the setting task defer setting the bit if the task is flagged
and then raise it again at exit.
(d) Take TIF_NOTIFY_SIGNAL out of singal_pending() and make it opt-in at
specific points. That breaks io_uring quite badly and forces a
tree-wide audit.
So the amount of patches for this issue over the years is impressive. So
let me add one to the pile for the lolz.
Add PF_NO_NOTIFY_SIGNAL and helpers to raise/restore it. This is the
same approach as memalloc_nofs_save(). signal_pending() will not report
a fake pending signal via TIF_NOTIFY_SIGNAL if inside a
PF_NO_NOTIFY_SIGNAL critical section. Obviously you can't
fork()/clone3() in such a section.
Fix coredumps, smb, and pid namespace busy-reaping. Fwiw, I think
there's a few other potential users of the helpers that are left out of
this series.
| | notify_signal_pipe | notify_signal_socket |
|---------|---------------------------|---------------------------|
| fix | ok | ok |
|---------|---------------------------|---------------------------|
| unfixed | 357324 of ≥ 5111808 bytes | 467336 of ≥ 5111808 bytes |
* patches from https://patch.msgid.link/20260824-work-tif_notify_signal-v2-0-6609e42b3157@kernel.org:
pid_namespace: prevent TIF_NOTIFY_SIGNAL from interrupting the reaper
smb: prevent TIF_NOTIFY_SIGNAL from interrupting
selftests/coredump: test that TIF_NOTIFY_SIGNAL doesn't truncate a coredump
coredump: prevent TIF_NOTIFY_SIGNAL from interrupting coredumps
signal: allow taks to temporarily block TIF_NOTIFY_SIGNAL
Link: https://patch.msgid.link/20260824-work-tif_notify_signal-v2-0-6609e42b3157@kernel.org
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 2 | ||||
| -rw-r--r-- | include/linux/sched/signal.h | 27 |
2 files changed, 26 insertions, 3 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 8b3d47a325cc..e431c4195bf0 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1816,7 +1816,7 @@ extern struct pid *cad_pid; * I am cleaning dirty pages from some other bdi. */ #define PF_KTHREAD 0x00200000 /* I am a kernel thread */ #define PF_RANDOMIZE 0x00400000 /* Randomize virtual address space */ -#define PF__HOLE__00800000 0x00800000 +#define PF_NO_NOTIFY_SIGNAL 0x00800000 /* see no_notify_signal_save() */ #define PF__HOLE__01000000 0x01000000 #define PF__HOLE__02000000 0x02000000 #define PF_NO_SETAFFINITY 0x04000000 /* Userland is not allowed to meddle with cpus_mask */ diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h index 584ae88b435e..6164995da980 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -2,6 +2,7 @@ #ifndef _LINUX_SCHED_SIGNAL_H #define _LINUX_SCHED_SIGNAL_H +#include <linux/cleanup.h> #include <linux/rculist.h> #include <linux/signal.h> #include <linux/sched.h> @@ -384,14 +385,36 @@ static inline int task_sigpending(struct task_struct *p) return unlikely(test_tsk_thread_flag(p,TIF_SIGPENDING)); } +/* Prevent TIF_NOTIFY_SIGNAL from interrupting this task. */ +static inline unsigned int no_notify_signal_save(void) +{ + unsigned int flags = current->flags; + + current->flags |= PF_NO_NOTIFY_SIGNAL; + return flags; +} + +/* Restore the previous PF_NO_NOTIFY_SIGNAL state. */ +static inline void no_notify_signal_restore(unsigned int flags) +{ + current_restore_flags(flags, PF_NO_NOTIFY_SIGNAL); +} + +DEFINE_LOCK_GUARD_0(no_notify_signal, + _T->flags = no_notify_signal_save(), + no_notify_signal_restore(_T->flags), + unsigned int flags) + static inline int signal_pending(struct task_struct *p) { /* * TIF_NOTIFY_SIGNAL isn't really a signal, but it requires the same * behavior in terms of ensuring that we break out of wait loops - * so that notify signal callbacks can be processed. + * so that notify signal callbacks can be processed. Not for a task + * that asked not to be interrupted by it, see no_notify_signal_save(). */ - if (unlikely(test_tsk_thread_flag(p, TIF_NOTIFY_SIGNAL))) + if (unlikely(test_tsk_thread_flag(p, TIF_NOTIFY_SIGNAL)) && + likely(!(READ_ONCE(p->flags) & PF_NO_NOTIFY_SIGNAL))) return 1; return task_sigpending(p); } |
