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 3/3] ASoC: SOF: Fix deadlock when shutdown a frozen userspace
Date: Thu, 01 Dec 2022 12:08:23 +0100 [thread overview]
Message-ID: <20221127-snd-freeze-v8-3-3bc02d09f2ce@chromium.org> (raw)
In-Reply-To: <20221127-snd-freeze-v8-0-3bc02d09f2ce@chromium.org>
If we are shutting down due to kexec and the userspace is frozen, the
system will stall forever waiting for userspace to complete.
Do not wait for the clients to complete in that case.
This fixes:
[ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done.
[ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds.
[ 246.819035] Call Trace:
[ 246.821782] <TASK>
[ 246.824186] __schedule+0x5f9/0x1263
[ 246.828231] schedule+0x87/0xc5
[ 246.831779] snd_card_disconnect_sync+0xb5/0x127
...
[ 246.889249] snd_sof_device_shutdown+0xb4/0x150
[ 246.899317] pci_device_shutdown+0x37/0x61
[ 246.903990] device_shutdown+0x14c/0x1d6
[ 246.908391] kernel_kexec+0x45/0xb9
And:
[ 246.893222] INFO: task kexec-lite:4891 blocked for more than 122 seconds.
[ 246.927709] Call Trace:
[ 246.930461] <TASK>
[ 246.932819] __schedule+0x5f9/0x1263
[ 246.936855] ? fsnotify_grab_connector+0x5c/0x70
[ 246.942045] schedule+0x87/0xc5
[ 246.945567] schedule_timeout+0x49/0xf3
[ 246.949877] wait_for_completion+0x86/0xe8
[ 246.954463] snd_card_free+0x68/0x89
...
[ 247.001080] platform_device_unregister+0x12/0x35
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>
---
sound/soc/sof/core.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 3e6141d03770..9587b6a85103 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -9,6 +9,8 @@
//
#include <linux/firmware.h>
+#include <linux/kexec.h>
+#include <linux/freezer.h>
#include <linux/module.h>
#include <sound/soc.h>
#include <sound/sof.h>
@@ -484,9 +486,10 @@ int snd_sof_device_shutdown(struct device *dev)
* make sure clients and machine driver(s) are unregistered to force
* all userspace devices to be closed prior to the DSP shutdown sequence
*/
- sof_unregister_clients(sdev);
-
- snd_sof_machine_unregister(sdev, pdata);
+ if (!(kexec_in_progress() && pm_freezing())) {
+ sof_unregister_clients(sdev);
+ snd_sof_machine_unregister(sdev, pdata);
+ }
if (sdev->fw_state == SOF_FW_BOOT_COMPLETE)
return snd_sof_shutdown(sdev);
--
2.39.0.rc0.267.gcb52ba06e7-goog-b4-0.11.0-dev-696ae
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
WARNING: multiple messages have this Message-ID (diff)
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 3/3] ASoC: SOF: Fix deadlock when shutdown a frozen userspace
Date: Thu, 01 Dec 2022 12:08:23 +0100 [thread overview]
Message-ID: <20221127-snd-freeze-v8-3-3bc02d09f2ce@chromium.org> (raw)
In-Reply-To: <20221127-snd-freeze-v8-0-3bc02d09f2ce@chromium.org>
If we are shutting down due to kexec and the userspace is frozen, the
system will stall forever waiting for userspace to complete.
Do not wait for the clients to complete in that case.
This fixes:
[ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done.
[ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds.
[ 246.819035] Call Trace:
[ 246.821782] <TASK>
[ 246.824186] __schedule+0x5f9/0x1263
[ 246.828231] schedule+0x87/0xc5
[ 246.831779] snd_card_disconnect_sync+0xb5/0x127
...
[ 246.889249] snd_sof_device_shutdown+0xb4/0x150
[ 246.899317] pci_device_shutdown+0x37/0x61
[ 246.903990] device_shutdown+0x14c/0x1d6
[ 246.908391] kernel_kexec+0x45/0xb9
And:
[ 246.893222] INFO: task kexec-lite:4891 blocked for more than 122 seconds.
[ 246.927709] Call Trace:
[ 246.930461] <TASK>
[ 246.932819] __schedule+0x5f9/0x1263
[ 246.936855] ? fsnotify_grab_connector+0x5c/0x70
[ 246.942045] schedule+0x87/0xc5
[ 246.945567] schedule_timeout+0x49/0xf3
[ 246.949877] wait_for_completion+0x86/0xe8
[ 246.954463] snd_card_free+0x68/0x89
...
[ 247.001080] platform_device_unregister+0x12/0x35
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>
---
sound/soc/sof/core.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 3e6141d03770..9587b6a85103 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -9,6 +9,8 @@
//
#include <linux/firmware.h>
+#include <linux/kexec.h>
+#include <linux/freezer.h>
#include <linux/module.h>
#include <sound/soc.h>
#include <sound/sof.h>
@@ -484,9 +486,10 @@ int snd_sof_device_shutdown(struct device *dev)
* make sure clients and machine driver(s) are unregistered to force
* all userspace devices to be closed prior to the DSP shutdown sequence
*/
- sof_unregister_clients(sdev);
-
- snd_sof_machine_unregister(sdev, pdata);
+ if (!(kexec_in_progress() && pm_freezing())) {
+ sof_unregister_clients(sdev);
+ snd_sof_machine_unregister(sdev, pdata);
+ }
if (sdev->fw_state == SOF_FW_BOOT_COMPLETE)
return snd_sof_shutdown(sdev);
--
2.39.0.rc0.267.gcb52ba06e7-goog-b4-0.11.0-dev-696ae
WARNING: multiple messages have this Message-ID (diff)
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: alsa-devel@alsa-project.org, linux-efi@vger.kernel.org,
linux-pm@vger.kernel.org, linux-pci@vger.kernel.org,
kexec@lists.infradead.org, linux-hyperv@vger.kernel.org,
stable@vger.kernel.org, linux-kernel@vger.kernel.org,
Ricardo Ribalda <ribalda@chromium.org>,
xen-devel@lists.xenproject.org, linuxppc-dev@lists.ozlabs.org,
sound-open-firmware@alsa-project.org
Subject: [PATCH v8 3/3] ASoC: SOF: Fix deadlock when shutdown a frozen userspace
Date: Thu, 01 Dec 2022 12:08:23 +0100 [thread overview]
Message-ID: <20221127-snd-freeze-v8-3-3bc02d09f2ce@chromium.org> (raw)
In-Reply-To: <20221127-snd-freeze-v8-0-3bc02d09f2ce@chromium.org>
If we are shutting down due to kexec and the userspace is frozen, the
system will stall forever waiting for userspace to complete.
Do not wait for the clients to complete in that case.
This fixes:
[ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done.
[ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds.
[ 246.819035] Call Trace:
[ 246.821782] <TASK>
[ 246.824186] __schedule+0x5f9/0x1263
[ 246.828231] schedule+0x87/0xc5
[ 246.831779] snd_card_disconnect_sync+0xb5/0x127
...
[ 246.889249] snd_sof_device_shutdown+0xb4/0x150
[ 246.899317] pci_device_shutdown+0x37/0x61
[ 246.903990] device_shutdown+0x14c/0x1d6
[ 246.908391] kernel_kexec+0x45/0xb9
And:
[ 246.893222] INFO: task kexec-lite:4891 blocked for more than 122 seconds.
[ 246.927709] Call Trace:
[ 246.930461] <TASK>
[ 246.932819] __schedule+0x5f9/0x1263
[ 246.936855] ? fsnotify_grab_connector+0x5c/0x70
[ 246.942045] schedule+0x87/0xc5
[ 246.945567] schedule_timeout+0x49/0xf3
[ 246.949877] wait_for_completion+0x86/0xe8
[ 246.954463] snd_card_free+0x68/0x89
...
[ 247.001080] platform_device_unregister+0x12/0x35
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>
---
sound/soc/sof/core.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 3e6141d03770..9587b6a85103 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -9,6 +9,8 @@
//
#include <linux/firmware.h>
+#include <linux/kexec.h>
+#include <linux/freezer.h>
#include <linux/module.h>
#include <sound/soc.h>
#include <sound/sof.h>
@@ -484,9 +486,10 @@ int snd_sof_device_shutdown(struct device *dev)
* make sure clients and machine driver(s) are unregistered to force
* all userspace devices to be closed prior to the DSP shutdown sequence
*/
- sof_unregister_clients(sdev);
-
- snd_sof_machine_unregister(sdev, pdata);
+ if (!(kexec_in_progress() && pm_freezing())) {
+ sof_unregister_clients(sdev);
+ snd_sof_machine_unregister(sdev, pdata);
+ }
if (sdev->fw_state == SOF_FW_BOOT_COMPLETE)
return snd_sof_shutdown(sdev);
--
2.39.0.rc0.267.gcb52ba06e7-goog-b4-0.11.0-dev-696ae
next prev parent reply other threads:[~2022-12-01 11:14 UTC|newest]
Thread overview: 42+ 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 ` Ricardo Ribalda
2022-12-01 11:08 ` 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
2022-12-01 11:08 ` Ricardo Ribalda
2022-12-01 11:08 ` [PATCH v8 2/3] freezer: refactor pm_freezing " Ricardo Ribalda
2022-12-01 11:08 ` Ricardo Ribalda
2022-12-01 11:08 ` Ricardo Ribalda
2022-12-02 17:47 ` Rafael J. Wysocki
2022-12-02 17:47 ` Rafael J. Wysocki
2022-12-02 17:47 ` Rafael J. Wysocki
2022-12-02 17:47 ` Rafael J. Wysocki
2022-12-05 12:05 ` Ricardo Ribalda
2022-12-05 12:05 ` Ricardo Ribalda
2022-12-05 12:05 ` Ricardo Ribalda
2022-12-05 12:05 ` Ricardo Ribalda
2022-12-01 11:08 ` Ricardo Ribalda [this message]
2022-12-01 11:08 ` [PATCH v8 3/3] ASoC: SOF: Fix deadlock when shutdown a frozen userspace Ricardo Ribalda
2022-12-01 11:08 ` Ricardo Ribalda
2022-12-01 12:28 ` Oliver Neukum
2022-12-01 12:28 ` Oliver Neukum
2022-12-01 12:28 ` Oliver Neukum
2022-12-01 13:03 ` Ricardo Ribalda
2022-12-01 13:03 ` Ricardo Ribalda
2022-12-01 13:03 ` Ricardo Ribalda
2022-12-01 13:03 ` Ricardo Ribalda
2022-12-01 13:22 ` Oliver Neukum
2022-12-01 13:22 ` Oliver Neukum
2022-12-01 13:22 ` Oliver Neukum
2022-12-01 13:22 ` Oliver Neukum
2022-12-01 13:34 ` Ricardo Ribalda
2022-12-01 13:34 ` Ricardo Ribalda
2022-12-01 13:34 ` Ricardo Ribalda
2022-12-01 13:34 ` Ricardo Ribalda
2022-12-09 11:53 ` Kai Vehmanen
2022-12-09 11:53 ` Kai Vehmanen
2022-12-09 11:53 ` Kai Vehmanen
2022-12-01 13:38 ` Takashi Iwai
2022-12-01 13:38 ` Takashi Iwai
2022-12-01 13:38 ` Takashi Iwai
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-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.