From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E6D7C2D0F4 for ; Wed, 1 Apr 2020 09:22:36 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 33A082078B; Wed, 1 Apr 2020 09:22:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="bKk16yBa"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="fgtN19He"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="sRc3Ut8t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33A082078B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jJZZu-0006dv-Sm; Wed, 01 Apr 2020 09:22:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jJZZt-0006dm-7J for linux-f2fs-devel@lists.sourceforge.net; Wed, 01 Apr 2020 09:22:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Fr4eLSS9JjdItQxHTVAk0mj70SYgvnZ0Ya8DUUDv4RU=; b=bKk16yBabhlY/xxCsZZVwTqfgR jwi6jS0JE9Mc/QD9vYVTJc80HNr0S2b/pBUHA4ZkR04SMBmJU6199qYmePS9j5h8yj3l6Aa1fvDz1 vn5ZcICj+siMejIsDph1+V7vkJwS5BI46eGYb0XgINUgMtjcTrqF5xcwMMw/tt0DxHUA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Fr4eLSS9JjdItQxHTVAk0mj70SYgvnZ0Ya8DUUDv4RU=; b=fgtN19Heh07FWHNmSKZwbeh5gn 0r0pgnrCWDvMg8Ilom7VFa/vIX0aebrjE6JdQzlFIk5eoBbnTFmoa1ozJeTjw04lqrsI+MaUKJ/Vi Hhw8UtQOf8kX/wUr5hnKMoSF3+2SrrWQJnTLrKSkS5As+BU4ce+bsYoH/VblqT0Pdt8c=; Received: from mail26.static.mailgun.info ([104.130.122.26]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1jJZZo-003q9o-5X for linux-f2fs-devel@lists.sourceforge.net; Wed, 01 Apr 2020 09:22:29 +0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1585732946; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Cc: To: From: Date: Sender; bh=Fr4eLSS9JjdItQxHTVAk0mj70SYgvnZ0Ya8DUUDv4RU=; b=sRc3Ut8td9p2cc0wBjeKhcMZk7mcwuTnHF4GOebEAl9v7ib9pMhK4pPOx8F7VQLUhG3evOyz faHrlWW+aoPf8Zc1yHUMZevSIXWN8JMVG4BMP0ZnI8r56tGYYV/+UrOA+FDq9ugICKyhE0wf WcGDzLc3kf3QtR25TtRUPp13MBU= X-Mailgun-Sending-Ip: 104.130.122.26 X-Mailgun-Sid: WyI2M2Y4ZiIsICJsaW51eC1mMmZzLWRldmVsQGxpc3RzLnNvdXJjZWZvcmdlLm5ldCIsICJiZTllNGEiXQ== 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 5e845d42.7ff7be59fc38-smtp-out-n05; Wed, 01 Apr 2020 09:22:10 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id C6031C433BA; Wed, 1 Apr 2020 09:22:10 +0000 (UTC) Received: from codeaurora.org (blr-c-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: stummala) by smtp.codeaurora.org (Postfix) with ESMTPSA id 90A72C433D2; Wed, 1 Apr 2020 09:22:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 90A72C433D2 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=stummala@codeaurora.org Date: Wed, 1 Apr 2020 14:52:01 +0530 From: Sahitya Tummala To: Jaegeuk Kim Message-ID: <20200401092201.GB20234@codeaurora.org> References: <1585550730-1858-1-git-send-email-stummala@codeaurora.org> <20200331184655.GB198665@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200331184655.GB198665@google.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Headers-End: 1jJZZo-003q9o-5X Subject: Re: [f2fs-dev] [PATCH v3] f2fs: fix long latency due to discard during umount X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Hi Jaegeuk, On Tue, Mar 31, 2020 at 11:46:55AM -0700, Jaegeuk Kim wrote: > On 03/30, Sahitya Tummala wrote: > > F2FS already has a default timeout of 5 secs for discards that > > can be issued during umount, but it can take more than the 5 sec > > timeout if the underlying UFS device queue is already full and there > > are no more available free tags to be used. In that case, submit_bio() > > will wait for the already queued discard requests to complete to get > > a free tag, which can potentially take way more than 5 sec. > > > > Fix this by submitting the discard requests with REQ_NOWAIT > > flags during umount. This will return -EAGAIN for UFS queue/tag full > > scenario without waiting in the context of submit_bio(). The FS can > > then handle these requests by retrying again within the stipulated > > discard timeout period to avoid long latencies. > > Sorry, Sahitya, but, do we really need to do like this? How about just > controlling # of outstanding discarding bios in __issue_discard_cmd()? Do you mean something like this? diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 1a62b27..860dd43 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1099,7 +1099,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi, } else if (discard_type == DPOLICY_FSTRIM) { dpolicy->io_aware = false; } else if (discard_type == DPOLICY_UMOUNT) { - dpolicy->max_requests = UINT_MAX; + dpolicy->max_requests = 30; dpolicy->io_aware = false; /* we need to issue all to keep CP_TRIMMED_FLAG */ dpolicy->granularity = 1; @@ -1470,12 +1470,14 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, struct list_head *pend_list; struct discard_cmd *dc, *tmp; struct blk_plug plug; - int i, issued = 0; + int i, issued; bool io_interrupted = false; if (dpolicy->timeout != 0) f2fs_update_time(sbi, dpolicy->timeout); +retry: + issued = 0; for (i = MAX_PLIST_NUM - 1; i >= 0; i--) { if (dpolicy->timeout != 0 && f2fs_time_over(sbi, dpolicy->timeout)) @@ -1522,6 +1524,11 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, break; } + if (dpolicy->type == DPOLICY_UMOUNT && issued) { + __wait_all_discard_cmd(sbi, dpolicy); + goto retry; + } + if (!issued && io_interrupted) issued = -1; Thanks, > > > > > Signed-off-by: Sahitya Tummala > > --- > > v3: > > -Handle the regression reported by Chao with v2. > > -simplify the logic to split the dc with multiple bios incase any bio returns > > EAGAIN and retry those new dc within 5 sec timeout. > > > > fs/f2fs/segment.c | 65 +++++++++++++++++++++++++++++++++++++++++++------------ > > 1 file changed, 51 insertions(+), 14 deletions(-) > > > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > > index fb3e531..55d18c7 100644 > > --- a/fs/f2fs/segment.c > > +++ b/fs/f2fs/segment.c > > @@ -1029,13 +1029,16 @@ static void f2fs_submit_discard_endio(struct bio *bio) > > struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private; > > unsigned long flags; > > > > - dc->error = blk_status_to_errno(bio->bi_status); > > - > > spin_lock_irqsave(&dc->lock, flags); > > + if (!dc->error) > > + dc->error = blk_status_to_errno(bio->bi_status); > > + > > dc->bio_ref--; > > - if (!dc->bio_ref && dc->state == D_SUBMIT) { > > - dc->state = D_DONE; > > - complete_all(&dc->wait); > > + if (!dc->bio_ref) { > > + if (dc->error || dc->state == D_SUBMIT) { > > + dc->state = D_DONE; > > + complete_all(&dc->wait); > > + } > > } > > spin_unlock_irqrestore(&dc->lock, flags); > > bio_put(bio); > > @@ -1124,10 +1127,13 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info; > > struct list_head *wait_list = (dpolicy->type == DPOLICY_FSTRIM) ? > > &(dcc->fstrim_list) : &(dcc->wait_list); > > - int flag = dpolicy->sync ? REQ_SYNC : 0; > > + int flag; > > block_t lstart, start, len, total_len; > > int err = 0; > > > > + flag = dpolicy->sync ? REQ_SYNC : 0; > > + flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0; > > + > > if (dc->state != D_PREP) > > return 0; > > > > @@ -1192,10 +1198,6 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > dc->bio_ref++; > > spin_unlock_irqrestore(&dc->lock, flags); > > > > - atomic_inc(&dcc->queued_discard); > > - dc->queued++; > > - list_move_tail(&dc->list, wait_list); > > - > > /* sanity check on discard range */ > > __check_sit_bitmap(sbi, lstart, lstart + len); > > > > @@ -1203,6 +1205,29 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > bio->bi_end_io = f2fs_submit_discard_endio; > > bio->bi_opf |= flag; > > submit_bio(bio); > > + if (flag & REQ_NOWAIT) { > > + if (dc->error == -EAGAIN) { > > + spin_lock_irqsave(&dc->lock, flags); > > + dc->len -= len; > > + if (!dc->len) { > > + dc->len = total_len; > > + dc->state = D_PREP; > > + reinit_completion(&dc->wait); > > + } else { > > + dcc->undiscard_blks -= total_len; > > + if (dc->state == D_PARTIAL) > > + dc->state = D_SUBMIT; > > + } > > + err = dc->error; > > + dc->error = 0; > > + spin_unlock_irqrestore(&dc->lock, flags); > > + break; > > + } > > + } > > + > > + atomic_inc(&dcc->queued_discard); > > + dc->queued++; > > + list_move_tail(&dc->list, wait_list); > > > > atomic_inc(&dcc->issued_discard); > > > > @@ -1214,8 +1239,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > len = total_len; > > } > > > > - if (!err && len) > > - __update_discard_tree_range(sbi, bdev, lstart, start, len); > > + if ((!err || err == -EAGAIN) && total_len && dc->start != start) > > + __update_discard_tree_range(sbi, bdev, lstart, start, > > + total_len); > > return err; > > } > > > > @@ -1470,12 +1496,15 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, > > struct list_head *pend_list; > > struct discard_cmd *dc, *tmp; > > struct blk_plug plug; > > - int i, issued = 0; > > + int i, err, issued = 0; > > bool io_interrupted = false; > > + bool retry; > > > > if (dpolicy->timeout != 0) > > f2fs_update_time(sbi, dpolicy->timeout); > > > > +retry: > > + retry = false; > > for (i = MAX_PLIST_NUM - 1; i >= 0; i--) { > > if (dpolicy->timeout != 0 && > > f2fs_time_over(sbi, dpolicy->timeout)) > > @@ -1509,7 +1538,12 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, > > break; > > } > > > > - __submit_discard_cmd(sbi, dpolicy, dc, &issued); > > + err = __submit_discard_cmd(sbi, dpolicy, dc, &issued); > > + if (err == -EAGAIN) { > > + congestion_wait(BLK_RW_ASYNC, > > + DEFAULT_IO_TIMEOUT); > > + retry = true; > > + } > > > > if (issued >= dpolicy->max_requests) > > break; > > @@ -1522,6 +1556,9 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, > > break; > > } > > > > + if (retry) > > + goto retry; > > + > > if (!issued && io_interrupted) > > issued = -1; > > > > -- > > Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. > > Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project. -- -- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 441B1C43331 for ; Wed, 1 Apr 2020 09:22:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05C8220787 for ; Wed, 1 Apr 2020 09:22:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="GglleGnH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731872AbgDAJWW (ORCPT ); Wed, 1 Apr 2020 05:22:22 -0400 Received: from mail26.static.mailgun.info ([104.130.122.26]:23937 "EHLO mail26.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726368AbgDAJWW (ORCPT ); Wed, 1 Apr 2020 05:22:22 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1585732941; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Cc: To: From: Date: Sender; bh=Fr4eLSS9JjdItQxHTVAk0mj70SYgvnZ0Ya8DUUDv4RU=; b=GglleGnHXyw+ARi1UVI436bJ7eGvSt9svzoTbxUzhXIUB3liOjjK5pgqvDC4qMXCQoz5ghAr o7/9E99lQw0wAv3/b5MeKs74dYjVvDuSLZesyiltgYlxLub+6mZxGSNMu6Zgucj3lHBIP9/o qakFqDHTfl8fst9YOWUsencv+YM= 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 5e845d43.7f5d79e29b90-smtp-out-n05; Wed, 01 Apr 2020 09:22:11 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id EAB38C43637; Wed, 1 Apr 2020 09:22:10 +0000 (UTC) Received: from codeaurora.org (blr-c-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: stummala) by smtp.codeaurora.org (Postfix) with ESMTPSA id 90A72C433D2; Wed, 1 Apr 2020 09:22:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 90A72C433D2 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=stummala@codeaurora.org Date: Wed, 1 Apr 2020 14:52:01 +0530 From: Sahitya Tummala To: Jaegeuk Kim Cc: Chao Yu , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, stummala@codeaurora.org Subject: Re: [PATCH v3] f2fs: fix long latency due to discard during umount Message-ID: <20200401092201.GB20234@codeaurora.org> References: <1585550730-1858-1-git-send-email-stummala@codeaurora.org> <20200331184655.GB198665@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200331184655.GB198665@google.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jaegeuk, On Tue, Mar 31, 2020 at 11:46:55AM -0700, Jaegeuk Kim wrote: > On 03/30, Sahitya Tummala wrote: > > F2FS already has a default timeout of 5 secs for discards that > > can be issued during umount, but it can take more than the 5 sec > > timeout if the underlying UFS device queue is already full and there > > are no more available free tags to be used. In that case, submit_bio() > > will wait for the already queued discard requests to complete to get > > a free tag, which can potentially take way more than 5 sec. > > > > Fix this by submitting the discard requests with REQ_NOWAIT > > flags during umount. This will return -EAGAIN for UFS queue/tag full > > scenario without waiting in the context of submit_bio(). The FS can > > then handle these requests by retrying again within the stipulated > > discard timeout period to avoid long latencies. > > Sorry, Sahitya, but, do we really need to do like this? How about just > controlling # of outstanding discarding bios in __issue_discard_cmd()? Do you mean something like this? diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 1a62b27..860dd43 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1099,7 +1099,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi, } else if (discard_type == DPOLICY_FSTRIM) { dpolicy->io_aware = false; } else if (discard_type == DPOLICY_UMOUNT) { - dpolicy->max_requests = UINT_MAX; + dpolicy->max_requests = 30; dpolicy->io_aware = false; /* we need to issue all to keep CP_TRIMMED_FLAG */ dpolicy->granularity = 1; @@ -1470,12 +1470,14 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, struct list_head *pend_list; struct discard_cmd *dc, *tmp; struct blk_plug plug; - int i, issued = 0; + int i, issued; bool io_interrupted = false; if (dpolicy->timeout != 0) f2fs_update_time(sbi, dpolicy->timeout); +retry: + issued = 0; for (i = MAX_PLIST_NUM - 1; i >= 0; i--) { if (dpolicy->timeout != 0 && f2fs_time_over(sbi, dpolicy->timeout)) @@ -1522,6 +1524,11 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, break; } + if (dpolicy->type == DPOLICY_UMOUNT && issued) { + __wait_all_discard_cmd(sbi, dpolicy); + goto retry; + } + if (!issued && io_interrupted) issued = -1; Thanks, > > > > > Signed-off-by: Sahitya Tummala > > --- > > v3: > > -Handle the regression reported by Chao with v2. > > -simplify the logic to split the dc with multiple bios incase any bio returns > > EAGAIN and retry those new dc within 5 sec timeout. > > > > fs/f2fs/segment.c | 65 +++++++++++++++++++++++++++++++++++++++++++------------ > > 1 file changed, 51 insertions(+), 14 deletions(-) > > > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > > index fb3e531..55d18c7 100644 > > --- a/fs/f2fs/segment.c > > +++ b/fs/f2fs/segment.c > > @@ -1029,13 +1029,16 @@ static void f2fs_submit_discard_endio(struct bio *bio) > > struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private; > > unsigned long flags; > > > > - dc->error = blk_status_to_errno(bio->bi_status); > > - > > spin_lock_irqsave(&dc->lock, flags); > > + if (!dc->error) > > + dc->error = blk_status_to_errno(bio->bi_status); > > + > > dc->bio_ref--; > > - if (!dc->bio_ref && dc->state == D_SUBMIT) { > > - dc->state = D_DONE; > > - complete_all(&dc->wait); > > + if (!dc->bio_ref) { > > + if (dc->error || dc->state == D_SUBMIT) { > > + dc->state = D_DONE; > > + complete_all(&dc->wait); > > + } > > } > > spin_unlock_irqrestore(&dc->lock, flags); > > bio_put(bio); > > @@ -1124,10 +1127,13 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info; > > struct list_head *wait_list = (dpolicy->type == DPOLICY_FSTRIM) ? > > &(dcc->fstrim_list) : &(dcc->wait_list); > > - int flag = dpolicy->sync ? REQ_SYNC : 0; > > + int flag; > > block_t lstart, start, len, total_len; > > int err = 0; > > > > + flag = dpolicy->sync ? REQ_SYNC : 0; > > + flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0; > > + > > if (dc->state != D_PREP) > > return 0; > > > > @@ -1192,10 +1198,6 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > dc->bio_ref++; > > spin_unlock_irqrestore(&dc->lock, flags); > > > > - atomic_inc(&dcc->queued_discard); > > - dc->queued++; > > - list_move_tail(&dc->list, wait_list); > > - > > /* sanity check on discard range */ > > __check_sit_bitmap(sbi, lstart, lstart + len); > > > > @@ -1203,6 +1205,29 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > bio->bi_end_io = f2fs_submit_discard_endio; > > bio->bi_opf |= flag; > > submit_bio(bio); > > + if (flag & REQ_NOWAIT) { > > + if (dc->error == -EAGAIN) { > > + spin_lock_irqsave(&dc->lock, flags); > > + dc->len -= len; > > + if (!dc->len) { > > + dc->len = total_len; > > + dc->state = D_PREP; > > + reinit_completion(&dc->wait); > > + } else { > > + dcc->undiscard_blks -= total_len; > > + if (dc->state == D_PARTIAL) > > + dc->state = D_SUBMIT; > > + } > > + err = dc->error; > > + dc->error = 0; > > + spin_unlock_irqrestore(&dc->lock, flags); > > + break; > > + } > > + } > > + > > + atomic_inc(&dcc->queued_discard); > > + dc->queued++; > > + list_move_tail(&dc->list, wait_list); > > > > atomic_inc(&dcc->issued_discard); > > > > @@ -1214,8 +1239,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > len = total_len; > > } > > > > - if (!err && len) > > - __update_discard_tree_range(sbi, bdev, lstart, start, len); > > + if ((!err || err == -EAGAIN) && total_len && dc->start != start) > > + __update_discard_tree_range(sbi, bdev, lstart, start, > > + total_len); > > return err; > > } > > > > @@ -1470,12 +1496,15 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, > > struct list_head *pend_list; > > struct discard_cmd *dc, *tmp; > > struct blk_plug plug; > > - int i, issued = 0; > > + int i, err, issued = 0; > > bool io_interrupted = false; > > + bool retry; > > > > if (dpolicy->timeout != 0) > > f2fs_update_time(sbi, dpolicy->timeout); > > > > +retry: > > + retry = false; > > for (i = MAX_PLIST_NUM - 1; i >= 0; i--) { > > if (dpolicy->timeout != 0 && > > f2fs_time_over(sbi, dpolicy->timeout)) > > @@ -1509,7 +1538,12 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, > > break; > > } > > > > - __submit_discard_cmd(sbi, dpolicy, dc, &issued); > > + err = __submit_discard_cmd(sbi, dpolicy, dc, &issued); > > + if (err == -EAGAIN) { > > + congestion_wait(BLK_RW_ASYNC, > > + DEFAULT_IO_TIMEOUT); > > + retry = true; > > + } > > > > if (issued >= dpolicy->max_requests) > > break; > > @@ -1522,6 +1556,9 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, > > break; > > } > > > > + if (retry) > > + goto retry; > > + > > if (!issued && io_interrupted) > > issued = -1; > > > > -- > > Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. > > Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project. -- -- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.