Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3572579ybl; Mon, 3 Feb 2020 02:48:47 -0800 (PST) X-Google-Smtp-Source: APXvYqw+FSFondoCP5vGPrzV5RM7MWZVTrx8visP0WCsOtG84vgMF/c92FHa2K092+auMrWEd52q X-Received: by 2002:a9d:2c2:: with SMTP id 60mr17375474otl.208.1580726927460; Mon, 03 Feb 2020 02:48:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580726927; cv=none; d=google.com; s=arc-20160816; b=gt/D0OoQcJgFJOXGJo6xgWmFGAjVjHqbyyXIFkV82sQYuYkGzzOdJ/iUHDXaOH0pX/ VmLfRzDS2tGN7BECXBJqCv6j3Cv3YylOl4Zi6M4DAk7cAc0uEZBC4GdydXwIWGgJF4ne NmmKL9nQJnUZPSX23VV3V12/yOJ93OlK7QfsIcKW3Q2/jwC+ywmKGl5U70KLqPwReDFH ehqo8Ps9qEyeG6TgL0HHwaTQemk/2ixS0b4crDnhjwAMEpeB5B66MIM3i2m3LxuvOmjw v6LkZq3arKC3OlfI4+Ebnnq+S48xLm6YghZQ/W8Qvj9geUIb3eE0sGwm3UOhRsSFhNBm Z16Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature; bh=GoNpA5WjXkltrO9sAxxuoB169fziwzhEbRHlExQ3LKQ=; b=F6YKpYGi+6idMJlrQHGJ6RjTiFqy30+MxXIXfBOla1FHgE/5Lzv4xtCaxNi8bo/IZp 6Y+t5Dx3rYDOb5gZZPKfRSmbQgf0GAHGXKPenQvezytbSr74XdbaINeDpmUiYtFpQAHB QcqwZpnpJKjmXcFQpyv8MfNjpvuJX6tCW1GMl1cl5oO9mMBnVwuORgnZ0rsvcXpGqVyt Dt1UdUztbsrVdVR6IyuEWdLXYG1gubSyL/jDAbuQ3cjWWovR77X4fsmCi9w5esU9xpYU +XcRXYehNtabEDp3YbMuoVy7HSjhOS6JfZIMWosuP017zg5jC3FSTvoEn13WVeiQbsem a38g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=N5IYAT4X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o25si9675219otk.28.2020.02.03.02.48.35; Mon, 03 Feb 2020 02:48:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=N5IYAT4X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727966AbgBCJS2 (ORCPT + 99 others); Mon, 3 Feb 2020 04:18:28 -0500 Received: from mail26.static.mailgun.info ([104.130.122.26]:61986 "EHLO mail26.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727968AbgBCJS0 (ORCPT ); Mon, 3 Feb 2020 04:18:26 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1580721505; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=GoNpA5WjXkltrO9sAxxuoB169fziwzhEbRHlExQ3LKQ=; b=N5IYAT4XVo9m2Ui6YQRWVcR33H9615zT0B2lrcJDirHTQ4o/lKDmeaZG/zIvifjcbKPHaOms guJ8cHU413lDHTPzBH8NPDs3qCZaGeQlyCc9GT+f91nBgZN9kxsi8PGalbvURz7lCU7yenuz UYGY1K3/NT3zrVJaTU2//mcaqSQ= X-Mailgun-Sending-Ip: 104.130.122.26 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e37e560.7fc83cef9f48-smtp-out-n03; Mon, 03 Feb 2020 09:18:24 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 083DCC4479C; Mon, 3 Feb 2020 09:18:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from pacamara-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: cang) by smtp.codeaurora.org (Postfix) with ESMTPSA id 63EB2C433A2; Mon, 3 Feb 2020 09:18:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 63EB2C433A2 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=cang@codeaurora.org From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, rnayak@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, cang@codeaurora.org Cc: Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , Stanley Chu , Bean Huo , Bart Van Assche , Venkat Gopalakrishnan , Tomas Winkler , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 5/8] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic Date: Mon, 3 Feb 2020 01:17:47 -0800 Message-Id: <1580721472-10784-6-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1580721472-10784-1-git-send-email-cang@codeaurora.org> References: <1580721472-10784-1-git-send-email-cang@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The async version of ufshcd_hold(async == true), which is only called in queuecommand path as for now, is expected to work in atomic context, thus it should not sleep or schedule out. When it runs into the condition that clocks are ON but link is still in hibern8 state, it should bail out without flushing the clock ungate work. Signed-off-by: Can Guo Reviewed-by: Hongwu Su Reviewed-by: Asutosh Das --- drivers/scsi/ufs/ufshcd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index bbc2607..e8f7f9d 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1518,6 +1518,11 @@ int ufshcd_hold(struct ufs_hba *hba, bool async) */ if (ufshcd_can_hibern8_during_gating(hba) && ufshcd_is_link_hibern8(hba)) { + if (async) { + rc = -EAGAIN; + hba->clk_gating.active_reqs--; + break; + } spin_unlock_irqrestore(hba->host->host_lock, flags); flush_work(&hba->clk_gating.ungate_work); spin_lock_irqsave(hba->host->host_lock, flags); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project