diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-08-22 13:18:18 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-09-07 21:53:48 +0200 |
| commit | 1fbcaa923ce2d7e6de17abd74fa076dc1e0be1a2 (patch) | |
| tree | f6b83d9a4edbd1c8cdc2ba1b48635fa2096a2eb6 /kernel/umh.c | |
| parent | freezer: Have {,un}lock_system_sleep() save/restore flags (diff) | |
| download | linux-1fbcaa923ce2d7e6de17abd74fa076dc1e0be1a2.tar.xz linux-1fbcaa923ce2d7e6de17abd74fa076dc1e0be1a2.zip | |
freezer,umh: Clean up freezer/initrd interaction
handle_initrd() marks itself as PF_FREEZER_SKIP in order to ensure
that the UMH, which is going to freeze the system, doesn't
indefinitely wait for it's caller.
Rework things by adding UMH_FREEZABLE to indicate the completion is
freezable.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20220822114648.791019324@infradead.org
Diffstat (limited to 'kernel/umh.c')
| -rw-r--r-- | kernel/umh.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/umh.c b/kernel/umh.c index b989736e8707..8945eaf4c671 100644 --- a/kernel/umh.c +++ b/kernel/umh.c @@ -28,6 +28,7 @@ #include <linux/async.h> #include <linux/uaccess.h> #include <linux/initrd.h> +#include <linux/freezer.h> #include <trace/events/module.h> @@ -436,6 +437,9 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info, int wait) if (wait == UMH_NO_WAIT) /* task has freed sub_info */ goto unlock; + if (wait & UMH_FREEZABLE) + freezer_do_not_count(); + if (wait & UMH_KILLABLE) { retval = wait_for_completion_killable(&done); if (!retval) @@ -448,6 +452,10 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info, int wait) } wait_for_completion(&done); + + if (wait & UMH_FREEZABLE) + freezer_count(); + wait_done: retval = sub_info->retval; out: |