From: Ricardo Ribalda <ribalda@chromium.org>
To: Juergen Gross <jgross@suse.com>, Mark Brown <broonie@kernel.org>,
Chromeos Kdump <chromeos-kdump@google.com>,
Daniel Baluta <daniel.baluta@nxp.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Len Brown <len.brown@intel.com>, Ard Biesheuvel <ardb@kernel.org>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Nicholas Piggin <npiggin@gmail.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Eric Biederman <ebiederm@xmission.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Jaroslav Kysela <perex@perex.cz>,
Joel Fernandes <joel@joelfernandes.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
Pavel Machek <pavel@ucw.cz>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Steven Rostedt <rostedt@goodmis.org>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Ingo Molnar <mingo@redhat.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Dexuan Cui <decui@microsoft.com>, Takashi Iwai <tiwai@suse.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Wei Liu <wei.liu@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>,
x86@kernel.org
Cc: kexec@lists.infradead.org, alsa-devel@alsa-project.org,
Ricardo Ribalda <ribalda@chromium.org>,
stable@vger.kernel.org, sound-open-firmware@alsa-project.org,
linuxppc-dev@lists.ozlabs.org, linux-hyperv@vger.kernel.org,
linux-pci@vger.kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org,
xen-devel@lists.xenproject.org
Subject: [PATCH v8 2/3] freezer: refactor pm_freezing into a function.
Date: Thu, 01 Dec 2022 12:08:22 +0100 [thread overview]
Message-ID: <20221127-snd-freeze-v8-2-3bc02d09f2ce@chromium.org> (raw)
In-Reply-To: <20221127-snd-freeze-v8-0-3bc02d09f2ce@chromium.org>
Add a way to let the drivers know if the processes are frozen.
This is needed by drivers that are waiting for processes to end on their
shutdown path.
Convert pm_freezing into a function and export it, so it can be used by
drivers that are either built-in or modules.
Cc: stable@vger.kernel.org
Fixes: 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown")
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
sdad
---
include/linux/freezer.h | 3 ++-
kernel/freezer.c | 3 +--
kernel/power/process.c | 24 ++++++++++++++++++++----
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index b303472255be..3413c869d68b 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -13,7 +13,7 @@
#ifdef CONFIG_FREEZER
DECLARE_STATIC_KEY_FALSE(freezer_active);
-extern bool pm_freezing; /* PM freezing in effect */
+bool pm_freezing(void);
extern bool pm_nosig_freezing; /* PM nosig freezing in effect */
/*
@@ -80,6 +80,7 @@ static inline int freeze_processes(void) { return -ENOSYS; }
static inline int freeze_kernel_threads(void) { return -ENOSYS; }
static inline void thaw_processes(void) {}
static inline void thaw_kernel_threads(void) {}
+static inline bool pm_freezing(void) { return false; }
static inline bool try_to_freeze(void) { return false; }
diff --git a/kernel/freezer.c b/kernel/freezer.c
index 4fad0e6fca64..2d3530ebdb7e 100644
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -20,7 +20,6 @@ EXPORT_SYMBOL(freezer_active);
* indicate whether PM freezing is in effect, protected by
* system_transition_mutex
*/
-bool pm_freezing;
bool pm_nosig_freezing;
/* protects freezing and frozen transitions */
@@ -46,7 +45,7 @@ bool freezing_slow_path(struct task_struct *p)
if (pm_nosig_freezing || cgroup_freezing(p))
return true;
- if (pm_freezing && !(p->flags & PF_KTHREAD))
+ if (pm_freezing() && !(p->flags & PF_KTHREAD))
return true;
return false;
diff --git a/kernel/power/process.c b/kernel/power/process.c
index ddd9988327fe..8a4d0e2c8c20 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -108,6 +108,22 @@ static int try_to_freeze_tasks(bool user_only)
return todo ? -EBUSY : 0;
}
+/*
+ * Indicate whether PM freezing is in effect, protected by
+ * system_transition_mutex.
+ */
+static bool pm_freezing_internal;
+
+/**
+ * pm_freezing - indicate whether PM freezing is in effect.
+ *
+ */
+bool pm_freezing(void)
+{
+ return pm_freezing_internal;
+}
+EXPORT_SYMBOL(pm_freezing);
+
/**
* freeze_processes - Signal user space processes to enter the refrigerator.
* The current thread will not be frozen. The same process that calls
@@ -126,12 +142,12 @@ int freeze_processes(void)
/* Make sure this task doesn't get frozen */
current->flags |= PF_SUSPEND_TASK;
- if (!pm_freezing)
+ if (!pm_freezing())
static_branch_inc(&freezer_active);
pm_wakeup_clear(0);
pr_info("Freezing user space processes ... ");
- pm_freezing = true;
+ pm_freezing_internal = true;
error = try_to_freeze_tasks(true);
if (!error) {
__usermodehelper_set_disable_depth(UMH_DISABLED);
@@ -187,9 +203,9 @@ void thaw_processes(void)
struct task_struct *curr = current;
trace_suspend_resume(TPS("thaw_processes"), 0, true);
- if (pm_freezing)
+ if (pm_freezing())
static_branch_dec(&freezer_active);
- pm_freezing = false;
+ pm_freezing_internal = false;
pm_nosig_freezing = false;
oom_killer_enable();
--
2.39.0.rc0.267.gcb52ba06e7-goog-b4-0.11.0-dev-696ae
next prev parent reply other threads:[~2022-12-01 11:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-01 11:08 [PATCH v8 0/3] ASoC: SOF: Fix deadlock when shutdown a frozen userspace Ricardo Ribalda
2022-12-01 11:08 ` [PATCH v8 1/3] kexec: Refactor kexec_in_progress into a function Ricardo Ribalda
2022-12-01 11:08 ` Ricardo Ribalda [this message]
2022-12-02 17:47 ` [PATCH v8 2/3] freezer: refactor pm_freezing " Rafael J. Wysocki
2022-12-05 12:05 ` Ricardo Ribalda
2022-12-01 11:08 ` [PATCH v8 3/3] ASoC: SOF: Fix deadlock when shutdown a frozen userspace Ricardo Ribalda
2022-12-01 12:28 ` Oliver Neukum
2022-12-01 13:03 ` Ricardo Ribalda
2022-12-01 13:22 ` Oliver Neukum
2022-12-01 13:34 ` Ricardo Ribalda
2022-12-09 11:53 ` Kai Vehmanen
2022-12-01 13:38 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221127-snd-freeze-v8-2-3bc02d09f2ce@chromium.org \
--to=ribalda@chromium.org \
--cc=alsa-devel@alsa-project.org \
--cc=ardb@kernel.org \
--cc=bhelgaas@google.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=chromeos-kdump@google.com \
--cc=daniel.baluta@nxp.com \
--cc=dave.hansen@linux.intel.com \
--cc=decui@microsoft.com \
--cc=ebiederm@xmission.com \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=joel@joelfernandes.org \
--cc=kai.vehmanen@linux.intel.com \
--cc=kexec@lists.infradead.org \
--cc=kys@microsoft.com \
--cc=len.brown@intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=pavel@ucw.cz \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rafael@kernel.org \
--cc=ranjani.sridharan@linux.intel.com \
--cc=rostedt@goodmis.org \
--cc=sound-open-firmware@alsa-project.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.com \
--cc=wei.liu@kernel.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).