github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-13 15:40:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: cs35l56: Fix race between kexec and snd_soc_register_component()

Browse Source 
Use a reboot notifier and a mutex to prevent snd_soc_register_component()
from racing with a kexec reboot. This prevents snd_soc_register_component()
from manipulating device lists while device_shutdown() is walking them.

Commit 1d80a4792f ("ASoC: cs35l56: Fix probe deadlock waiting for
SoundWire enumeration") moved snd_soc_register_component() out of probe()
into a workqueue item. See the description in that commit for a
detailed explanation.

That change introduces a race between snd_soc_register_component() and
kexec. The reboot notifier and mutex prevent the shutdown race.

There is one remaining race with KEXEC_JUMP because it does not invoke
reboot notifiers or freeze freezable workqueues. But KEXEC_JUMP is
rarely used and is supported on only two architectures (x86 and SuperH).
It does not appear to be enabled by default in any distro. It is also
unlikely there will be a KEXEC_JUMP before snd_soc_register_component()
has had the opportunity to execute. Fixing this can be deferred to a
future patch.

Fixes: 1d80a4792f ("ASoC: cs35l56: Fix probe deadlock waiting for SoundWire enumeration")
Assisted-by: Codex:gpt-5.6-sol
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20260907093645.27407-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Richard Fitzgerald 2026-09-07 10:36:45 +01:00 committed by Mark Brown
parent 22728415a9
commit 883e78c9e6
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sound/soc/codecs/cs35l56.c
View File

@ -18,9 +18,11 @@
#include <linux/interrupt.h>
#include <linux/math.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/pm.h>
#include <linux/pm_runtime.h>
#include <linux/property.h>
#include <linux/reboot.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
@ -37,6 +39,13 @@
#include "wm_adsp.h"
#include "cs35l56.h"
/*
* snd_soc_register_component() can call component_probe() on all instances
* in a card, so deferred registration must be protected across all instances.
*/
static DEFINE_MUTEX(cs35l56_component_register_lock);
static bool cs35l56_shutting_down;
void cs35l56_mask_soundwire_interrupts(struct cs35l56_private *cs35l56)
{
/*
@ -1957,6 +1966,11 @@ static void cs35l56_component_register_work(struct work_struct *work)
component_register_work);
int ret;
guard(mutex)(&cs35l56_component_register_lock);
if (cs35l56_shutting_down)
return;
PM_RUNTIME_ACQUIRE_AUTOSUSPEND(cs35l56->base.dev, pm_err);
ret = PM_RUNTIME_ACQUIRE_ERR(&pm_err);
if (ret) {
@ -2217,6 +2231,37 @@ EXPORT_NS_GPL_DEV_PM_OPS(cs35l56_pm_ops_i2c_spi, SND_SOC_CS35L56_CORE) = {
};
#endif
static int cs35l56_reboot_notify(struct notifier_block *nb,
unsigned long action, void *data)
{
guard(mutex)(&cs35l56_component_register_lock);
cs35l56_shutting_down = true;
return NOTIFY_DONE;
}
static struct notifier_block cs35l56_reboot_notifier = {
.notifier_call = cs35l56_reboot_notify,
};
static int __init cs35l56_modinit(void)
{
/*
* Use reboot notifier to prevent race between shutdown and
* snd_soc_register_component(). Driver shutdown() callback would
* run too late, after device_shutdown() is already walking the
* device list that component registration can modify.
*/
return register_reboot_notifier(&cs35l56_reboot_notifier);
}
module_init(cs35l56_modinit);
static void __exit cs35l56_modexit(void)
{
unregister_reboot_notifier(&cs35l56_reboot_notifier);
}
module_exit(cs35l56_modexit);
MODULE_DESCRIPTION("ASoC CS35L56 driver");
MODULE_IMPORT_NS("SND_SOC_CS35L56_SHARED");
MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");