ASoC: core: Exit all links before removing their components
PATCH RESEND 1/1 ASoC: core: Exit all links before removing their components
Flows leading to link->init() and link->exit() are not symmetric. Currently the relevant part of card probe sequence goes as:
for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->probe() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->probe() for_each_card_rtds(card, rtd) rtd->init()
On the other side, equivalent remove sequence goes as:
for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove() for_each_card_rtds(card, rtd) rtd->exit()
what can lead to errors as link->exit() may still operate on resources owned by its components despite the probability of them being freed during the component->remove().
This change modifies the remove sequence to:
for_each_card_rtds(card, rtd) rtd->exit() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove()
so code found in link->exit() is safe to touch any component stuff as component->remove() has not been called yet.
---
Original review for v1:
https://lore.kernel.org/alsa-devel/[email protected]/
sound/soc/soc-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/soc-core.c +3 -3
@@ -935,9 +935,6 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card, {lockdep_assert_held (&client_mutex); -/* release machine specific resources */ -snd_soc_link_exit (rtd); -/* * Notify the machine driver for extra destruction */
@@ -1888,6 +1885,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)snd_soc_dapm_shutdown (card); +/* release machine specific resources */ +for_each_card_rtds (card, rtd) +snd_soc_link_exit (rtd);/* remove and free each DAI */ soc_remove_link_dais (card);soc_remove_link_components (card);
Signature · 1 line
2.25.1
Quoted 38 lines · Cezary Rojewski
Flows leading to
link->init()andlink->exit()are not symmetric. Currently the relevant part of card probe sequence goes as:for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->probe() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->probe() for_each_card_rtds(card, rtd) rtd->init()On the other side, equivalent remove sequence goes as:
for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove() for_each_card_rtds(card, rtd) rtd->exit()what can lead to errors as
link->exit()may still operate on resources owned by its components despite the probability of them being freed during thecomponent->remove().This change modifies the remove sequence to:
for_each_card_rtds(card, rtd) rtd->exit() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove()
Quoted 2 lines
so code found in
link->exit()is safe to touch any component stuff ascomponent->remove()has not been called yet.
As this is connected (and is a dependency) for some jack-handler refactoring in Intel boards, perhaps it will be better if I send this patch as part of a series? Lacks some context.
Regards,
Czarek
Mark Brown
maintainerQuoted 12 lines · Cezary Rojewski
Flows leading to
link->init()andlink->exit()are not symmetric. Currently the relevant part of card probe sequence goes as:for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->probe() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->probe() for_each_card_rtds(card, rtd) rtd->init()
Quoted 1 line
[...]
Applied to
broonie/sound.git for-next
Thanks!
[1/1] ASoC: core: Exit all links before removing their components
commit: c7eb967d70446971413061effca3226578cb4dab
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark