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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9EF9CC433F5 for ; Thu, 3 Feb 2022 20:00:21 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nFiH2-0001sJ-S7; Thu, 03 Feb 2022 20:00:07 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nFiH0-0001sA-M5 for linux-f2fs-devel@lists.sourceforge.net; Thu, 03 Feb 2022 20:00:05 +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=gGX0zVt5zd3FLGyLaKSRsXuOz64qZSNhpq0VIbut1eg=; b=GqCpHFnQR6Ho04kiDH3CFRXW+9 6MKmifCUTGnCe7yKKmBHhPtc0/kiPpHakHiLRb4jyJXfeYXNdgEAj1AMOqecx/sh9uUQ0LN/EZRzh BwsKoN+Zswkdhnaz3CKYMW99vFa3QcX6IoXwW1ihtr2fyRG3tJLa055R68ezTZD0j6Mc=; 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=gGX0zVt5zd3FLGyLaKSRsXuOz64qZSNhpq0VIbut1eg=; b=HsLb0AkMhDOrj3lGg6WteIBGa2 LFt71pnEWAecrzL9oFVTtHQCRGWfGiGwU3MSKoen/ELlQV2yxwXls+RuORkDi5Oddg7jdx35Cbka4 gmYub2UCN5zhvJZbGQhbKTuFRUVfrgzbtGSouXtoX1wB9yOcqmN7Aub7Ei3FROpR+YW8=; Received: from ams.source.kernel.org ([145.40.68.75]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nFiGs-00Fapk-LV for linux-f2fs-devel@lists.sourceforge.net; Thu, 03 Feb 2022 20:00:03 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C7721B832B6 for ; Thu, 3 Feb 2022 19:59:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71363C340E8; Thu, 3 Feb 2022 19:59:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643918385; bh=dou+5I9pbMU/xeR/7VvG7DSIRN8IgpRudJTeJooph/g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UKw617YZQEGR6HYDK4cwRHvcrxayXi4h5c4WwzuezQ+Rz5YKi8shLs8mO2Tci+52i prnqJkb1zcn+98cUo0Akb8kTElLpNqlBLA+35n6phZowRTfZRt2haqTcdjcYdlB0+p ujFvaFJw0RRgsE+SEMmf1bYLyHcl2TS+4Ch/tA1pB7M3ArijR9AuZJbYPnqOQsV56q CaSZY41020DSneTyaogQPsCgZ8JwG0Cbdv5obDt+b/OaatAgOZsvZcpRiSkX7w1eFx MH5w3y/bSDIlHnOtU7EYv3C/c4CULhNjS/eE363zvqfzn3W3nC/VLw2wbPL6srg9Q+ v34TsbgM8grmw== Date: Thu, 3 Feb 2022 11:59:44 -0800 From: Jaegeuk Kim To: Chao Yu Message-ID: References: <20220129082112.1814398-1-chao@kernel.org> <9d450a33-41eb-0caf-aba1-427c5ae547ed@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <9d450a33-41eb-0caf-aba1-427c5ae547ed@kernel.org> X-Headers-End: 1nFiGs-00Fapk-LV Subject: Re: [f2fs-dev] [PATCH] f2fs: adjust readahead block number during recovery 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 02/03, Chao Yu wrote: > Jaegeuk, any comments on this patch? Yea, looks good to me. > > Thanks, > > On 2022/1/29 16:21, Chao Yu wrote: > > In a fragmented image, entries in dnode block list may locate in > > incontiguous physical block address space, however, in recovery flow, > > we will always readahead BIO_MAX_VECS size blocks, so in such case, > > current readahead policy is low efficient, let's adjust readahead > > window size dynamically based on consecutiveness of dnode blocks. > > > > Signed-off-by: Chao Yu > > --- > > fs/f2fs/checkpoint.c | 8 ++++++-- > > fs/f2fs/f2fs.h | 6 +++++- > > fs/f2fs/recovery.c | 27 ++++++++++++++++++++++++--- > > 3 files changed, 35 insertions(+), 6 deletions(-) > > > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > > index 57a2d9164bee..203a1577942d 100644 > > --- a/fs/f2fs/checkpoint.c > > +++ b/fs/f2fs/checkpoint.c > > @@ -282,18 +282,22 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, > > return blkno - start; > > } > > -void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index) > > +void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index, > > + unsigned int ra_blocks) > > { > > struct page *page; > > bool readahead = false; > > + if (ra_blocks == RECOVERY_MIN_RA_BLOCKS) > > + return; > > + > > page = find_get_page(META_MAPPING(sbi), index); > > if (!page || !PageUptodate(page)) > > readahead = true; > > f2fs_put_page(page, 0); > > if (readahead) > > - f2fs_ra_meta_pages(sbi, index, BIO_MAX_VECS, META_POR, true); > > + f2fs_ra_meta_pages(sbi, index, ra_blocks, META_POR, true); > > } > > static int __f2fs_write_meta_page(struct page *page, > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > index 5af415208488..1fa6b3f98a71 100644 > > --- a/fs/f2fs/f2fs.h > > +++ b/fs/f2fs/f2fs.h > > @@ -590,6 +590,9 @@ enum { > > /* number of extent info in extent cache we try to shrink */ > > #define EXTENT_CACHE_SHRINK_NUMBER 128 > > +#define RECOVERY_MAX_RA_BLOCKS BIO_MAX_VECS > > +#define RECOVERY_MIN_RA_BLOCKS 1 > > + > > struct rb_entry { > > struct rb_node rb_node; /* rb node located in rb-tree */ > > union { > > @@ -3655,7 +3658,8 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, > > block_t blkaddr, int type); > > int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, > > int type, bool sync); > > -void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index); > > +void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index, > > + unsigned int ra_blocks); > > long f2fs_sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type, > > long nr_to_write, enum iostat_type io_type); > > void f2fs_add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type); > > diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c > > index f69b685fb2b2..0b88d0ce284a 100644 > > --- a/fs/f2fs/recovery.c > > +++ b/fs/f2fs/recovery.c > > @@ -346,6 +346,19 @@ static int recover_inode(struct inode *inode, struct page *page) > > return 0; > > } > > +static unsigned int adjust_por_ra_blocks(struct f2fs_sb_info *sbi, > > + unsigned int ra_blocks, unsigned int blkaddr, > > + unsigned int next_blkaddr) > > +{ > > + if (blkaddr + 1 == next_blkaddr) > > + ra_blocks = min_t(unsigned int, RECOVERY_MIN_RA_BLOCKS, > > + ra_blocks * 2); > > + else if (next_blkaddr % sbi->blocks_per_seg) > > + ra_blocks = max_t(unsigned int, RECOVERY_MAX_RA_BLOCKS, > > + ra_blocks / 2); > > + return ra_blocks; > > +} > > + > > static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head, > > bool check_only) > > { > > @@ -353,6 +366,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head, > > struct page *page = NULL; > > block_t blkaddr; > > unsigned int loop_cnt = 0; > > + unsigned int ra_blocks = RECOVERY_MAX_RA_BLOCKS; > > unsigned int free_blocks = MAIN_SEGS(sbi) * sbi->blocks_per_seg - > > valid_user_blocks(sbi); > > int err = 0; > > @@ -427,11 +441,14 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head, > > break; > > } > > + ra_blocks = adjust_por_ra_blocks(sbi, ra_blocks, blkaddr, > > + next_blkaddr_of_node(page)); > > + > > /* check next segment */ > > blkaddr = next_blkaddr_of_node(page); > > f2fs_put_page(page, 1); > > - f2fs_ra_meta_pages_cond(sbi, blkaddr); > > + f2fs_ra_meta_pages_cond(sbi, blkaddr, ra_blocks); > > } > > return err; > > } > > @@ -707,6 +724,7 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list, > > struct page *page = NULL; > > int err = 0; > > block_t blkaddr; > > + unsigned int ra_blocks = RECOVERY_MAX_RA_BLOCKS; > > /* get node pages in the current segment */ > > curseg = CURSEG_I(sbi, CURSEG_WARM_NODE); > > @@ -718,8 +736,6 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list, > > if (!f2fs_is_valid_blkaddr(sbi, blkaddr, META_POR)) > > break; > > - f2fs_ra_meta_pages_cond(sbi, blkaddr); > > - > > page = f2fs_get_tmp_page(sbi, blkaddr); > > if (IS_ERR(page)) { > > err = PTR_ERR(page); > > @@ -762,9 +778,14 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list, > > if (entry->blkaddr == blkaddr) > > list_move_tail(&entry->list, tmp_inode_list); > > next: > > + ra_blocks = adjust_por_ra_blocks(sbi, ra_blocks, blkaddr, > > + next_blkaddr_of_node(page)); > > + > > /* check next segment */ > > blkaddr = next_blkaddr_of_node(page); > > f2fs_put_page(page, 1); > > + > > + f2fs_ra_meta_pages_cond(sbi, blkaddr, ra_blocks); > > } > > if (!err) > > f2fs_allocate_new_segments(sbi); _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel