Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3597205ybz; Mon, 20 Apr 2020 06:03:12 -0700 (PDT) X-Google-Smtp-Source: APiQypLk8X5Lqd2ddWhqsWg1kq730+tBk/bt1tkoz3082fIGmbTMgGNwtqI+B9q8336SEZBAkUDl X-Received: by 2002:a17:906:49c7:: with SMTP id w7mr2670675ejv.29.1587387791860; Mon, 20 Apr 2020 06:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587387791; cv=none; d=google.com; s=arc-20160816; b=lZszroLDlWZLgI3Wv7bQ2RbJ4dEb3ZCgLAO/S6tmAuHK8Z1ecsu+Fy2OWETtoBeBKZ 8aI4Q5arvRHVWYTeyK3oOrAmsyKUAlvvVRFKhxRsTI8LTGwa/slWnvnQ97tyzWzDcLoV V/en8tRq1uLkkHI9YDhxRMsAPqbhBWXdH9ud2Ob2QzoAGOc7KkSXjBE2RIKaaWOZ6FxK czDsLjvp0wwJOlWuT4iE1xa9GMfy1oaun+5o3YyUlLz0a3m1KzGhinCJNZBCG7GrpC4p YG3Ij2lc3LPn/FosuE1IaMiDjgk9sqopM8h8KJLnE3MIffHPwWW09eRGtDYofaMc3tbs BOwQ== 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=t5D+1hFA8bD/3HVxCTvaOECrHTwQ8V6NPIZhmm4FWHk=; b=xpgdRto0wlue4/CjqFKikXARMdx5OwG1M1eMR5rl+1b8StFAPY1NhSC4JgUiync5VP Mk2AGnJg+G7otTPpz9c/j1hqaJEJrhVmU85C9ej1ghqIermok+OyMfBr8hSiKw9QYTnR T9J6u8aowJqAZxvmlfvN6km2jJzWmMEc25hKQEMSiiJLC6NKYUAKLzU4kVkdFY7DQ3q2 HQkCijfpun8nuyiZw6uI5Ljy4s9NInX5N6firHhPZNuQaRlzkWEjrHFN68QisrxAOMsh 16cf2vVOWlFiRuU6bRoM1ieiRsfwEtI163wqXkOgMsEm/wP/koRqMgcCv2iZGJGgycry 4CFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=C+QKAk6h; 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 w26si454114ejb.118.2020.04.20.06.02.46; Mon, 20 Apr 2020 06:03:11 -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=C+QKAk6h; 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 S1727808AbgDTMkj (ORCPT + 99 others); Mon, 20 Apr 2020 08:40:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:32912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727780AbgDTMki (ORCPT ); Mon, 20 Apr 2020 08:40:38 -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 DD14020736; Mon, 20 Apr 2020 12:40:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386437; bh=RO1VvA0TedKY/5ElciEG/QJ0CF/7C7PmxxWIipvdjA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C+QKAk6hYomRPg8nwguaSQP289/wN+17TB/DImgcitiNwiJxYXBFQZQ7UGryIBuet HYOETs8sk2NgwbYnzs5jf+58Ao6PTYp5CWiSwemIwiPG9UbPQWopS2776ZuelRf/XU 5WY7xyl4R9iDrD38+SDNMwHbVrffYY888esYy9WU= 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 5.5 22/65] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic Date: Mon, 20 Apr 2020 14:38:26 +0200 Message-Id: <20200420121511.189790190@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121505.909671922@linuxfoundation.org> References: <20200420121505.909671922@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 @@ -1542,6 +1542,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);