From patchwork Fri Jan 17 19:57:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bresticker X-Patchwork-Id: 3507331 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 81FE39F2E9 for ; Fri, 17 Jan 2014 20:22:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B29F42017D for ; Fri, 17 Jan 2014 20:22:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B830C20158 for ; Fri, 17 Jan 2014 20:22:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753533AbaAQUWj (ORCPT ); Fri, 17 Jan 2014 15:22:39 -0500 Received: from mail-vc0-f202.google.com ([209.85.220.202]:47017 "EHLO mail-vc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753484AbaAQUWj (ORCPT ); Fri, 17 Jan 2014 15:22:39 -0500 Received: by mail-vc0-f202.google.com with SMTP id hu8so400954vcb.5 for ; Fri, 17 Jan 2014 12:22:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cNSUBWkXDoFBQAn72cQTIdraUhw3ZFU1U5XePVSE6QQ=; b=QJ1uut/caA86kgDyd1RR4AzV7wmIMSdoR3s46L67hFZ1XGEMHWno/+A/6URSjPbbwl mZONolo3n0x18dDek6D/LGhgfJ9jpvrwYdLzukc8XBknkhQHIcwOJYoJiXjNZEMQRLgf DJYeR/tcfr0Yz8UJ1rO7UItHAqsN9TaxaJNMp5PVbuBgu1OlHemR/sMl6jKT/sD+pAD8 K4+UlvVhauRn/vOOYaZ8DFpaGzcdUd4Ld14pWKGYPJ8anrxL828YTbiI9PwJyIV6aKSB t+rJWx/hitQDfe1I1xuVtXPrvDg4pysxIGQ3L34sF0hI2Zza3i0d/ocEhAOafk/yRX9y RV/g== X-Gm-Message-State: ALoCoQkDUQEQWxoEcTStRKI0yDAumUJmhwOchDLTByprdLWSRHItW/GxJ2S65aFWbMOJKZ6eJvJsQGegFjhya0rjTkwCjk2Ss6IL3zHfyatf7SDs/aQjs1AOBuiRzIFC0sYPkJWnCRiijlv9KgxxiFN/qZfMuDBGpaZfW95O7LbPsEcgY5g1FkwLYocGd4pIhsZZHmfwm3uBs9fqJ7ix95Y3AUm+ycY2WA== X-Received: by 10.58.34.142 with SMTP id z14mr1284461vei.23.1389988644572; Fri, 17 Jan 2014 11:57:24 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id d9si3981567yhl.2.2014.01.17.11.57.24 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Jan 2014 11:57:24 -0800 (PST) Received: from abrestic.mtv.corp.google.com (abrestic.mtv.corp.google.com [172.22.72.111]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 620025A41DB; Fri, 17 Jan 2014 11:57:24 -0800 (PST) Received: by abrestic.mtv.corp.google.com (Postfix, from userid 137652) id F3AAC220AD5; Fri, 17 Jan 2014 11:57:23 -0800 (PST) From: Andrew Bresticker To: Chris Ball Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Bresticker Subject: [PATCH] mmc: sdhci: fix possible scheduling while atomic Date: Fri, 17 Jan 2014 11:57:10 -0800 Message-Id: <1389988630-9481-1-git-send-email-abrestic@chromium.org> X-Mailer: git-send-email 1.8.5.2 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP sdhci_execute_tuning() takes host->lock without disabling interrupts. Use spin_lock_irq{save,restore} instead so that we avoid taking an interrupt and scheduling while holding host->lock. Signed-off-by: Andrew Bresticker --- drivers/mmc/host/sdhci.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ec3eb30..84c80e7 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1857,12 +1857,13 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) unsigned long timeout; int err = 0; bool requires_tuning_nonuhs = false; + unsigned long flags; host = mmc_priv(mmc); sdhci_runtime_pm_get(host); disable_irq(host->irq); - spin_lock(&host->lock); + spin_lock_irqsave(&host->lock, flags); ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); @@ -1882,14 +1883,14 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) requires_tuning_nonuhs) ctrl |= SDHCI_CTRL_EXEC_TUNING; else { - spin_unlock(&host->lock); + spin_unlock_irqrestore(&host->lock, flags); enable_irq(host->irq); sdhci_runtime_pm_put(host); return 0; } if (host->ops->platform_execute_tuning) { - spin_unlock(&host->lock); + spin_unlock_irqrestore(&host->lock, flags); enable_irq(host->irq); err = host->ops->platform_execute_tuning(host, opcode); sdhci_runtime_pm_put(host); @@ -1963,7 +1964,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) host->cmd = NULL; host->mrq = NULL; - spin_unlock(&host->lock); + spin_unlock_irqrestore(&host->lock, flags); enable_irq(host->irq); /* Wait for Buffer Read Ready interrupt */ @@ -1971,7 +1972,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) (host->tuning_done == 1), msecs_to_jiffies(50)); disable_irq(host->irq); - spin_lock(&host->lock); + spin_lock_irqsave(&host->lock, flags); if (!host->tuning_done) { pr_info(DRIVER_NAME ": Timeout waiting for " @@ -2046,7 +2047,7 @@ out: err = 0; sdhci_clear_set_irqs(host, SDHCI_INT_DATA_AVAIL, ier); - spin_unlock(&host->lock); + spin_unlock_irqrestore(&host->lock, flags); enable_irq(host->irq); sdhci_runtime_pm_put(host);