Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp662951ybz; Wed, 22 Apr 2020 05:46:04 -0700 (PDT) X-Google-Smtp-Source: APiQypJR1IaUfha4SLNCga/1NxbOGTUAdntU/MMM9+tEf31GWHQH4bwIuZ1qn2Si16ZPGSNpWVsJ X-Received: by 2002:a50:a985:: with SMTP id n5mr2184310edc.338.1587559564474; Wed, 22 Apr 2020 05:46:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587559564; cv=none; d=google.com; s=arc-20160816; b=g0MtuGGnkcvIKZ93AjLBs5LKaytyCmgXUYlIqSgcqk3B8qwZzjs+hA+SMAzWL594VG /NUmSF6Vdt4bx8ByAiqS7W0pzAO29+zO8+a7PxKuVBkoV9eA9wrYiMDqp4WuNHkbvkD6 q2/v73oJUl0CJEJ6W5oc9riXAq6M+43C8oTiR1cBv9RmvLEoYKVg1jyoRmgk6EyD3jgf /1VF43/ufd4L6roU5t386OUTo0KHukDns8B4QfcROPefhthERtXXjj7mKeUfRgS2prNt 8RGjAVT9MfkapEoMAERgyor8/BeWCYA1v1prbFkt0ABUM41lSqL0JwnXAAhR5Duii6Mi UjDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iGQRbrhMVorSaDx1DvUzSJlz0MGYg3QP4+tJeBROzzw=; b=r/G9QzjoK1YjZa93AImM7V0FK9zY3AkHr+ehq7iMSWdzMRjUtoLIAnovGg/f53bIKh 0AOqW8/JYcNSKp77yr8oXw/S+gUYYJ37P4yXrZ8DoLnoIfrdackZZuy2D8gaECJytgz6 +srwIkLgsMS0bZcgOFsADBHwelDEXmSaXlY3Wrk3kXkzO7Q4MfN5yE2VwpM9zkt5k2Ye A0gdQvkANCY7zi6DPyCYgHZr2wO8X5JmI8sMmuO12RfGEU+azi/61wb1zBMqINpRFcrQ sP62bYJa6tTUniUwRKjm0UgI5q/GiTh03W4fKiQkzxoEbyb++v3y2hVVsXQ6SHmUp97M oQZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IVUBhktR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k10si3138120eds.461.2020.04.22.05.45.40; Wed, 22 Apr 2020 05:46:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IVUBhktR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726784AbgDVKBQ (ORCPT + 99 others); Wed, 22 Apr 2020 06:01:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:49492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726442AbgDVKBP (ORCPT ); Wed, 22 Apr 2020 06:01:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 398A420774; Wed, 22 Apr 2020 10:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587549674; bh=npYd3lh51a/ehBF6fTGdVyIDmLK+MDuSxQxua5ODT80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IVUBhktRrurSNJrUKhm0Zzc788l4Kf+fMDpiV9BHlLOBEuItb/Zji38vAEOLtl/St 4fh/yfpy1f2yNgVhxzycPRxFmgrp84sr1EMcp6iC3GjA8lJDjJN6SxZ1zgancW8Jd3 OUqiQ0wqmV3yZuhdF/PqBPbF5368liltIOJNIRw8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hongwu Su , Asutosh Das , Bean Huo , Stanley Chu , Can Guo , "Martin K. Petersen" Subject: [PATCH 4.4 058/100] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic Date: Wed, 22 Apr 2020 11:56:28 +0200 Message-Id: <20200422095033.529908903@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095022.476101261@linuxfoundation.org> References: <20200422095022.476101261@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Can Guo commit c63d6099a7959ecc919b2549dc6b71f53521f819 upstream. 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. Fixes: f2a785ac2312 ("scsi: ufshcd: Fix race between clk scaling and ungate work") Link: https://lore.kernel.org/r/1581392451-28743-6-git-send-email-cang@codeaurora.org Reviewed-by: Hongwu Su Reviewed-by: Asutosh Das Reviewed-by: Bean Huo Reviewed-by: Stanley Chu Signed-off-by: Can Guo Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/ufs/ufshcd.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -595,6 +595,11 @@ start: */ 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);