Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp99868pxu; Wed, 6 Jan 2021 22:56:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJytadhMHT4JZSiMsWBrEQwM5zh/NpFUsv3IbwtRX4QE9K4GMAurgEcLvRgbaOB3JG/tP8IU X-Received: by 2002:a05:6402:2553:: with SMTP id l19mr386344edb.326.1610002573723; Wed, 06 Jan 2021 22:56:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610002573; cv=none; d=google.com; s=arc-20160816; b=pF5zhR+XZKAsZeTyT9kEH1HgQ2TgeTE98F2G1FDn2ewXf/4RQXhvxkDc/6BTByDERu HvCeEwGCceLEvAADuj6dZzwatuFu9Jo1YTw4jcexwwZTGwdKwi5kqv1h1NYf9nWPhR/T xUjhxOlsS36O94Yr4ldKGvM+gfXSKAXe5AsmIOqQJszhfXbYcL39LQnlYzjhNqfj3d1v jDYrVja5/lojoXtUd1pBfIUrm98KLnHmZ057CTtIfbF+3syV/1A7iadEQJfX7iuE5Zpx V6NuMKMCxDEJPsRjq2GE9yQoj0crTrl/sW1lY/YGqFBo9hUPu4b0eCeV5gQFAEH2Ja15 3KSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=v5WE6YyQ46qLtkLdx589g4OhBSC+jVcqh9U865SHkV8=; b=QAjhIpQB5sZ9potWaj8nz8ToBWvKwRyrWL+jlp+IRWTZnFrCRT9skNMK9a4j8aFu+o NdNUKrDlLftbuccxetizdukbN5xcyVv9AB4GQ9Y1W0x5x3Ml3xJLShuLYiP43k9VMkIa L+NvmSGakd28WxPjob9vfFGBZUmenbnWv3elUgmNsoJ0nNbZYLrKVZcrS9olMBgh7+/9 pfeIto/BC5S/dTWvPvDEzyXxVH+DDoefYFIZ5PJj7sr9FF1q/JegnNUsyzVUqAZ8zUzn 1hXaJyuOloqB144ZEKxA3vMaaoP9c+yd0W5H07d0cfZ7RPYxBJEq4xX3QrOhVPSjNjDh 5x5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="RkaOws/G"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ce12si1905525edb.604.2021.01.06.22.55.50; Wed, 06 Jan 2021 22:56:13 -0800 (PST) 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=k20201202 header.b="RkaOws/G"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726496AbhAGGwY (ORCPT + 99 others); Thu, 7 Jan 2021 01:52:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:52574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725893AbhAGGwY (ORCPT ); Thu, 7 Jan 2021 01:52:24 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 50A7322EBF; Thu, 7 Jan 2021 06:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610002302; bh=Y64ePLCDHwe1BoP47gwh21GRRCogT/hK+w+Y/EXhoq0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RkaOws/Ge1JIQh69o39mriyiqO4eQYJJiX0rOfFegr8wKqxDhUo013yJvbUrfdsF3 yhjBdKQIgY4D+gg24YBfi//v358AUZbiW60v+WhEXmF3BVIxxjvI51X4DYI5b2QZkd 8IWc1SIS/2ZQIgygQA7IbrklFgAnBKFLo36nAcfmq3drSw1zp16zD91o0jOdrRIjpf WG18RzOp8DUOHDqUp7ndnbSSJ2/kUd2HttLOZV3ooEcgHB2DyXlWpwD1NW8pT+8TMo wwUImsjsG1lSpNHcVJssWlBrrYuXAUpLF/zXD3o/5AO1QtbS7vE0XAp2dT9/uPk/Ux jsrtoE87nrLCQ== Date: Wed, 6 Jan 2021 22:51:40 -0800 From: Jaegeuk Kim To: Can Guo Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, kernel-team@android.com, alim.akhtar@samsung.com, avri.altman@wdc.com, bvanassche@acm.org, martin.petersen@oracle.com, stanley.chu@mediatek.com Subject: Re: [PATCH v3 2/2] scsi: ufs: handle LINERESET with correct tm_cmd Message-ID: References: <20210106214109.44041-1-jaegeuk@kernel.org> <20210106214109.44041-3-jaegeuk@kernel.org> <96a159d6b64fce18ee63a12a6acde2a2@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <96a159d6b64fce18ee63a12a6acde2a2@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/07, Can Guo wrote: > Hi Jaegeuk, > > On 2021-01-07 05:41, Jaegeuk Kim wrote: > > From: Jaegeuk Kim > > > > This fixes a warning caused by wrong reserve tag usage in > > __ufshcd_issue_tm_cmd. > > > > WARNING: CPU: 7 PID: 7 at block/blk-core.c:630 blk_get_request+0x68/0x70 > > WARNING: CPU: 4 PID: 157 at block/blk-mq-tag.c:82 > > blk_mq_get_tag+0x438/0x46c > > > > And, in ufshcd_err_handler(), we can avoid to send tm_cmd before > > aborting > > outstanding commands by waiting a bit for IO completion like this. > > > > __ufshcd_issue_tm_cmd: task management cmd 0x80 timed-out > > > > Signed-off-by: Jaegeuk Kim > > --- > > drivers/scsi/ufs/ufshcd.c | 36 ++++++++++++++++++++++++++++++++---- > > 1 file changed, 32 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > > index 1678cec08b51..47fc8da3cbf9 100644 > > --- a/drivers/scsi/ufs/ufshcd.c > > +++ b/drivers/scsi/ufs/ufshcd.c > > @@ -44,6 +44,9 @@ > > /* Query request timeout */ > > #define QUERY_REQ_TIMEOUT 1500 /* 1.5 seconds */ > > > > +/* LINERESET TIME OUT */ > > +#define LINERESET_IO_TIMEOUT_MS (30000) /* 30 sec */ > > + > > /* Task management command timeout */ > > #define TM_CMD_TIMEOUT 100 /* msecs */ > > > > @@ -5899,6 +5902,8 @@ static void ufshcd_err_handler(struct work_struct > > *work) > > * check if power mode restore is needed. > > */ > > if (hba->saved_uic_err & UFSHCD_UIC_PA_GENERIC_ERROR) { > > + ktime_t start = ktime_get(); > > I don't see the connection btw line-reset and following tmf cmd. > My point is that line-reset is not the only non-fatal error which > leads us to the following tmf cmd. So the wait should be outside > of this check - just put it right before clearing outstanding reqs. Ok. Let me move it in v4. > > Thanks, > Can Guo. > > > + > > hba->saved_uic_err &= ~UFSHCD_UIC_PA_GENERIC_ERROR; > > if (!hba->saved_uic_err) > > hba->saved_err &= ~UIC_ERROR; > > @@ -5906,6 +5911,20 @@ static void ufshcd_err_handler(struct work_struct > > *work) > > if (ufshcd_is_pwr_mode_restore_needed(hba)) > > needs_restore = true; > > spin_lock_irqsave(hba->host->host_lock, flags); > > + /* Wait for IO completion to avoid aborting IOs */ > > + while (hba->outstanding_reqs) { > > + ufshcd_complete_requests(hba); > > + spin_unlock_irqrestore(hba->host->host_lock, flags); > > + schedule(); > > + spin_lock_irqsave(hba->host->host_lock, flags); > > + if (ktime_to_ms(ktime_sub(ktime_get(), start)) > > > + LINERESET_IO_TIMEOUT_MS) { > > + dev_err(hba->dev, "%s: timeout, outstanding=0x%lx\n", > > + __func__, hba->outstanding_reqs); > > + break; > > + } > > + } > > + > > if (!hba->saved_err && !needs_restore) > > goto skip_err_handling; > > } > > @@ -6302,9 +6321,13 @@ static irqreturn_t ufshcd_intr(int irq, void > > *__hba) > > intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS); > > } > > > > - if (enabled_intr_status && retval == IRQ_NONE) { > > - dev_err(hba->dev, "%s: Unhandled interrupt 0x%08x\n", > > - __func__, intr_status); > > + if (enabled_intr_status && retval == IRQ_NONE && > > + !ufshcd_eh_in_progress(hba)) { > > + dev_err(hba->dev, "%s: Unhandled interrupt 0x%08x (0x%08x, > > 0x%08x)\n", > > + __func__, > > + intr_status, > > + hba->ufs_stats.last_intr_status, > > + enabled_intr_status); > > ufshcd_dump_regs(hba, 0, UFSHCI_REG_SPACE_SIZE, "host_regs: "); > > } > > > > @@ -6348,7 +6371,11 @@ static int __ufshcd_issue_tm_cmd(struct ufs_hba > > *hba, > > * Even though we use wait_event() which sleeps indefinitely, > > * the maximum wait time is bounded by %TM_CMD_TIMEOUT. > > */ > > - req = blk_get_request(q, REQ_OP_DRV_OUT, BLK_MQ_REQ_RESERVED); > > + req = blk_get_request(q, REQ_OP_DRV_OUT, BLK_MQ_REQ_RESERVED | > > + BLK_MQ_REQ_NOWAIT); > > + if (IS_ERR(req)) > > + return PTR_ERR(req); > > + > > req->end_io_data = &wait; > > free_slot = req->tag; > > WARN_ON_ONCE(free_slot < 0 || free_slot >= hba->nutmrs); > > @@ -9355,6 +9382,7 @@ int ufshcd_init(struct ufs_hba *hba, void > > __iomem *mmio_base, unsigned int irq) > > > > hba->tmf_tag_set = (struct blk_mq_tag_set) { > > .nr_hw_queues = 1, > > + .reserved_tags = 1, > > .queue_depth = hba->nutmrs, > > .ops = &ufshcd_tmf_ops, > > .flags = BLK_MQ_F_NO_SCHED,