From patchwork Tue Aug 18 02:37:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 11719673 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DAF2739 for ; Tue, 18 Aug 2020 02:38:32 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B942720716 for ; Tue, 18 Aug 2020 02:38:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="rxQjjCfr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B942720716 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8D5A516DE; Tue, 18 Aug 2020 04:37:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8D5A516DE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1597718309; bh=udg2wfLnuE8Eccx+/SIFJWAh3JGqcf9jvIOMINANgqM=; h=Date:From:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=rxQjjCfredkCgUEbBhIx+qYu+lVcR9HaN5BLP46JteKKfY9HoPpVHsVwzkeaOnANB +oWr6cUQJP3JI51QFieL9kqvx2j+cU+qzZTbdwyQgru19YwRsmMIjgHQNvwQLhr8je nL4nthZMBFVb4LrLm0K0HUZlmxqcR910YLFtwY5s= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id ED7BFF80228; Tue, 18 Aug 2020 04:37:43 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 29DD9F8023F; Tue, 18 Aug 2020 04:37:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=5.0 tests=AC_FROM_MANY_DOTS, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa1.perex.cz (Postfix) with ESMTP id EDBC4F80104 for ; Tue, 18 Aug 2020 04:37:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EDBC4F80104 Date: 18 Aug 2020 11:37:29 +0900 X-IronPort-AV: E=Sophos;i="5.76,325,1592838000"; d="scan'208";a="54823961" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 18 Aug 2020 11:37:29 +0900 Received: from mercury.renesas.com (unknown [10.166.252.133]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id D793B4003881; Tue, 18 Aug 2020 11:37:29 +0900 (JST) Message-ID: <871rk4hean.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH] ASoC: soc-core: use client_mutex for snd_soc_find_dai() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown , Pierre-Louis Bossart MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto commit 25612477d20b52 ("ASoC: soc-dai: set dai_link dpcm_ flags with a helper") added snd_soc_dai_link_set_capabilities(). But it is using snd_soc_find_dai() (A) which is required client_mutex (B). And client_mutex is soc-core.c local. struct snd_soc_dai *snd_soc_find_dai(xxx) { ... (B) lockdep_assert_held(&client_mutex); ... } void snd_soc_dai_link_set_capabilities(xxx) { ... for_each_pcm_streams(direction) { ... for_each_link_cpus(dai_link, i, cpu) { (A) dai = snd_soc_find_dai(cpu); ... } ... for_each_link_codecs(dai_link, i, codec) { (A) dai = snd_soc_find_dai(codec); ... } } ... } Because of these background, we will get WARNING if .config has CONFIG_LOCKDEP. WARNING: CPU: 2 PID: 53 at sound/soc/soc-core.c:814 snd_soc_find_dai+0xf8/0x100 CPU: 2 PID: 53 Comm: kworker/2:1 Not tainted 5.7.0-rc1+ #328 Hardware name: Renesas H3ULCB Kingfisher board based on r8a77951 (DT) Workqueue: events deferred_probe_work_func pstate: 60000005 (nZCv daif -PAN -UAO) pc : snd_soc_find_dai+0xf8/0x100 lr : snd_soc_find_dai+0xf4/0x100 ... Call trace: snd_soc_find_dai+0xf8/0x100 snd_soc_dai_link_set_capabilities+0xa0/0x16c graph_dai_link_of_dpcm+0x390/0x3c0 graph_for_each_link+0x134/0x200 graph_probe+0x144/0x230 platform_drv_probe+0x5c/0xb0 really_probe+0xe4/0x430 driver_probe_device+0x60/0xf4 Many drivers are already calling snd_soc_find_dai() and/or snd_soc_dai_link_set_capabilities(). Thus, same thing can be happen on these drivers, too. > grep snd_soc_find_dai -rl sound/soc/* sound/soc/samsung/tm2_wm5110.c sound/soc/soc-core.c sound/soc/soc-dai.c sound/soc/soc-topology.c sound/soc/sof/topology.c > grep snd_soc_dai_link_set_capabilities -rl sound/soc/* sound/soc/generic/simple-card.c sound/soc/generic/audio-graph-card.c sound/soc/qcom/common.c sound/soc/soc-dai.c This patch renames current snd_soc_find_dai() to _no_mutex(), and new snd_soc_find_dai() uses client_mutex. Fixes: 25612477d20b52 ("ASoC: soc-dai: set dai_link dpcm_ flags with a helper") Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index fe23e936e2d1..6ea66b57b2c1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -805,7 +805,7 @@ static struct snd_soc_component *soc_find_component( * * Return: pointer of DAI, or NULL if not found. */ -struct snd_soc_dai *snd_soc_find_dai( +static struct snd_soc_dai *snd_soc_find_dai_no_mutex( const struct snd_soc_dai_link_component *dlc) { struct snd_soc_component *component; @@ -829,6 +829,17 @@ struct snd_soc_dai *snd_soc_find_dai( return NULL; } + +struct snd_soc_dai *snd_soc_find_dai(const struct snd_soc_dai_link_component *dlc) +{ + struct snd_soc_dai *dai; + + mutex_lock(&client_mutex); + dai = snd_soc_find_dai_no_mutex(dlc); + mutex_unlock(&client_mutex); + + return dai; +} EXPORT_SYMBOL_GPL(snd_soc_find_dai); static int soc_dai_link_sanity_check(struct snd_soc_card *card, @@ -999,7 +1010,7 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, return -ENOMEM; for_each_link_cpus(dai_link, i, cpu) { - asoc_rtd_to_cpu(rtd, i) = snd_soc_find_dai(cpu); + asoc_rtd_to_cpu(rtd, i) = snd_soc_find_dai_no_mutex(cpu); if (!asoc_rtd_to_cpu(rtd, i)) { dev_info(card->dev, "ASoC: CPU DAI %s not registered\n", cpu->dai_name); @@ -1010,7 +1021,7 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, /* Find CODEC from registered CODECs */ for_each_link_codecs(dai_link, i, codec) { - asoc_rtd_to_codec(rtd, i) = snd_soc_find_dai(codec); + asoc_rtd_to_codec(rtd, i) = snd_soc_find_dai_no_mutex(codec); if (!asoc_rtd_to_codec(rtd, i)) { dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n", codec->dai_name);