From mboxrd@z Thu Jan 1 00:00:00 1970 From: Changman Lee Subject: Re: [f2fs-dev] [PATCH] f2fs: large volume support Date: Wed, 21 May 2014 15:46:35 +0900 Message-ID: <1400654795.8373.6.camel@lcm> References: <1399877976-2643-1-git-send-email-cm224.lee@samsung.com> <1400646791.12919.4.camel@kjgkr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org To: Jaegeuk Kim Return-path: Received: from mailout2.samsung.com ([203.254.224.25]:10687 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750755AbaEUGsD (ORCPT ); Wed, 21 May 2014 02:48:03 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N5W00CCWW81XY90@mailout2.samsung.com> for linux-fsdevel@vger.kernel.org; Wed, 21 May 2014 15:48:01 +0900 (KST) In-reply-to: <1400646791.12919.4.camel@kjgkr> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On =EC=88=98, 2014-05-21 at 13:33 +0900, Jaegeuk Kim wrote: > Hi Changman, >=20 > 2014-05-12 (=EC=9B=94), 15:59 +0900, Changman Lee: > > f2fs's cp has one page which consists of struct f2fs_checkpoint and > > version bitmap of sit and nat. To support lots of segments, we need= more > > blocks for sit bitmap. So let's arrange sit bitmap as following: > > +-----------------+------------+ > > | f2fs_checkpoint | sit bitmap | > > | + nat bitmap | | > > +-----------------+------------+ > > 0 4k N blocks > >=20 > > Signed-off-by: Changman Lee > > --- > > fs/f2fs/checkpoint.c | 47 +++++++++++++++++++++++++++++++++++= +++++++++--- > > fs/f2fs/f2fs.h | 13 +++++++++++-- > > include/linux/f2fs_fs.h | 2 ++ > > 3 files changed, 57 insertions(+), 5 deletions(-) > >=20 > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > > index fe968c7..f418243 100644 > > --- a/fs/f2fs/checkpoint.c > > +++ b/fs/f2fs/checkpoint.c > > @@ -544,6 +544,32 @@ int get_valid_checkpoint(struct f2fs_sb_info *= sbi) > > cp_block =3D (struct f2fs_checkpoint *)page_address(cur_page); > > memcpy(sbi->ckpt, cp_block, blk_size); > > =20 > > + if (is_set_ckpt_flags(sbi->ckpt, CP_LARGE_VOL_FLAG)) { > > + int i, cp_blks; > > + block_t cp_blk_no; > > + > > + cp_blk_no =3D le32_to_cpu(fsb->cp_blkaddr); > > + if (cur_page =3D=3D cp2) > > + cp_blk_no +=3D 1 << le32_to_cpu(fsb->log_blocks_per_seg); > > + > > + cp_blks =3D 1 + F2FS_BLK_ALIGN(cp_block->sit_ver_bitmap_bytesize= ); >=20 > Should covert le32_to_cpu(cp_block->sit_ver_bitmap_bytesize). >=20 Got it. > > + > > + kfree(sbi->ckpt); > > + sbi->ckpt =3D kzalloc(cp_blks * blk_size, GFP_KERNEL); >=20 > Why does it have to reallocate this and not to handle -ENOMEM correct= ly? I think it's more simple than using another variable to point sit_ver_bitmap and it doesn't require alloc and free for the variable. >=20 > > + > > + memcpy(sbi->ckpt, cp_block, blk_size); > > + > > + for (i =3D 1; i < cp_blks; i++) { > > + void *sit_bitmap_ptr; > > + unsigned char *ckpt =3D (unsigned char *)sbi->ckpt; > > + > > + cur_page =3D get_meta_page(sbi, cp_blk_no + i); > > + sit_bitmap_ptr =3D page_address(cur_page); > > + memcpy(ckpt + i * blk_size, sit_bitmap_ptr, blk_size); > > + f2fs_put_page(cur_page, 1); > > + } > > + } > > + > > f2fs_put_page(cp1, 1); > > f2fs_put_page(cp2, 1); > > return 0; > > @@ -736,6 +762,7 @@ static void do_checkpoint(struct f2fs_sb_info *= sbi, bool is_umount) > > __u32 crc32 =3D 0; > > void *kaddr; > > int i; > > + int sit_bitmap_blks =3D 0; > > =20 > > /* > > * This avoids to conduct wrong roll-forward operations and uses > > @@ -786,16 +813,21 @@ static void do_checkpoint(struct f2fs_sb_info= *sbi, bool is_umount) > > =20 > > orphan_blocks =3D (sbi->n_orphans + F2FS_ORPHANS_PER_BLOCK - 1) > > / F2FS_ORPHANS_PER_BLOCK; > > - ckpt->cp_pack_start_sum =3D cpu_to_le32(1 + orphan_blocks); > > + if (is_set_ckpt_flags(ckpt, CP_LARGE_VOL_FLAG)) > > + sit_bitmap_blks =3D F2FS_BLK_ALIGN(ckpt->sit_ver_bitmap_bytesize= ); > > + ckpt->cp_pack_start_sum =3D cpu_to_le32(1 + sit_bitmap_blks + > > + orphan_blocks); > > =20 > > if (is_umount) { > > set_ckpt_flags(ckpt, CP_UMOUNT_FLAG); > > ckpt->cp_pack_total_block_count =3D cpu_to_le32(2 + > > - data_sum_blocks + orphan_blocks + NR_CURSEG_NODE_TYPE); > > + sit_bitmap_blks + data_sum_blocks + > > + orphan_blocks + NR_CURSEG_NODE_TYPE); > > } else { > > clear_ckpt_flags(ckpt, CP_UMOUNT_FLAG); > > ckpt->cp_pack_total_block_count =3D cpu_to_le32(2 + > > - data_sum_blocks + orphan_blocks); > > + sit_bitmap_blks + data_sum_blocks + > > + orphan_blocks); > > } > > =20 > > if (sbi->n_orphans) > > @@ -821,6 +853,15 @@ static void do_checkpoint(struct f2fs_sb_info = *sbi, bool is_umount) > > set_page_dirty(cp_page); > > f2fs_put_page(cp_page, 1); > > =20 > > + for (i =3D 1; i < 1 + sit_bitmap_blks; i++) { > > + cp_page =3D grab_meta_page(sbi, start_blk++); > > + kaddr =3D page_address(cp_page); > > + memcpy(kaddr, (char *)ckpt + i * F2FS_BLKSIZE, > > + (1 << sbi->log_blocksize)); > > + set_page_dirty(cp_page); > > + f2fs_put_page(cp_page, 1); > > + } > > + > > if (sbi->n_orphans) { > > write_orphan_inodes(sbi, start_blk); > > start_blk +=3D orphan_blocks; > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > index 676a2c6..9e147ae 100644 > > --- a/fs/f2fs/f2fs.h > > +++ b/fs/f2fs/f2fs.h > > @@ -764,9 +764,18 @@ static inline unsigned long __bitmap_size(stru= ct f2fs_sb_info *sbi, int flag) > > static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int fla= g) > > { > > struct f2fs_checkpoint *ckpt =3D F2FS_CKPT(sbi); > > - int offset =3D (flag =3D=3D NAT_BITMAP) ? > > + int offset; > > + > > + if (ckpt->ckpt_flags & CP_LARGE_VOL_FLAG) { >=20 > Should call is_set_ckpt_flag(ckpt, CP_LARGE_VOL_FLAG) to avoid endian > conversion issue. >=20 > Thanks, >=20 My mistake. Thanks. > > + if (flag =3D=3D NAT_BITMAP) > > + return &ckpt->sit_nat_version_bitmap; > > + else > > + return ((unsigned char *)ckpt + F2FS_BLKSIZE); > > + } else { > > + offset =3D (flag =3D=3D NAT_BITMAP) ? > > le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; > > - return &ckpt->sit_nat_version_bitmap + offset; > > + return &ckpt->sit_nat_version_bitmap + offset; > > + } > > } > > =20 > > static inline block_t __start_cp_addr(struct f2fs_sb_info *sbi) > > diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h > > index 8c03f71..0f0b788 100644 > > --- a/include/linux/f2fs_fs.h > > +++ b/include/linux/f2fs_fs.h > > @@ -19,6 +19,7 @@ > > #define F2FS_LOG_SECTORS_PER_BLOCK 3 /* 4KB: F2FS_BLKSIZE */ > > #define F2FS_BLKSIZE 4096 /* support only 4KB block */ > > #define F2FS_MAX_EXTENSION 64 /* # of extension entries */ > > +#define F2FS_BLK_ALIGN(x) (((x) + F2FS_BLKSIZE - 1) / F2FS_BLKSIZE= ) > > =20 > > #define NULL_ADDR ((block_t)0) /* used as block_t addresses */ > > #define NEW_ADDR ((block_t)-1) /* used as block_t addresses */ > > @@ -80,6 +81,7 @@ struct f2fs_super_block { > > /* > > * For checkpoint > > */ > > +#define CP_LARGE_VOL_FLAG 0x00000010 > > #define CP_ERROR_FLAG 0x00000008 > > #define CP_COMPACT_SUM_FLAG 0x00000004 > > #define CP_ORPHAN_PRESENT_FLAG 0x00000002 >=20 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel= " in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html