From patchwork Mon Nov 28 13:51:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 26783 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5692151wrr; Mon, 28 Nov 2022 06:07:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf74NGT+4jmoiH7/svhKwp6B+K0dzv4ZPHxbI8toiVnPtBdczShrrwkA+7h8tTXGLh6veDi0 X-Received: by 2002:a05:6602:736:b0:6bc:b2ee:a61e with SMTP id g22-20020a056602073600b006bcb2eea61emr14945061iox.195.1669644444373; Mon, 28 Nov 2022 06:07:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669644444; cv=none; d=google.com; s=arc-20160816; b=GrYHyHKv9m70cDrz7RFk5W3LcsB6+GhT6U6alGiAEPhd0kwTXCj9wutrIJwcalvUOe Ij2381y0j4fuH6TDwP0cECwGu3lPZo9RF708S8marxOJb/lwpmzQqgO3agxpBmuB69mL pLcDcJkzbHsdWu31kzhEN4Uz4Gco+AcYsZa/oGQydSq7eUmnsd0C7uMw9u6AVS9m6tct 9GCyUEBI8RsZ62qSSKbP93B02Mnh3e6cSZ0Ilx0xbDaDISEeOWHYl7Pff6EwSBv0O+yW RITz74h1Ty5S/IJXJog3HUkp59/dOkV5h487aDurk2DIltjVeWK94JanPxG3txqIwVkk x/fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=u0aFE9hwoiDA9DAFcyLG3BFl8PO/QcXwrWjXOf4VrKU=; b=sWK77oT9iXv/6BZ+rAMsn/9OdF7tCLTqM6nSC69lPYJQpiWpwRS5T3feRtFaTYXMz1 Fz7unEjs5pCBhhUWnIbEJZEhVGKAK1yFGwSLq/dScWKBfpJzvvzyklNYOBbX+SjA83ca LnJP78o7Hnp5FT5JaAjfTi2cDaSisQOeM0EYvI6/98u3AiRP7ffNyciRhCOhtjvoNxhW oMYTG7emlbLV5OpXtUpEfHFT9VkL1sv63FY6FgGUp8v9lOFTdHHHL4V8ZHfXRvv5RMy0 WZAmUmHeWBTiVOYwTtB4KvalYtBxKAXxwb8bW454E3OwI6OjDd+avlLPzKVPCqsRJTGF 3M4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cqcFidLC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt38-20020a1709072da600b007882936243fsi10798590ejc.772.2022.11.28.06.06.50; Mon, 28 Nov 2022 06:07:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cqcFidLC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232152AbiK1Nva (ORCPT + 99 others); Mon, 28 Nov 2022 08:51:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231445AbiK1Nv2 (ORCPT ); Mon, 28 Nov 2022 08:51:28 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32C3D1EC50 for ; Mon, 28 Nov 2022 05:51:27 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id b2so9649991eja.7 for ; Mon, 28 Nov 2022 05:51:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=u0aFE9hwoiDA9DAFcyLG3BFl8PO/QcXwrWjXOf4VrKU=; b=cqcFidLCG7P1nRRXUrY6Wczsjq+vlOMWQBWRKAGQAJag9JhXDGCStVKjB3evQ1osTP 5o/VWgcvkSpum0KuPN8l5n8g77R1N4Wg9LlC6r60Dlu5M/nIWhmu1So0Icm1+qXsvBmv lro6OCQdo1XMwWXbdPOeDa0WzWQTT/QFTFBT0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=u0aFE9hwoiDA9DAFcyLG3BFl8PO/QcXwrWjXOf4VrKU=; b=dWgl7P8sjNgYdt+vJSpQOWdHglQeo9Rkx+4lUakKqRNhWb5YHvG45bxY+ID7c5yJtV LLGF2pB531OyGHHBJhuM2TTAsygXTzvuYXZpEmZQ9PH78R4OC31SdbgwdyZeafGk5COF sOsuXF6si2UVtZn3GVkiw10qcdXXZJ4EXtgknHWvncVo7+U6BS+nuqvIazIRXzUuVZPd sGbg75fsycaoSMskj89Gwey5ysrptjR+bz2cBjdyc4xz4SyhGaRmOs9OgAoxftHjLoFZ Gio/LdIWP3KNKcQXf8es5LSwYpQRboH/J25uAxbO0AJ5jyiQ9FyavtzpleQ8/tbaJIni 2Zbg== X-Gm-Message-State: ANoB5pk+rQ9LsKms/y7OXIgAWDM3db3Y7sKbw0/Yow8rB1lpsOAXBUbU p5iuKGqHaWqNG1W7RX0mx3d/Jg== X-Received: by 2002:a17:906:9e20:b0:7af:206:9327 with SMTP id fp32-20020a1709069e2000b007af02069327mr43793648ejc.154.1669643485755; Mon, 28 Nov 2022 05:51:25 -0800 (PST) Received: from alco.roam.corp.google.com (80.71.134.83.ipv4.parknet.dk. [80.71.134.83]) by smtp.gmail.com with ESMTPSA id p10-20020aa7cc8a000000b0045b4b67156fsm5184139edt.45.2022.11.28.05.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 05:51:25 -0800 (PST) From: Ricardo Ribalda Date: Mon, 28 Nov 2022 14:51:17 +0100 Subject: [PATCH v5] ASoC: SOF: Fix deadlock when shutdown a frozen userspace MIME-Version: 1.0 Message-Id: <20221127-snd-freeze-v5-0-4ededeb08ba0@chromium.org> To: Liam Girdwood , Pierre-Louis Bossart , Mark Brown , Daniel Baluta , Kai Vehmanen , Peter Ujfalusi , Jaroslav Kysela , Takashi Iwai , Bard Liao , Ranjani Sridharan Cc: stable@vger.kernel.org, sound-open-firmware@alsa-project.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=3662; i=ribalda@chromium.org; h=from:subject:message-id; bh=cBG13C+fPS/DJeUsnf0v/AEnFrjuy57sBmvYSvNH+dk=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjhLza87LzpLuJ3ZQRnkqEP+vHTB3FYi2nW0tShU23 chrKhb+JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCY4S82gAKCRDRN9E+zzrEiPqyD/ 0UDRVIY44q4CF1+moNWAABqGFppwuGECc97NFAtgwaKhT8UaRwgDuN6puIQPR75vU0IHk4tf66+aG7 yeN5RZS4XLUchnB0HBDGEatHGpPKaJjR5ZLtMDHYws9kIT30lz2nvvpPey96hYptEiT+/M2ym3s1NZ fIg+rOEI/5mdUY0FOI4IKTfxXuaclcgyi/qJujr/Ev6mAXZk0IEeBmlh/8cyMviVy030gihr2St+j+ Q3QlZpTu+pgNtlCLMUHiiO5kO5DquovKi34iL9VRzzLyyhX9xK0O0t7oq0zmKLyKbsD2S8cOD13UBC BSC6Siw2vn1KsyHazGdNYJm3dzMtYvCVVFw+QyJNzZss+e4fS6+WEZqgVjq83Ce/Qq8FyPtmG4odSP cNS/T3yiF+jEtYxSk2uZ70LxHU+6/7fGezKQRO3t1fW2baKXzPWmSYBK4VsTuWbBFgWUyz2wtSaPkW 9cO4RUuuUcwL3b4UnIhZHFMrT/eoCBhh82MKVqEkd+0yw3LysZy2QCkYMKaAgAGh2RFfS3mmURDn8A w4+3mRPv2CATgQtd+lwrXjjsWttGZUGAz029xaJwGEtShXy5eVlizKVfrAFMT7+sqY+g3/XFJv1/QT 2ITQGtymEzbnlWS7JzlF9YW9YW62UKJuKlhmGRJw4yAfzqxhGMxwg7hzQ6Og== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750749093040673874?= X-GMAIL-MSGID: =?utf-8?q?1750749093040673874?= During kexec(), the userspace is frozen. Therefore we cannot wait for it to complete. Avoid running snd_sof_machine_unregister during shutdown. This fixes: [ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done. [ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds. [ 246.819035] Call Trace: [ 246.821782] [ 246.824186] __schedule+0x5f9/0x1263 [ 246.828231] schedule+0x87/0xc5 [ 246.831779] snd_card_disconnect_sync+0xb5/0x127 ... [ 246.889249] snd_sof_device_shutdown+0xb4/0x150 [ 246.899317] pci_device_shutdown+0x37/0x61 [ 246.903990] device_shutdown+0x14c/0x1d6 [ 246.908391] kernel_kexec+0x45/0xb9 And: [ 246.893222] INFO: task kexec-lite:4891 blocked for more than 122 seconds. [ 246.927709] Call Trace: [ 246.930461] [ 246.932819] __schedule+0x5f9/0x1263 [ 246.936855] ? fsnotify_grab_connector+0x5c/0x70 [ 246.942045] schedule+0x87/0xc5 [ 246.945567] schedule_timeout+0x49/0xf3 [ 246.949877] wait_for_completion+0x86/0xe8 [ 246.954463] snd_card_free+0x68/0x89 ... [ 247.001080] platform_device_unregister+0x12/0x35 Cc: stable@vger.kernel.org Fixes: 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown") Signed-off-by: Ricardo Ribalda --- To: Pierre-Louis Bossart To: Liam Girdwood To: Peter Ujfalusi To: Bard Liao To: Ranjani Sridharan To: Kai Vehmanen To: Daniel Baluta To: Mark Brown To: Jaroslav Kysela To: Takashi Iwai Cc: sound-open-firmware@alsa-project.org Cc: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org --- Changes in v5: - Edit subject prefix - Link to v4: https://lore.kernel.org/r/20221127-snd-freeze-v4-0-51ca64b7f2ab@chromium.org Changes in v4: - Do not call snd_sof_machine_unregister from shutdown. - Link to v3: https://lore.kernel.org/r/20221127-snd-freeze-v3-0-a2eda731ca14@chromium.org Changes in v3: - Wrap pm_freezing in a function - Link to v2: https://lore.kernel.org/r/20221127-snd-freeze-v2-0-d8a425ea9663@chromium.org Changes in v2: - Only use pm_freezing if CONFIG_FREEZER - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- sound/soc/sof/core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 3e6141d03770..9616ba607ded 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -475,19 +475,16 @@ EXPORT_SYMBOL(snd_sof_device_remove); int snd_sof_device_shutdown(struct device *dev) { struct snd_sof_dev *sdev = dev_get_drvdata(dev); - struct snd_sof_pdata *pdata = sdev->pdata; if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) cancel_work_sync(&sdev->probe_work); /* - * make sure clients and machine driver(s) are unregistered to force - * all userspace devices to be closed prior to the DSP shutdown sequence + * make sure clients are unregistered prior to the DSP shutdown + * sequence. */ sof_unregister_clients(sdev); - snd_sof_machine_unregister(sdev, pdata); - if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) return snd_sof_shutdown(sdev);