Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp112326pxu; Wed, 6 Jan 2021 23:23:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJwa2r/TNEpzRN14a2TdDCCI6jZJQEUgtiTFgrzYp77AH2tu5+Sak9IBbly2PQwCEDGBkTDx X-Received: by 2002:a50:ee1a:: with SMTP id g26mr701232eds.68.1610004218196; Wed, 06 Jan 2021 23:23:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610004218; cv=none; d=google.com; s=arc-20160816; b=Ueoxfbo7RglMb30spUdvU9trvdgSHVh67QlS5o0jQEhPTnsaFixVpDmZF9QTgFsDSi 8iYgFWrJzJ1Tn+Q8/A9Txf/Cn0JFu6bcv1DM2YJROVCMKlkIivrKzX7dRi1QXEbOonSD C9DVJKPt6znYeoIA+h0oJNG16L2fQgmLlByY+LlrQhcP4lotSND00b+KNmz7o47JkIu1 97BjIlnYs92ortcV6UHLht0IdsLiFFne5XMSS5lUNuuv5G+lizNBe5nJrXt3ZTJ0Vlro o6ykuCjemlzt6ZN2R68sYHIDvXB96PdNu3ofzF9rXDHNvJ2SbshWqRMr8s78t5AkWRxZ Je1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:message-id:references:in-reply-to :subject:cc:to:from:date:content-transfer-encoding:mime-version :sender:dkim-signature; bh=qVQgnBvjBqjLq8iP2HV4ld7PVZ9iO/EhHi9QxROaVkA=; b=SKFgYM5tKdWBr+7kRNxmxdnxuTWdBn24wG56+6158digUR1+B/8Rh6Y+oF/6abpBv+ KxyU/JudaaVk2UReZ8JR61KgrAOFHxOYFk9RCTxWrIxpo8ugDthc5hXwIqEfXSQjdEeE PI13biYqTGgh2y/hPUWqunIthBArez+KuXdMgwwi+na5IFJWb+rcvRYFIS/RUsO3uAus lkCPfqyjy18dXRFAgs7RAnmys8Vme5/uMJT7mBwZxkblL7fL9FQzB7Jtm/1zjGPaMpqC 8XzOhvxu3K/Nls0IN/lFEQ5aZo51HmEzzwnO5IYnN2AQdcMg3tbEkFPuavpMfijzmkUP 8bUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=PrazzvhX; 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 ce20si1997099edb.138.2021.01.06.23.23.15; Wed, 06 Jan 2021 23:23:38 -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=@mg.codeaurora.org header.s=smtp header.b=PrazzvhX; 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 S1726985AbhAGHVX (ORCPT + 99 others); Thu, 7 Jan 2021 02:21:23 -0500 Received: from m43-15.mailgun.net ([69.72.43.15]:16793 "EHLO m43-15.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725763AbhAGHVX (ORCPT ); Thu, 7 Jan 2021 02:21:23 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1610004064; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=qVQgnBvjBqjLq8iP2HV4ld7PVZ9iO/EhHi9QxROaVkA=; b=PrazzvhXhdPWv1gINnWlIBbxvY9xqNMKrCy7wDwydOSPDdJLi/RB0TjOfI6HMr1iC1uOAf8w dAMpcGaGcGjrVMFU8g7ZIDFCB7Vkhgq6bYtgeATACCNNIdUwQrS+cCVthfMciPInlDJxRZcM G36KA1WZFWzgbOvFdBElJuBOsxc= X-Mailgun-Sending-Ip: 69.72.43.15 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 smtp-out-n04.prod.us-east-1.postgun.com with SMTP id 5ff6b638f69bd8af0978bcf7 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Thu, 07 Jan 2021 07:20:24 GMT Sender: cang=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id A4E78C43467; Thu, 7 Jan 2021 07:20:23 +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=-2.9 required=2.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: cang) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6B4FDC433C6; Thu, 7 Jan 2021 07:20:22 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Thu, 07 Jan 2021 15:20:22 +0800 From: Can Guo To: Jaegeuk Kim 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 In-Reply-To: <7261bef7d8aa003d7f8fc984e37390bb@codeaurora.org> References: <20210106214109.44041-1-jaegeuk@kernel.org> <20210106214109.44041-3-jaegeuk@kernel.org> <163fae07a94933230e0432e2ca584040@codeaurora.org> <7261bef7d8aa003d7f8fc984e37390bb@codeaurora.org> Message-ID: X-Sender: cang@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021-01-07 15:03, Can Guo wrote: > On 2021-01-07 14:51, Jaegeuk Kim wrote: >> On 01/07, Can Guo wrote: >>> 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 >>> > >>> >>> Would you mind add a Fixes tag? >> >> Ok. >> >>> >>> > 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(); >>> > + >>> > 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); >>> >>> Sorry that I didn't pay much attention to this part of code before. >>> May I know why must we use the BLK_MQ_REQ_RESERVED flag? >> >> What I understood is the reserved tag is used when aborting >> outstanding >> IOs when all the 32 tags were used. >> > > No, the tm requests and I/O requests are on two different tag sets: > tm requests come from hba->tmf_tag_set, while I/O requests come from > hba->shost->tag_set. Meaning they don't share tags with each other. Add they are issued on two different HW queues - one for tm reqs, one for I/O reqs, which is why two different tag sets are created. > >>> >>> Thanks, >>> Can Guo. >>> >>> > + 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, >>> >>> If we give reserved_tags as 1 and always ask for a tm requst with >>> BLK_MQ_REQ_RESERVED flag set, then the tag shall only be allocated >>> from the reserved sbitmap_queue, whose depth is set to 1 here. >>> UFS supports tm queue depth as 8, but here is allowing only one tm >>> req at a time. Why? Please correct me if my understanding is wrong. >> >> I couldn't find tm can be issued in parallel, so thought it was issued >> one at a time. If we set 8, then we can use 24 for IOs, IIUC. >> >> Please correct me as well. I'm still trying to understand the flow. >> > > UFS allows a queue depth as 8, which means it support sending multiple > tm requests at the same time. You can check commit 69a6c269c097d780a2 - > before this change, we used to use below func to allocate tags for > tm reqs, which can tell you the true story. > > So I am thinking why don't we just we remove the BLK_MQ_REQ_RESERVED > flag? > Removing it can also fix the warning I suppose. What do you think? > > -static bool ufshcd_get_tm_free_slot(struct ufs_hba *hba, int > *free_slot) > -{ > - int tag; > - bool ret = false; > - > - if (!free_slot) > - goto out; > - > - do { > - tag = find_first_zero_bit(&hba->tm_slots_in_use, > hba->nutmrs); > - if (tag >= hba->nutmrs) > - goto out; > - } while (test_and_set_bit_lock(tag, &hba->tm_slots_in_use)); > - > - *free_slot = tag; > - ret = true; > -out: > - return ret; > -} > > Thanks, > Can Guo. > >>> >>> Thanks, >>> Can Guo. >>> >>> > .queue_depth = hba->nutmrs, >>> > .ops = &ufshcd_tmf_ops, >>> > .flags = BLK_MQ_F_NO_SCHED,