lkml.org 
[lkml]   [2022]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 157/225] ASoC: soc-pcm: use GFP_KERNEL when the code is sleepable
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit fb6d679fee95d272c0a94912c4e534146823ee89 ]

    At the kzalloc() call in dpcm_be_connect(), there is no spin lock involved.
    It's merely protected by card->pcm_mutex, instead. The spinlock is applied
    at the later call with snd_soc_pcm_stream_lock_irq() only for the list
    manipulations. (See it's *_irq(), not *_irqsave(); that means the context
    being sleepable at that point.) So, we can use GFP_KERNEL safely there.

    This patch revert commit d8a9c6e1f676 ("ASoC: soc-pcm: use GFP_ATOMIC for
    dpcm structure") which is no longer needed since commit b7898396f4bb
    ("ASoC: soc-pcm: Fix and cleanup DPCM locking").

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/e740f1930843060e025e3c0f17ec1393cfdafb26.1648757961.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/soc-pcm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
    index 9a954680d492..11c9853e9e80 100644
    --- a/sound/soc/soc-pcm.c
    +++ b/sound/soc/soc-pcm.c
    @@ -1214,7 +1214,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,
    be_substream->pcm->nonatomic = 1;
    }

    - dpcm = kzalloc(sizeof(struct snd_soc_dpcm), GFP_ATOMIC);
    + dpcm = kzalloc(sizeof(struct snd_soc_dpcm), GFP_KERNEL);
    if (!dpcm)
    return -ENOMEM;

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-04 19:48    [W:2.585 / U:0.640 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site