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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 B38A2C43331 for ; Thu, 2 Apr 2020 09:32:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8824E2072E for ; Thu, 2 Apr 2020 09:32:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387858AbgDBJcx (ORCPT ); Thu, 2 Apr 2020 05:32:53 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:60456 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725965AbgDBJcw (ORCPT ); Thu, 2 Apr 2020 05:32:52 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 2444568442345BB538E0; Thu, 2 Apr 2020 17:32:19 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.210) with Microsoft SMTP Server (TLS) id 14.3.487.0; Thu, 2 Apr 2020 17:32:14 +0800 Subject: Re: [PATCH v3] f2fs: fix long latency due to discard during umount To: Sahitya Tummala , Jaegeuk Kim CC: , References: <1585550730-1858-1-git-send-email-stummala@codeaurora.org> <20200331184655.GB198665@google.com> <20200401092201.GB20234@codeaurora.org> From: Chao Yu Message-ID: <417fffb8-0638-e674-cf39-e54665080c36@huawei.com> Date: Thu, 2 Apr 2020 17:32:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200401092201.GB20234@codeaurora.org> Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/4/1 17:22, Sahitya Tummala wrote: > 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; 8 or 16? It looks more simple than previous implementation. Thanks, > 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. > 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,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 65E76C43331 for ; Thu, 2 Apr 2020 09:32:34 +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 344962072E; Thu, 2 Apr 2020 09:32:34 +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="BUQdIm1g"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="AdijUh3K" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 344962072E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jJwDB-0006of-1u; Thu, 02 Apr 2020 09:32:33 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jJwD9-0006oY-Jk for linux-f2fs-devel@lists.sourceforge.net; Thu, 02 Apr 2020 09:32:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:CC:To:Subject:Sender:Reply-To: 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=od5cS126zl4YMaii9/MAIHQPQepVRdkPT4j+xTzLmd4=; b=BUQdIm1gddiwKHF2UKEx72K0pu 9otsWMCoAqvo5GXR/qMKSDqkerNXpyAKHGDjl33UxOAqk5JfYoeQQOxRJMy8sEEM8Jp5hmm+sjxqP JmmJ1UxptT0OFFRD7m8aCqumY3/AqUBigSvBovg08PKiBSRJvZu6+3By+7TQjkSWOtuw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Sender:Reply-To: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=od5cS126zl4YMaii9/MAIHQPQepVRdkPT4j+xTzLmd4=; b=AdijUh3KF0lr1fVZbSNvUYeDMI Pji24gHr1wkjAlNGSHcZL+Q8lPAuYfyUcTPRXiu2IJhDS/oph9aSfuEMdI7pEOc6QQ4jlCO2/QM8M 3Ie7A8Y/WRdSz9K0ZTPrhnExkF9HtbROaQMDQshHvVDO3eZxRJvI7+ZPrFYKnvHecktU=; Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jJwD5-004t75-1b for linux-f2fs-devel@lists.sourceforge.net; Thu, 02 Apr 2020 09:32:31 +0000 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 2444568442345BB538E0; Thu, 2 Apr 2020 17:32:19 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.210) with Microsoft SMTP Server (TLS) id 14.3.487.0; Thu, 2 Apr 2020 17:32:14 +0800 To: Sahitya Tummala , Jaegeuk Kim References: <1585550730-1858-1-git-send-email-stummala@codeaurora.org> <20200331184655.GB198665@google.com> <20200401092201.GB20234@codeaurora.org> From: Chao Yu Message-ID: <417fffb8-0638-e674-cf39-e54665080c36@huawei.com> Date: Thu, 2 Apr 2020 17:32:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200401092201.GB20234@codeaurora.org> Content-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1jJwD5-004t75-1b 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 On 2020/4/1 17:22, Sahitya Tummala wrote: > 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; 8 or 16? It looks more simple than previous implementation. Thanks, > 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. > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel