Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753036AbaLHTJ0 (ORCPT ); Mon, 8 Dec 2014 14:09:26 -0500 Received: from mail.kernel.org ([198.145.19.201]:48091 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750998AbaLHTJZ (ORCPT ); Mon, 8 Dec 2014 14:09:25 -0500 Date: Mon, 8 Dec 2014 11:09:24 -0800 From: Jaegeuk Kim To: Chao Yu Cc: Changman Lee , linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [f2fs-dev][PATCH 3/4] f2fs: readahead contiguous current summary blocks in checkpoint Message-ID: <20141208190924.GB18956@jaegeuk-mac02.mot.com> References: <001a01d012b4$dfe9d040$9fbd70c0$@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <001a01d012b4$dfe9d040$9fbd70c0$@samsung.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Chao, On Mon, Dec 08, 2014 at 03:01:16PM +0800, Chao Yu wrote: > Let's add readahead code for reading contiguous compact/normal summary blocks > in checkpoint, then we will gain better performance in mount procedure. > > Signed-off-by: Chao Yu > --- > fs/f2fs/checkpoint.c | 2 +- > fs/f2fs/f2fs.h | 2 +- > fs/f2fs/segment.c | 21 ++++++++++++++++++--- > 3 files changed, 20 insertions(+), 5 deletions(-) > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index e0ff75e..aa2a21c 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -915,7 +915,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) > ckpt->next_free_nid = cpu_to_le32(last_nid); > > /* 2 cp + n data seg summary + orphan inode blocks */ > - data_sum_blocks = npages_for_summary_flush(sbi); > + data_sum_blocks = npages_for_summary_flush(sbi, false); > if (data_sum_blocks < NR_CURSEG_DATA_TYPE) > set_ckpt_flags(ckpt, CP_COMPACT_SUM_FLAG); > else > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index d042813..fc88e8a 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -1393,7 +1393,7 @@ void refresh_sit_entry(struct f2fs_sb_info *, block_t, block_t); > void clear_prefree_segments(struct f2fs_sb_info *); > void release_discard_addrs(struct f2fs_sb_info *); > void discard_next_dnode(struct f2fs_sb_info *, block_t); > -int npages_for_summary_flush(struct f2fs_sb_info *); > +int npages_for_summary_flush(struct f2fs_sb_info *, bool); > void allocate_new_segments(struct f2fs_sb_info *); > int f2fs_trim_fs(struct f2fs_sb_info *, struct fstrim_range *); > struct page *get_sum_page(struct f2fs_sb_info *, unsigned int); > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > index 9a33e34..e3bec6e 100644 > --- a/fs/f2fs/segment.c > +++ b/fs/f2fs/segment.c > @@ -731,7 +731,7 @@ static void __add_sum_entry(struct f2fs_sb_info *sbi, int type, > /* > * Calculate the number of current summary pages for writing > */ > -int npages_for_summary_flush(struct f2fs_sb_info *sbi) > +int npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra) > { > int valid_sum_count = 0; > int i, sum_in_page; > @@ -739,8 +739,13 @@ int npages_for_summary_flush(struct f2fs_sb_info *sbi) > for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) { > if (sbi->ckpt->alloc_type[i] == SSR) > valid_sum_count += sbi->blocks_per_seg; > - else > - valid_sum_count += curseg_blkoff(sbi, i); > + else { > + if (unlikely(for_ra)) IMO, unlikely is not appropriate for here. Thanks, > + valid_sum_count += le16_to_cpu( > + F2FS_CKPT(sbi)->cur_data_blkoff[i]); > + else > + valid_sum_count += curseg_blkoff(sbi, i); > + } > } > > sum_in_page = (PAGE_CACHE_SIZE - 2 * SUM_JOURNAL_SIZE - > @@ -1446,12 +1451,22 @@ static int restore_curseg_summaries(struct f2fs_sb_info *sbi) > int err; > > if (is_set_ckpt_flags(F2FS_CKPT(sbi), CP_COMPACT_SUM_FLAG)) { > + int npages = npages_for_summary_flush(sbi, true); > + > + if (npages >= 2) > + ra_meta_pages(sbi, start_sum_block(sbi), npages, > + META_CP); > + > /* restore for compacted data summary */ > if (read_compacted_summaries(sbi)) > return -EINVAL; > type = CURSEG_HOT_NODE; > } > > + if (is_set_ckpt_flags(F2FS_CKPT(sbi), CP_UMOUNT_FLAG)) > + ra_meta_pages(sbi, sum_blk_addr(sbi, NR_CURSEG_TYPE, type), > + NR_CURSEG_TYPE - type, META_CP); > + > for (; type <= CURSEG_COLD_NODE; type++) { > err = read_normal_summaries(sbi, type); > if (err) > -- > 2.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/