FAILED: patch "[PATCH] ASoC: qcom: sdw: fix memory leak for sdw_stream_runtime" failed to apply to 6.12-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x bcba17279327c6e85dee6a97014dc642e2dc93cc
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026010528-thesaurus-stoop-f4af@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From bcba17279327c6e85dee6a97014dc642e2dc93cc Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <[email protected]>
Date: Wed, 22 Oct 2025 15:33:46 +0100
Subject: [PATCH] ASoC: qcom: sdw: fix memory leak for sdw_stream_runtime
For some reason we endedup allocating sdw_stream_runtime for every cpu dai, this has two issues.
1. we never set snd_soc_dai_set_stream for non soundwire dai, which means there is no way that we can free this, resulting in memory leak
2. startup and shutdown callbacks can be called without hw_params callback called. This combination results in memory leak
because machine driver sruntime array pointer is only set in hw_params callback.
Fix this by
1. adding a helper function to get sdw_runtime for substream
which can be used by shutdown callback to get hold of sruntime to free.
2. only allocate sdw_runtime for soundwire dais.
sound/soc/qcom/sc7280.c +1 -1
@@ -317,7 +317,7 @@ static void sc7280_snd_shutdown(struct snd_pcm_substream *substream)struct snd_soc_card *card = rtd->card;struct sc7280_snd_data *data =snd_soc_card_get_drvdata (card);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); -struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; +struct sdw_stream_runtime *sruntime =qcom_snd_sdw_get_stream (substream);switch (cpu_dai->id) {case MI2S_PRIMARY :
sound/soc/qcom/sc8280xp.c +1 -1
@@ -73,7 +73,7 @@ static void sc8280xp_snd_shutdown(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 );struct sc8280xp_snd_data *pdata =snd_soc_card_get_drvdata (rtd->card); -struct sdw_stream_runtime *sruntime = pdata->sruntime[cpu_dai->id]; +struct sdw_stream_runtime *sruntime =qcom_snd_sdw_get_stream (substream); pdata->sruntime[cpu_dai->id] =NULL ;sdw_release_stream (sruntime);
sound/soc/qcom/sdw.c +59 -46
143 lines not on this page · raw message
sound/soc/qcom/sdw.h +1 -0
@@ -10,6 +10,7 @@ int qcom_snd_sdw_startup(struct snd_pcm_substream *substream);int qcom_snd_sdw_prepare (struct snd_pcm_substream *substream,struct sdw_stream_runtime *runtime,bool *stream_prepared); +struct sdw_stream_runtime *qcom_snd_sdw_get_stream (struct snd_pcm_substream *stream);int qcom_snd_sdw_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct sdw_stream_runtime **psruntime);
sound/soc/qcom/sm8250.c +1 -1
@@ -117,7 +117,7 @@ static void sm8250_snd_shutdown(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 );struct sm8250_snd_data *data =snd_soc_card_get_drvdata (rtd->card); -struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; +struct sdw_stream_runtime *sruntime =qcom_snd_sdw_get_stream (substream); data->sruntime[cpu_dai->id] =NULL ;sdw_release_stream (sruntime);
sound/soc/qcom/x1e80100.c +1 -1
@@ -55,7 +55,7 @@ static void x1e80100_snd_shutdown(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 );struct x1e80100_snd_data *data =snd_soc_card_get_drvdata (rtd->card); -struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; +struct sdw_stream_runtime *sruntime =qcom_snd_sdw_get_stream (substream); data->sruntime[cpu_dai->id] =NULL ;sdw_release_stream (sruntime);
Sasha Levin
maintainerPATCH 1/2 soundwire: stream: extend sdw_alloc_stream() to take 'type' parameter
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit dc90bbefa792031d89fe2af9ad4a6febd6be96a9 ]
In the existing definition of sdw_stream_runtime, the 'type' member is never set and defaults to PCM. To prepare for the BPT/BRA support, we need to special-case streams and make use of the 'type'.
No functional change for now, the implicit PCM type is now explicit.
Stable-dep-of: bcba17279327 ("ASoC: qcom: sdw: fix memory leak for sdw_stream_runtime")
--- Documentation/driver-api/soundwire/stream.rst | 2 +- drivers/soundwire/stream.c | 6 ++++-- include/linux/soundwire/sdw.h | 2 +- sound/soc/qcom/sdw.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-)
Documentation/driver-api/soundwire/stream.rst +1 -1
@@ -291,7 +291,7 @@ per stream. From ASoC DPCM framework, this stream state maybe linked to .. code-block:: c - int sdw_alloc_stream(char * stream_name); + int sdw_alloc_stream(char * stream_name, enum sdw_stream_type type); The SoundWire core provides a sdw_startup_stream() helper function, typically called during a dailink .startup() callback, which performs
drivers/soundwire/stream.c +4 -2
@@ -1744,12 +1744,13 @@ static int set_stream(struct snd_pcm_substream *substream,* sdw_alloc_stream() - Allocate and return stream runtime * * @stream_name: SoundWire stream name +* @type: stream type (could be PCM ,PDM or BPT) * * Allocates a SoundWire stream runtime instance. * sdw_alloc_stream should be called only once per stream. Typically * invoked from ALSA/ASoC machine/platform driver. */ -struct sdw_stream_runtime *sdw_alloc_stream (const char *stream_name) +struct sdw_stream_runtime *sdw_alloc_stream (const char *stream_name,enum sdw_stream_type type) {struct sdw_stream_runtime *stream;
@@ -1761,6 +1762,7 @@ struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name)INIT_LIST_HEAD (&stream->master_list); stream->state =SDW_STREAM_ALLOCATED ; stream->m_rt_count =0 ; + stream->type = type;return stream; }
@@ -1789,7 +1791,7 @@ int sdw_startup_stream(void *sdw_substream)if (!name)return -ENOMEM ; - sdw_stream =sdw_alloc_stream (name); + sdw_stream =sdw_alloc_stream (name,SDW_STREAM_PCM );if (!sdw_stream) {dev_err (rtd->dev,"alloc stream failed for substream DAI %s\n" , substream->name); ret = -ENOMEM ;
include/linux/soundwire/sdw.h +1 -1
@@ -1024,7 +1024,7 @@ struct sdw_stream_runtime {int m_rt_count; }; -struct sdw_stream_runtime *sdw_alloc_stream (const char *stream_name); +struct sdw_stream_runtime *sdw_alloc_stream (const char *stream_name,enum sdw_stream_type type);void sdw_release_stream (struct sdw_stream_runtime *stream);int sdw_compute_params (struct sdw_bus *bus);
sound/soc/qcom/sdw.c +1 -1
@@ -27,7 +27,7 @@ int qcom_snd_sdw_startup(struct snd_pcm_substream *substream)struct snd_soc_dai *codec_dai;int ret, i; - sruntime =sdw_alloc_stream (cpu_dai->name); + sruntime =sdw_alloc_stream (cpu_dai->name,SDW_STREAM_PCM );if (!sruntime)return -ENOMEM ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/2 ASoC: qcom: sdw: fix memory leak for sdw_stream_runtime
From: Srinivas Kandagatla <[email protected]>
[ Upstream commit bcba17279327c6e85dee6a97014dc642e2dc93cc ]
For some reason we endedup allocating sdw_stream_runtime for every cpu dai, this has two issues.
1. we never set snd_soc_dai_set_stream for non soundwire dai, which means there is no way that we can free this, resulting in memory leak
2. startup and shutdown callbacks can be called without hw_params callback called. This combination results in memory leak
because machine driver sruntime array pointer is only set in hw_params callback.
Fix this by
1. adding a helper function to get sdw_runtime for substream
which can be used by shutdown callback to get hold of sruntime to free.
2. only allocate sdw_runtime for soundwire dais.
--- sound/soc/qcom/sc7280.c | 2 +- sound/soc/qcom/sc8280xp.c | 2 +- sound/soc/qcom/sdw.c | 105 +++++++++++++++++++++----------------- sound/soc/qcom/sdw.h | 1 + sound/soc/qcom/sm8250.c | 2 +- sound/soc/qcom/x1e80100.c | 2 +- 6 files changed, 64 insertions(+), 50 deletions(-)
sound/soc/qcom/sc7280.c +1 -1
@@ -317,7 +317,7 @@ static void sc7280_snd_shutdown(struct snd_pcm_substream *substream)struct snd_soc_card *card = rtd->card;struct sc7280_snd_data *data =snd_soc_card_get_drvdata (card);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); -struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; +struct sdw_stream_runtime *sruntime =qcom_snd_sdw_get_stream (substream);switch (cpu_dai->id) {case MI2S_PRIMARY :
sound/soc/qcom/sc8280xp.c +1 -1
@@ -69,7 +69,7 @@ static void sc8280xp_snd_shutdown(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 );struct sc8280xp_snd_data *pdata =snd_soc_card_get_drvdata (rtd->card); -struct sdw_stream_runtime *sruntime = pdata->sruntime[cpu_dai->id]; +struct sdw_stream_runtime *sruntime =qcom_snd_sdw_get_stream (substream); pdata->sruntime[cpu_dai->id] =NULL ;sdw_release_stream (sruntime);
sound/soc/qcom/sdw.c +59 -46
143 lines not on this page · raw message
sound/soc/qcom/sdw.h +1 -0
@@ -10,6 +10,7 @@ int qcom_snd_sdw_startup(struct snd_pcm_substream *substream);int qcom_snd_sdw_prepare (struct snd_pcm_substream *substream,struct sdw_stream_runtime *runtime,bool *stream_prepared); +struct sdw_stream_runtime *qcom_snd_sdw_get_stream (struct snd_pcm_substream *stream);int qcom_snd_sdw_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct sdw_stream_runtime **psruntime);
sound/soc/qcom/sm8250.c +1 -1
@@ -86,7 +86,7 @@ static void sm2450_snd_shutdown(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 );struct sm8250_snd_data *data =snd_soc_card_get_drvdata (rtd->card); -struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; +struct sdw_stream_runtime *sruntime =qcom_snd_sdw_get_stream (substream); data->sruntime[cpu_dai->id] =NULL ;sdw_release_stream (sruntime);
sound/soc/qcom/x1e80100.c +1 -1
@@ -55,7 +55,7 @@ static void x1e80100_snd_shutdown(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 );struct x1e80100_snd_data *data =snd_soc_card_get_drvdata (rtd->card); -struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id]; +struct sdw_stream_runtime *sruntime =qcom_snd_sdw_get_stream (substream); data->sruntime[cpu_dai->id] =NULL ;sdw_release_stream (sruntime);
Signature · 1 line
2.51.0