* [PATCH 1/2] mkfs.f2fs: large volume support @ 2014-05-12 6:57 Changman Lee 2014-05-12 6:57 ` [PATCH 2/2] fsck.f2fs: " Changman Lee 2014-05-26 23:38 ` [PATCH 1/2 V3] mkfs.f2fs: " Changman Lee 0 siblings, 2 replies; 7+ messages in thread From: Changman Lee @ 2014-05-12 6:57 UTC (permalink / raw) To: linux-f2fs-devel This patch supports a large volume over about 2.x TB. Becasue F2FS can't contain version bitmap for sit and nat in 4KB checkpoint block when volume size is over 2.x TB. Signed-off-by: Changman Lee <cm224.lee@samsung.com> --- include/f2fs_fs.h | 10 ++++++++ mkfs/f2fs_format.c | 69 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 68 insertions(+), 11 deletions(-) diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 94d8dc3..64dc1e2 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -172,6 +172,7 @@ struct f2fs_configuration { u_int64_t total_sectors; u_int32_t sectors_per_blk; u_int32_t blks_per_seg; + u_int32_t sit_bitmap_blks; char *vol_label; int heap; int32_t fd; @@ -223,6 +224,7 @@ enum { #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) #define NULL_ADDR 0x0U #define NEW_ADDR -1U @@ -284,6 +286,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 @@ -457,6 +460,13 @@ struct f2fs_nat_block { #define SIT_ENTRY_PER_BLOCK (PAGE_CACHE_SIZE / sizeof(struct f2fs_sit_entry)) /* + * F2FS uses 4 bytes to represent block address. As a result, supported size of + * disk is 16 TB and it equals to 16 * 1024 * 1024 / 2 segments. + */ +#define F2FS_MAX_SEGMENT ((16 * 1024 * 1024) / 2) +#define MAX_SIT_BITMAP_SIZE ((F2FS_MAX_SEGMENT / SIT_ENTRY_PER_BLOCK) / 8) + +/* * Note that f2fs_sit_entry->vblocks has the following bit-field information. * [15:10] : allocation type such as CURSEG_XXXX_TYPE * [9:0] : valid block count diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index cef484a..6d7eef8 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -102,7 +102,8 @@ static int f2fs_prepare_super_block(void) u_int32_t blocks_for_sit, blocks_for_nat, blocks_for_ssa; u_int32_t total_valid_blks_available; u_int64_t zone_align_start_offset, diff, total_meta_segments; - u_int32_t sit_bitmap_size, max_nat_bitmap_size, max_nat_segments; + u_int32_t sit_bitmap_size, max_sit_bitmap_size; + u_int32_t max_nat_bitmap_size, max_nat_segments; u_int32_t total_zones; super_block.magic = cpu_to_le32(F2FS_SUPER_MAGIC); @@ -217,8 +218,26 @@ static int f2fs_prepare_super_block(void) */ sit_bitmap_size = ((le32_to_cpu(super_block.segment_count_sit) / 2) << log_blks_per_seg) / 8; - max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1 - - sit_bitmap_size; + + if (sit_bitmap_size > MAX_SIT_BITMAP_SIZE) + max_sit_bitmap_size = MAX_SIT_BITMAP_SIZE; + else + max_sit_bitmap_size = sit_bitmap_size; + + /* + * It should be reserved minimum 1 segment for nat. + * When sit is too large, we should expand cp area. It requires more pages for cp. + */ + if (max_sit_bitmap_size > + (CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 65)) { + max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1; + config.sit_bitmap_blks = F2FS_BLK_ALIGN(max_sit_bitmap_size); + } else { + max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1 - + max_sit_bitmap_size; + config.sit_bitmap_blks = 0; + } + max_nat_segments = (max_nat_bitmap_size * 8) >> log_blks_per_seg; if (le32_to_cpu(super_block.segment_count_nat) > max_nat_segments) @@ -434,6 +453,7 @@ static int f2fs_write_check_point_pack(void) u_int64_t cp_seg_blk_offset = 0; u_int32_t crc = 0; int i; + char *sit_bitmap_buf = NULL; ckp = calloc(F2FS_BLKSIZE, 1); if (ckp == NULL) { @@ -447,6 +467,12 @@ static int f2fs_write_check_point_pack(void) return -1; } + sit_bitmap_buf = calloc(F2FS_BLKSIZE, 1); + if (sit_bitmap_buf == NULL) { + MSG(1, "\tError: Calloc Failed for sit_bitmap_buf!!!\n"); + return -1; + } + /* 1. cp page 1 of checkpoint pack 1 */ ckp->checkpoint_ver = cpu_to_le64(1); ckp->cur_node_segno[0] = @@ -485,9 +511,11 @@ static int f2fs_write_check_point_pack(void) ((le32_to_cpu(ckp->free_segment_count) + 6 - le32_to_cpu(ckp->overprov_segment_count)) * config.blks_per_seg)); - ckp->cp_pack_total_block_count = cpu_to_le32(8); + ckp->cp_pack_total_block_count = cpu_to_le32(8 + config.sit_bitmap_blks); ckp->ckpt_flags = cpu_to_le32(CP_UMOUNT_FLAG); - ckp->cp_pack_start_sum = cpu_to_le32(1); + if (config.sit_bitmap_blks) + ckp->ckpt_flags |= cpu_to_le32(CP_LARGE_VOL_FLAG); + ckp->cp_pack_start_sum = cpu_to_le32(1 + config.sit_bitmap_blks); ckp->valid_node_count = cpu_to_le32(1); ckp->valid_inode_count = cpu_to_le32(1); ckp->next_free_nid = cpu_to_le32( @@ -511,11 +539,20 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset *= blk_size_bytes; DBG(1, "\tWriting main segments, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } + for (i = 0; i < config.sit_bitmap_blks; i++) { + cp_seg_blk_offset += blk_size_bytes; + if (dev_fill(sit_bitmap_buf, cp_seg_blk_offset, blk_size_bytes)) { + MSG(1, "\tError: While zeroing out the sit bitmap area \ + on disk!!!\n"); + return -1; + } + } + /* 2. Prepare and write Segment summary for data blocks */ memset(sum, 0, sizeof(struct f2fs_summary_block)); SET_SUM_TYPE((&sum->footer), SUM_TYPE_DATA); @@ -525,7 +562,7 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting segment summary for data, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); return -1; } @@ -609,7 +646,7 @@ static int f2fs_write_check_point_pack(void) /* 8. cp page2 */ cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting cp page2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } @@ -626,21 +663,31 @@ static int f2fs_write_check_point_pack(void) config.blks_per_seg) * blk_size_bytes; DBG(1, "\tWriting cp page 1 of checkpoint pack 2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } + for (i = 0; i < config.sit_bitmap_blks; i++) { + cp_seg_blk_offset += blk_size_bytes; + if (dev_fill(sit_bitmap_buf, cp_seg_blk_offset, blk_size_bytes)) { + MSG(1, "\tError: While zeroing out the sit bitmap area \ + on disk!!!\n"); + return -1; + } + } + /* 10. cp page 2 of check point pack 2 */ - cp_seg_blk_offset += blk_size_bytes * (le32_to_cpu(ckp->cp_pack_total_block_count) - 1); + cp_seg_blk_offset += blk_size_bytes * (le32_to_cpu(ckp->cp_pack_total_block_count) - config.sit_bitmap_blks - 1); DBG(1, "\tWriting cp page 2 of checkpoint pack 2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } free(sum) ; free(ckp) ; + free(sit_bitmap_buf); return 0; } -- 1.7.9.5 ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] fsck.f2fs: large volume support 2014-05-12 6:57 [PATCH 1/2] mkfs.f2fs: large volume support Changman Lee @ 2014-05-12 6:57 ` Changman Lee 2014-05-19 4:11 ` Changman Lee 2014-05-26 23:38 ` [PATCH 1/2 V3] mkfs.f2fs: " Changman Lee 1 sibling, 1 reply; 7+ messages in thread From: Changman Lee @ 2014-05-12 6:57 UTC (permalink / raw) To: linux-f2fs-devel In the case of volume size is over 2.x TB, checkpoint pack is also expanded over 4KB. It consists of f2fs_checkpoint and nat bitmap in a blocks, and n blocks of sit bitmap. Signed-off-by: Changman Lee <cm224.lee@samsung.com> --- fsck/f2fs.h | 14 +++++++++++--- fsck/mount.c | 30 +++++++++++++++++++++++++++++- lib/libf2fs.c | 4 ++-- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/fsck/f2fs.h b/fsck/f2fs.h index e1740fe..439ab8c 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -203,9 +203,17 @@ static inline unsigned long __bitmap_size(struct f2fs_sb_info *sbi, int flag) static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) { struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); - int offset = (flag == NAT_BITMAP) ? - le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; - return &ckpt->sit_nat_version_bitmap + offset; + int offset; + if (ckpt->ckpt_flags & CP_LARGE_VOL_FLAG) { + if (flag == NAT_BITMAP) + return &ckpt->sit_nat_version_bitmap; + else + return ((char *)ckpt + F2FS_BLKSIZE); + } else { + offset = (flag == NAT_BITMAP) ? + le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; + return &ckpt->sit_nat_version_bitmap + offset; + } } static inline bool is_set_ckpt_flags(struct f2fs_checkpoint *cp, unsigned int f) diff --git a/fsck/mount.c b/fsck/mount.c index e2f3ace..a12a6cf 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -265,6 +265,7 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr, unsigned lo unsigned long long cur_version = 0, pre_version = 0; unsigned int crc = 0; size_t crc_offset; + unsigned int sit_bitmap_blks = 0; /* Read the 1st cp block in this CP pack */ cp_page_1 = malloc(PAGE_SIZE); @@ -284,7 +285,10 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr, unsigned lo /* Read the 2nd cp block in this CP pack */ cp_page_2 = malloc(PAGE_SIZE); + if (cp_block->ckpt_flags & CP_LARGE_VOL_FLAG) + sit_bitmap_blks = F2FS_BLK_ALIGN(cp_block->sit_ver_bitmap_bytesize); cp_addr += le32_to_cpu(cp_block->cp_pack_total_block_count) - 1; + if (dev_read_block(cp_page_2, cp_addr) < 0) goto invalid_cp2; @@ -295,7 +299,7 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr, unsigned lo crc = *(unsigned int *)((unsigned char *)cp_block + crc_offset); if (f2fs_crc_valid(crc, cp_block, crc_offset)) - goto invalid_cp1; + goto invalid_cp2; cur_version = le64_to_cpu(cp_block->checkpoint_ver); @@ -351,6 +355,29 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) memcpy(sbi->ckpt, cur_page, blk_size); + if (sbi->ckpt->ckpt_flags & CP_LARGE_VOL_FLAG) { + int i, cp_blks; + unsigned long long cp_blk_no; + + free(sbi->ckpt); + + cp_blk_no = le32_to_cpu(raw_sb->cp_blkaddr); + if (cur_page == cp2) + cp_blk_no += 1 << le32_to_cpu(raw_sb->log_blocks_per_seg); + + cp_blks = 1 + F2FS_BLK_ALIGN(sbi->ckpt->sit_ver_bitmap_bytesize); + + /* allocate cp size */ + sbi->ckpt = malloc(cp_blks * blk_size); + /* copy first cp data including nat bitmap */ + memcpy(sbi->ckpt, cur_page, blk_size); + /* copy sit bitmap */ + for (i = 1; i < cp_blks; i++) { + unsigned char *ckpt = (unsigned char *)sbi->ckpt; + dev_read_block(cur_page, cp_blk_no + i); + memcpy(ckpt + i * blk_size, cur_page, blk_size); + } + } free(cp1); free(cp2); return 0; @@ -697,6 +724,7 @@ void check_block_count(struct f2fs_sb_info *sbi, int valid_blocks = 0; int i; + /* check segment usage */ ASSERT(GET_SIT_VBLOCKS(raw_sit) <= sbi->blocks_per_seg); diff --git a/lib/libf2fs.c b/lib/libf2fs.c index fb3f8c1..1a16dd2 100644 --- a/lib/libf2fs.c +++ b/lib/libf2fs.c @@ -342,8 +342,8 @@ int f2fs_crc_valid(u_int32_t blk_crc, void *buf, int len) cal_crc = f2fs_cal_crc32(F2FS_SUPER_MAGIC, buf, len); if (cal_crc != blk_crc) { - DBG(0,"CRC validation failed: cal_crc = %u \ - blk_crc = %u buff_size = 0x%x", + DBG(0,"CRC validation failed: cal_crc = %u, " + "blk_crc = %u buff_size = 0x%x\n", cal_crc, blk_crc, len); return -1; } -- 1.7.9.5 ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] fsck.f2fs: large volume support 2014-05-12 6:57 ` [PATCH 2/2] fsck.f2fs: " Changman Lee @ 2014-05-19 4:11 ` Changman Lee 2014-05-26 23:43 ` [PATCH 2/2 V3] " Changman Lee 0 siblings, 1 reply; 7+ messages in thread From: Changman Lee @ 2014-05-19 4:11 UTC (permalink / raw) To: linux-f2fs-devel Changes from V1 o fix orphan_node_blkaddr >From dcd2512e9563991350fa977beb32613e479bd995 Mon Sep 17 00:00:00 2001 From: root <root@f2fs-00.(none)> Date: Mon, 12 May 2014 22:03:46 +0900 Subject: [PATCH] fsck.f2fs: large volume support This patch support large volume over about 3TB. Signed-off-by: root <root@f2fs-00.(none)> --- fsck/f2fs.h | 14 +++++++++++--- fsck/fsck.c | 10 ++++++++-- fsck/mount.c | 30 +++++++++++++++++++++++++++++- lib/libf2fs.c | 4 ++-- 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/fsck/f2fs.h b/fsck/f2fs.h index e1740fe..439ab8c 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -203,9 +203,17 @@ static inline unsigned long __bitmap_size(struct f2fs_sb_info *sbi, int flag) static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) { struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); - int offset = (flag == NAT_BITMAP) ? - le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; - return &ckpt->sit_nat_version_bitmap + offset; + int offset; + if (ckpt->ckpt_flags & CP_LARGE_VOL_FLAG) { + if (flag == NAT_BITMAP) + return &ckpt->sit_nat_version_bitmap; + else + return ((char *)ckpt + F2FS_BLKSIZE); + } else { + offset = (flag == NAT_BITMAP) ? + le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; + return &ckpt->sit_nat_version_bitmap + offset; + } } static inline bool is_set_ckpt_flags(struct f2fs_checkpoint *cp, unsigned int f) diff --git a/fsck/fsck.c b/fsck/fsck.c index 20582c9..6e9109e 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -653,11 +653,17 @@ int fsck_chk_orphan_node(struct f2fs_sb_info *sbi) block_t start_blk, orphan_blkaddr, i, j; struct f2fs_orphan_block *orphan_blk; + struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); - if (!is_set_ckpt_flags(F2FS_CKPT(sbi), CP_ORPHAN_PRESENT_FLAG)) + if (!is_set_ckpt_flags(ckpt, CP_ORPHAN_PRESENT_FLAG)) return 0; - start_blk = __start_cp_addr(sbi) + 1; + if (is_set_ckpt_flags(ckpt, CP_LARGE_VOL_FLAG)) + start_blk = __start_cp_addr(sbi) + + F2FS_BLK_ALIGN(ckpt->sit_ver_bitmap_bytesize); + else + start_blk = __start_cp_addr(sbi) + 1; + orphan_blkaddr = __start_sum_addr(sbi) - 1; orphan_blk = calloc(BLOCK_SZ, 1); diff --git a/fsck/mount.c b/fsck/mount.c index e2f3ace..a12a6cf 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -265,6 +265,7 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr, unsigned lo unsigned long long cur_version = 0, pre_version = 0; unsigned int crc = 0; size_t crc_offset; + unsigned int sit_bitmap_blks = 0; /* Read the 1st cp block in this CP pack */ cp_page_1 = malloc(PAGE_SIZE); @@ -284,7 +285,10 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr, unsigned lo /* Read the 2nd cp block in this CP pack */ cp_page_2 = malloc(PAGE_SIZE); + if (cp_block->ckpt_flags & CP_LARGE_VOL_FLAG) + sit_bitmap_blks = F2FS_BLK_ALIGN(cp_block->sit_ver_bitmap_bytesize); cp_addr += le32_to_cpu(cp_block->cp_pack_total_block_count) - 1; + if (dev_read_block(cp_page_2, cp_addr) < 0) goto invalid_cp2; @@ -295,7 +299,7 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr, unsigned lo crc = *(unsigned int *)((unsigned char *)cp_block + crc_offset); if (f2fs_crc_valid(crc, cp_block, crc_offset)) - goto invalid_cp1; + goto invalid_cp2; cur_version = le64_to_cpu(cp_block->checkpoint_ver); @@ -351,6 +355,29 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) memcpy(sbi->ckpt, cur_page, blk_size); + if (sbi->ckpt->ckpt_flags & CP_LARGE_VOL_FLAG) { + int i, cp_blks; + unsigned long long cp_blk_no; + + free(sbi->ckpt); + + cp_blk_no = le32_to_cpu(raw_sb->cp_blkaddr); + if (cur_page == cp2) + cp_blk_no += 1 << le32_to_cpu(raw_sb->log_blocks_per_seg); + + cp_blks = 1 + F2FS_BLK_ALIGN(sbi->ckpt->sit_ver_bitmap_bytesize); + + /* allocate cp size */ + sbi->ckpt = malloc(cp_blks * blk_size); + /* copy first cp data including nat bitmap */ + memcpy(sbi->ckpt, cur_page, blk_size); + /* copy sit bitmap */ + for (i = 1; i < cp_blks; i++) { + unsigned char *ckpt = (unsigned char *)sbi->ckpt; + dev_read_block(cur_page, cp_blk_no + i); + memcpy(ckpt + i * blk_size, cur_page, blk_size); + } + } free(cp1); free(cp2); return 0; @@ -697,6 +724,7 @@ void check_block_count(struct f2fs_sb_info *sbi, int valid_blocks = 0; int i; + /* check segment usage */ ASSERT(GET_SIT_VBLOCKS(raw_sit) <= sbi->blocks_per_seg); diff --git a/lib/libf2fs.c b/lib/libf2fs.c index fb3f8c1..1a16dd2 100644 --- a/lib/libf2fs.c +++ b/lib/libf2fs.c @@ -342,8 +342,8 @@ int f2fs_crc_valid(u_int32_t blk_crc, void *buf, int len) cal_crc = f2fs_cal_crc32(F2FS_SUPER_MAGIC, buf, len); if (cal_crc != blk_crc) { - DBG(0,"CRC validation failed: cal_crc = %u \ - blk_crc = %u buff_size = 0x%x", + DBG(0,"CRC validation failed: cal_crc = %u, " + "blk_crc = %u buff_size = 0x%x\n", cal_crc, blk_crc, len); return -1; } -- 1.7.10.4 ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2 V3] fsck.f2fs: large volume support 2014-05-19 4:11 ` Changman Lee @ 2014-05-26 23:43 ` Changman Lee 0 siblings, 0 replies; 7+ messages in thread From: Changman Lee @ 2014-05-26 23:43 UTC (permalink / raw) To: linux-f2fs-devel Changes from V2 o remove CP_LARGE_VOL_FLAG instead, use cp_payload in superblock because disk size is determined at format Changes from V1 o fix orphan node blkaddr -- >8 -- >From 405367374f868a8cf29bef62c06bf53271b58f52 Mon Sep 17 00:00:00 2001 From: Changman Lee <cm224.lee@samsung.com> Date: Mon, 12 May 2014 22:03:46 +0900 Subject: [PATCH 2/2] fsck.f2fs: large volume support This patch support large volume over about 3TB. Signed-off-by: Changman Lee <cm224.lee@samsung.com> --- fsck/f2fs.h | 14 +++++++++++--- fsck/fsck.c | 7 +++++-- fsck/mount.c | 22 ++++++++++++++++++++-- lib/libf2fs.c | 4 ++-- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/fsck/f2fs.h b/fsck/f2fs.h index e1740fe..427a733 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -203,9 +203,17 @@ static inline unsigned long __bitmap_size(struct f2fs_sb_info *sbi, int flag) static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) { struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); - int offset = (flag == NAT_BITMAP) ? - le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; - return &ckpt->sit_nat_version_bitmap + offset; + int offset; + if (le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload) > 0) { + if (flag == NAT_BITMAP) + return &ckpt->sit_nat_version_bitmap; + else + return ((char *)ckpt + F2FS_BLKSIZE); + } else { + offset = (flag == NAT_BITMAP) ? + le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; + return &ckpt->sit_nat_version_bitmap + offset; + } } static inline bool is_set_ckpt_flags(struct f2fs_checkpoint *cp, unsigned int f) diff --git a/fsck/fsck.c b/fsck/fsck.c index 20582c9..a1d5dd0 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -653,11 +653,14 @@ int fsck_chk_orphan_node(struct f2fs_sb_info *sbi) block_t start_blk, orphan_blkaddr, i, j; struct f2fs_orphan_block *orphan_blk; + struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); - if (!is_set_ckpt_flags(F2FS_CKPT(sbi), CP_ORPHAN_PRESENT_FLAG)) + if (!is_set_ckpt_flags(ckpt, CP_ORPHAN_PRESENT_FLAG)) return 0; - start_blk = __start_cp_addr(sbi) + 1; + start_blk = __start_cp_addr(sbi) + 1 + + le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload); + orphan_blkaddr = __start_sum_addr(sbi) - 1; orphan_blk = calloc(BLOCK_SZ, 1); diff --git a/fsck/mount.c b/fsck/mount.c index e2f3ace..24ef3bf 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -129,6 +129,7 @@ void print_raw_sb_info(struct f2fs_sb_info *sbi) DISP_u32(sb, root_ino); DISP_u32(sb, node_ino); DISP_u32(sb, meta_ino); + DISP_u32(sb, cp_payload); printf("\n"); } @@ -285,6 +286,7 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr, unsigned lo /* Read the 2nd cp block in this CP pack */ cp_page_2 = malloc(PAGE_SIZE); cp_addr += le32_to_cpu(cp_block->cp_pack_total_block_count) - 1; + if (dev_read_block(cp_page_2, cp_addr) < 0) goto invalid_cp2; @@ -295,7 +297,7 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr, unsigned lo crc = *(unsigned int *)((unsigned char *)cp_block + crc_offset); if (f2fs_crc_valid(crc, cp_block, crc_offset)) - goto invalid_cp1; + goto invalid_cp2; cur_version = le64_to_cpu(cp_block->checkpoint_ver); @@ -319,8 +321,9 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) unsigned long blk_size = sbi->blocksize; unsigned long long cp1_version = 0, cp2_version = 0; unsigned long long cp_start_blk_no; + unsigned int cp_blks = 1 + le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload); - sbi->ckpt = malloc(blk_size); + sbi->ckpt = malloc(cp_blks * blk_size); if (!sbi->ckpt) return -ENOMEM; /* @@ -351,6 +354,20 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) memcpy(sbi->ckpt, cur_page, blk_size); + if (cp_blks > 1) { + int i; + unsigned long long cp_blk_no; + + cp_blk_no = le32_to_cpu(raw_sb->cp_blkaddr); + if (cur_page == cp2) + cp_blk_no += 1 << le32_to_cpu(raw_sb->log_blocks_per_seg); + /* copy sit bitmap */ + for (i = 1; i < cp_blks; i++) { + unsigned char *ckpt = (unsigned char *)sbi->ckpt; + dev_read_block(cur_page, cp_blk_no + i); + memcpy(ckpt + i * blk_size, cur_page, blk_size); + } + } free(cp1); free(cp2); return 0; @@ -697,6 +714,7 @@ void check_block_count(struct f2fs_sb_info *sbi, int valid_blocks = 0; int i; + /* check segment usage */ ASSERT(GET_SIT_VBLOCKS(raw_sit) <= sbi->blocks_per_seg); diff --git a/lib/libf2fs.c b/lib/libf2fs.c index fb3f8c1..1a16dd2 100644 --- a/lib/libf2fs.c +++ b/lib/libf2fs.c @@ -342,8 +342,8 @@ int f2fs_crc_valid(u_int32_t blk_crc, void *buf, int len) cal_crc = f2fs_cal_crc32(F2FS_SUPER_MAGIC, buf, len); if (cal_crc != blk_crc) { - DBG(0,"CRC validation failed: cal_crc = %u \ - blk_crc = %u buff_size = 0x%x", + DBG(0,"CRC validation failed: cal_crc = %u, " + "blk_crc = %u buff_size = 0x%x\n", cal_crc, blk_crc, len); return -1; } -- 1.7.10.4 ------------------------------------------------------------------------------ The best possible search technologies are now affordable for all companies. Download your FREE open source Enterprise Search Engine today! Our experts will assist you in its installation for $59/mo, no commitment. Test it for FREE on our Cloud platform anytime! http://pubads.g.doubleclick.net/gampad/clk?id=145328191&iu=/4140/ostg.clktrk ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 1/2 V3] mkfs.f2fs: large volume support 2014-05-12 6:57 [PATCH 1/2] mkfs.f2fs: large volume support Changman Lee 2014-05-12 6:57 ` [PATCH 2/2] fsck.f2fs: " Changman Lee @ 2014-05-26 23:38 ` Changman Lee 2014-07-10 6:40 ` [PATCH 1/2 V4] " Changman Lee 1 sibling, 1 reply; 7+ messages in thread From: Changman Lee @ 2014-05-26 23:38 UTC (permalink / raw) To: linux-f2fs-devel Changes from V2 o remove CP_LARGE_VOL_LFLAG instead, use cp_payload in superblock because disk size is determined at format Changes from V1 o fix orphan node blkaddr -- >8 -- >From 7e5e66699bb383e4fa7ce970e1cc8e10eb0a5c6f Mon Sep 17 00:00:00 2001 From: root <root@f2fs-00.(none)> Date: Mon, 12 May 2014 22:01:38 +0900 Subject: [PATCH 1/2] mkfs.f2fs: large volume support This patch supports large volume over about 3TB. Signed-off-by: Changman Lee <cm224.lee@samsung.com> --- include/f2fs_fs.h | 9 +++++++ mkfs/f2fs_format.c | 68 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 94d8dc3..3003f7f 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -223,6 +223,7 @@ enum { #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) #define NULL_ADDR 0x0U #define NEW_ADDR -1U @@ -279,6 +280,7 @@ struct f2fs_super_block { __le16 volume_name[512]; /* volume name */ __le32 extension_count; /* # of extensions below */ __u8 extension_list[F2FS_MAX_EXTENSION][8]; /* extension array */ + __le32 cp_payload; } __attribute__((packed)); /* @@ -457,6 +459,13 @@ struct f2fs_nat_block { #define SIT_ENTRY_PER_BLOCK (PAGE_CACHE_SIZE / sizeof(struct f2fs_sit_entry)) /* + * F2FS uses 4 bytes to represent block address. As a result, supported size of + * disk is 16 TB and it equals to 16 * 1024 * 1024 / 2 segments. + */ +#define F2FS_MAX_SEGMENT ((16 * 1024 * 1024) / 2) +#define MAX_SIT_BITMAP_SIZE ((F2FS_MAX_SEGMENT / SIT_ENTRY_PER_BLOCK) / 8) + +/* * Note that f2fs_sit_entry->vblocks has the following bit-field information. * [15:10] : allocation type such as CURSEG_XXXX_TYPE * [9:0] : valid block count diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index cdbf74a..58550a2 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -102,7 +102,8 @@ static int f2fs_prepare_super_block(void) u_int32_t blocks_for_sit, blocks_for_nat, blocks_for_ssa; u_int32_t total_valid_blks_available; u_int64_t zone_align_start_offset, diff, total_meta_segments; - u_int32_t sit_bitmap_size, max_nat_bitmap_size, max_nat_segments; + u_int32_t sit_bitmap_size, max_sit_bitmap_size; + u_int32_t max_nat_bitmap_size, max_nat_segments; u_int32_t total_zones; super_block.magic = cpu_to_le32(F2FS_SUPER_MAGIC); @@ -217,8 +218,25 @@ static int f2fs_prepare_super_block(void) */ sit_bitmap_size = ((le32_to_cpu(super_block.segment_count_sit) / 2) << log_blks_per_seg) / 8; - max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1 - - sit_bitmap_size; + + if (sit_bitmap_size > MAX_SIT_BITMAP_SIZE) + max_sit_bitmap_size = MAX_SIT_BITMAP_SIZE; + else + max_sit_bitmap_size = sit_bitmap_size; + + /* + * It should be reserved minimum 1 segment for nat. + * When sit is too large, we should expand cp area. It requires more pages for cp. + */ + if (max_sit_bitmap_size > + (CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 65)) { + max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1; + super_block.cp_payload = F2FS_BLK_ALIGN(max_sit_bitmap_size); + } else { + max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1 - max_sit_bitmap_size; + super_block.cp_payload = 0; + } + max_nat_segments = (max_nat_bitmap_size * 8) >> log_blks_per_seg; if (le32_to_cpu(super_block.segment_count_nat) > max_nat_segments) @@ -434,6 +452,7 @@ static int f2fs_write_check_point_pack(void) u_int64_t cp_seg_blk_offset = 0; u_int32_t crc = 0; int i; + char *cp_payload = NULL; ckp = calloc(F2FS_BLKSIZE, 1); if (ckp == NULL) { @@ -447,6 +466,12 @@ static int f2fs_write_check_point_pack(void) return -1; } + cp_payload = calloc(F2FS_BLKSIZE, 1); + if (cp_payload == NULL) { + MSG(1, "\tError: Calloc Failed for cp_payload!!!\n"); + return -1; + } + /* 1. cp page 1 of checkpoint pack 1 */ ckp->checkpoint_ver = cpu_to_le64(1); ckp->cur_node_segno[0] = @@ -485,9 +510,11 @@ static int f2fs_write_check_point_pack(void) ((le32_to_cpu(ckp->free_segment_count) + 6 - le32_to_cpu(ckp->overprov_segment_count)) * config.blks_per_seg)); - ckp->cp_pack_total_block_count = cpu_to_le32(8); + ckp->cp_pack_total_block_count = + cpu_to_le32(8 + le32_to_cpu(super_block.cp_payload)); ckp->ckpt_flags = cpu_to_le32(CP_UMOUNT_FLAG); - ckp->cp_pack_start_sum = cpu_to_le32(1); + ckp->cp_pack_start_sum = cpu_to_le32(1 + + le32_to_cpu(super_block.cp_payload)); ckp->valid_node_count = cpu_to_le32(1); ckp->valid_inode_count = cpu_to_le32(1); ckp->next_free_nid = cpu_to_le32(0xc00000); @@ -511,11 +538,20 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset *= blk_size_bytes; DBG(1, "\tWriting main segments, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } + for (i = 0; i < le32_to_cpu(super_block.cp_payload); i++) { + cp_seg_blk_offset += blk_size_bytes; + if (dev_fill(cp_payload, cp_seg_blk_offset, blk_size_bytes)) { + MSG(1, "\tError: While zeroing out the sit bitmap area \ + on disk!!!\n"); + return -1; + } + } + /* 2. Prepare and write Segment summary for data blocks */ memset(sum, 0, sizeof(struct f2fs_summary_block)); SET_SUM_TYPE((&sum->footer), SUM_TYPE_DATA); @@ -525,7 +561,7 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting segment summary for data, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); return -1; } @@ -609,7 +645,7 @@ static int f2fs_write_check_point_pack(void) /* 8. cp page2 */ cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting cp page2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } @@ -626,21 +662,31 @@ static int f2fs_write_check_point_pack(void) config.blks_per_seg) * blk_size_bytes; DBG(1, "\tWriting cp page 1 of checkpoint pack 2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } + for (i = 0; i < le32_to_cpu(super_block.cp_payload); i++) { + cp_seg_blk_offset += blk_size_bytes; + if (dev_fill(cp_payload, cp_seg_blk_offset, blk_size_bytes)) { + MSG(1, "\tError: While zeroing out the sit bitmap area \ + on disk!!!\n"); + return -1; + } + } + /* 10. cp page 2 of check point pack 2 */ - cp_seg_blk_offset += blk_size_bytes * (le32_to_cpu(ckp->cp_pack_total_block_count) - 1); + cp_seg_blk_offset += blk_size_bytes * (le32_to_cpu(ckp->cp_pack_total_block_count) - le32_to_cpu(super_block.cp_payload) - 1); DBG(1, "\tWriting cp page 2 of checkpoint pack 2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } free(sum) ; free(ckp) ; + free(cp_payload); return 0; } -- 1.7.10.4 ------------------------------------------------------------------------------ The best possible search technologies are now affordable for all companies. Download your FREE open source Enterprise Search Engine today! Our experts will assist you in its installation for $59/mo, no commitment. Test it for FREE on our Cloud platform anytime! http://pubads.g.doubleclick.net/gampad/clk?id=145328191&iu=/4140/ostg.clktrk ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2 V4] mkfs.f2fs: large volume support 2014-05-26 23:38 ` [PATCH 1/2 V3] mkfs.f2fs: " Changman Lee @ 2014-07-10 6:40 ` Changman Lee 2014-07-10 23:34 ` Jaegeuk Kim 0 siblings, 1 reply; 7+ messages in thread From: Changman Lee @ 2014-07-10 6:40 UTC (permalink / raw) To: linux-f2fs-devel Hi, Jaegeuk Long time ago, I sent 3 patches for large volume support for mkfs, fsck and kernel. But you've missed one patch of mkfs. So I resend the patch resovled conflict with current git tree. Changes from V3 o remove cp_payload in f2fs_super_block Changes from V2 o remove CP_LARGE_VOL_LFLAG instead, use cp_payload in superblock because disk size is determined at format Changes from V1 o fix orphan node blkaddr Regards, Changman Lee -- >8 -- >From b7d46c6aaf786d28f82c0fe5d116b561c03b4cb2 Mon Sep 17 00:00:00 2001 From: Changman Lee <cm224.lee@samsung.com> Date: Thu, 10 Jul 2014 15:26:04 +0900 Subject: [PATCH] mkfs.f2fs: large volume support This patch supports large volume over about 3TB. Signed-off-by: Changman Lee <cm224.lee@samsung.com> --- include/f2fs_fs.h | 8 ++++++ mkfs/f2fs_format.c | 79 +++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 71 insertions(+), 16 deletions(-) diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 53b8cb9..80ce918 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -221,6 +221,7 @@ enum { #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) #define NULL_ADDR 0x0U #define NEW_ADDR -1U @@ -456,6 +457,13 @@ struct f2fs_nat_block { #define SIT_ENTRY_PER_BLOCK (PAGE_CACHE_SIZE / sizeof(struct f2fs_sit_entry)) /* + * F2FS uses 4 bytes to represent block address. As a result, supported size of + * disk is 16 TB and it equals to 16 * 1024 * 1024 / 2 segments. + */ +#define F2FS_MAX_SEGMENT ((16 * 1024 * 1024) / 2) +#define MAX_SIT_BITMAP_SIZE ((F2FS_MAX_SEGMENT / SIT_ENTRY_PER_BLOCK) / 8) + +/* * Note that f2fs_sit_entry->vblocks has the following bit-field information. * [15:10] : allocation type such as CURSEG_XXXX_TYPE * [9:0] : valid block count diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index 1568545..a62a8fe 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -101,7 +101,8 @@ static int f2fs_prepare_super_block(void) u_int32_t blocks_for_sit, blocks_for_nat, blocks_for_ssa; u_int32_t total_valid_blks_available; u_int64_t zone_align_start_offset, diff, total_meta_segments; - u_int32_t sit_bitmap_size, max_nat_bitmap_size, max_nat_segments; + u_int32_t sit_bitmap_size, max_sit_bitmap_size; + u_int32_t max_nat_bitmap_size, max_nat_segments; u_int32_t total_zones; super_block.magic = cpu_to_le32(F2FS_SUPER_MAGIC); @@ -197,8 +198,26 @@ static int f2fs_prepare_super_block(void) */ sit_bitmap_size = ((le32_to_cpu(super_block.segment_count_sit) / 2) << log_blks_per_seg) / 8; - max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1 - - sit_bitmap_size; + + if (sit_bitmap_size > MAX_SIT_BITMAP_SIZE) + max_sit_bitmap_size = MAX_SIT_BITMAP_SIZE; + else + max_sit_bitmap_size = sit_bitmap_size; + + /* + * It should be reserved minimum 1 segment for nat. + * When sit is too large, we should expand cp area. It requires more pages for cp. + */ + if (max_sit_bitmap_size > + (CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 65)) { + max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1; + super_block.cp_payload = F2FS_BLK_ALIGN(max_sit_bitmap_size); + } else { + max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1 + - max_sit_bitmap_size; + super_block.cp_payload = 0; + } + max_nat_segments = (max_nat_bitmap_size * 8) >> log_blks_per_seg; if (le32_to_cpu(super_block.segment_count_nat) > max_nat_segments) @@ -414,6 +433,7 @@ static int f2fs_write_check_point_pack(void) u_int64_t cp_seg_blk_offset = 0; u_int32_t crc = 0; int i; + char *cp_payload = NULL; ckp = calloc(F2FS_BLKSIZE, 1); if (ckp == NULL) { @@ -427,6 +447,12 @@ static int f2fs_write_check_point_pack(void) return -1; } + cp_payload = calloc(F2FS_BLKSIZE, 1); + if (cp_payload == NULL) { + MSG(1, "\tError: Calloc Failed for cp_payload!!!\n"); + return -1; + } + /* 1. cp page 1 of checkpoint pack 1 */ ckp->checkpoint_ver = cpu_to_le64(1); ckp->cur_node_segno[0] = @@ -465,9 +491,10 @@ static int f2fs_write_check_point_pack(void) ((le32_to_cpu(ckp->free_segment_count) + 6 - le32_to_cpu(ckp->overprov_segment_count)) * config.blks_per_seg)); - ckp->cp_pack_total_block_count = cpu_to_le32(8); + ckp->cp_pack_total_block_count = + cpu_to_le32(8 + le32_to_cpu(super_block.cp_payload)); ckp->ckpt_flags = cpu_to_le32(CP_UMOUNT_FLAG); - ckp->cp_pack_start_sum = cpu_to_le32(1); + ckp->cp_pack_start_sum = cpu_to_le32(1 + le32_to_cpu(super_block.cp_payload)); ckp->valid_node_count = cpu_to_le32(1); ckp->valid_inode_count = cpu_to_le32(1); ckp->next_free_nid = cpu_to_le32( @@ -491,11 +518,20 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset *= blk_size_bytes; DBG(1, "\tWriting main segments, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } + for (i = 0; i < le32_to_cpu(super_block.cp_payload); i++) { + cp_seg_blk_offset += blk_size_bytes; + if (dev_fill(cp_payload, cp_seg_blk_offset, blk_size_bytes)) { + MSG(1, "\tError: While zeroing out the sit bitmap area \ + on disk!!!\n"); + return -1; + } + } + /* 2. Prepare and write Segment summary for data blocks */ memset(sum, 0, sizeof(struct f2fs_summary_block)); SET_SUM_TYPE((&sum->footer), SUM_TYPE_DATA); @@ -505,7 +541,7 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting segment summary for data, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); return -1; } @@ -516,7 +552,7 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting segment summary, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); return -1; } @@ -546,7 +582,7 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting data sit for root, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); return -1; } @@ -560,7 +596,7 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting Segment summary for node blocks, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); return -1; } @@ -571,7 +607,7 @@ static int f2fs_write_check_point_pack(void) cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting Segment summary for data block (1/2), at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); return -1; } @@ -581,7 +617,7 @@ static int f2fs_write_check_point_pack(void) SET_SUM_TYPE((&sum->footer), SUM_TYPE_NODE); cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting Segment summary for data block (2/2), at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); return -1; } @@ -589,7 +625,7 @@ static int f2fs_write_check_point_pack(void) /* 8. cp page2 */ cp_seg_blk_offset += blk_size_bytes; DBG(1, "\tWriting cp page2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } @@ -606,21 +642,32 @@ static int f2fs_write_check_point_pack(void) config.blks_per_seg) * blk_size_bytes; DBG(1, "\tWriting cp page 1 of checkpoint pack 2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } + for (i = 0; i < le32_to_cpu(super_block.cp_payload); i++) { + cp_seg_blk_offset += blk_size_bytes; + if (dev_fill(cp_payload, cp_seg_blk_offset, blk_size_bytes)) { + MSG(1, "\tError: While zeroing out the sit bitmap area \ + on disk!!!\n"); + return -1; + } + } + /* 10. cp page 2 of check point pack 2 */ - cp_seg_blk_offset += blk_size_bytes * (le32_to_cpu(ckp->cp_pack_total_block_count) - 1); + cp_seg_blk_offset += blk_size_bytes * (le32_to_cpu(ckp->cp_pack_total_block_count) + - le32_to_cpu(super_block.cp_payload) - 1); DBG(1, "\tWriting cp page 2 of checkpoint pack 2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { MSG(1, "\tError: While writing the ckp to disk!!!\n"); return -1; } free(sum) ; free(ckp) ; + free(cp_payload); return 0; } -- 1.9.1 ------------------------------------------------------------------------------ Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2 V4] mkfs.f2fs: large volume support 2014-07-10 6:40 ` [PATCH 1/2 V4] " Changman Lee @ 2014-07-10 23:34 ` Jaegeuk Kim 0 siblings, 0 replies; 7+ messages in thread From: Jaegeuk Kim @ 2014-07-10 23:34 UTC (permalink / raw) To: Changman Lee; +Cc: linux-f2fs-devel Thank you for reminding this. Merged. Thanks, On Thu, Jul 10, 2014 at 03:40:18PM +0900, Changman Lee wrote: > Hi, Jaegeuk > > Long time ago, I sent 3 patches for large volume support for mkfs, fsck > and kernel. But you've missed one patch of mkfs. So I resend the patch > resovled conflict with current git tree. > > Changes from V3 > o remove cp_payload in f2fs_super_block > > Changes from V2 > o remove CP_LARGE_VOL_LFLAG instead, use cp_payload in superblock > because disk size is determined at format > > Changes from V1 > o fix orphan node blkaddr > > > Regards, > Changman Lee > > -- >8 -- > > >From b7d46c6aaf786d28f82c0fe5d116b561c03b4cb2 Mon Sep 17 00:00:00 2001 > From: Changman Lee <cm224.lee@samsung.com> > Date: Thu, 10 Jul 2014 15:26:04 +0900 > Subject: [PATCH] mkfs.f2fs: large volume support > > This patch supports large volume over about 3TB. > > Signed-off-by: Changman Lee <cm224.lee@samsung.com> > --- > include/f2fs_fs.h | 8 ++++++ > mkfs/f2fs_format.c | 79 +++++++++++++++++++++++++++++++++++++++++++----------- > 2 files changed, 71 insertions(+), 16 deletions(-) > > diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h > index 53b8cb9..80ce918 100644 > --- a/include/f2fs_fs.h > +++ b/include/f2fs_fs.h > @@ -221,6 +221,7 @@ enum { > #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) > > #define NULL_ADDR 0x0U > #define NEW_ADDR -1U > @@ -456,6 +457,13 @@ struct f2fs_nat_block { > #define SIT_ENTRY_PER_BLOCK (PAGE_CACHE_SIZE / sizeof(struct f2fs_sit_entry)) > > /* > + * F2FS uses 4 bytes to represent block address. As a result, supported size of > + * disk is 16 TB and it equals to 16 * 1024 * 1024 / 2 segments. > + */ > +#define F2FS_MAX_SEGMENT ((16 * 1024 * 1024) / 2) > +#define MAX_SIT_BITMAP_SIZE ((F2FS_MAX_SEGMENT / SIT_ENTRY_PER_BLOCK) / 8) > + > +/* > * Note that f2fs_sit_entry->vblocks has the following bit-field information. > * [15:10] : allocation type such as CURSEG_XXXX_TYPE > * [9:0] : valid block count > diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c > index 1568545..a62a8fe 100644 > --- a/mkfs/f2fs_format.c > +++ b/mkfs/f2fs_format.c > @@ -101,7 +101,8 @@ static int f2fs_prepare_super_block(void) > u_int32_t blocks_for_sit, blocks_for_nat, blocks_for_ssa; > u_int32_t total_valid_blks_available; > u_int64_t zone_align_start_offset, diff, total_meta_segments; > - u_int32_t sit_bitmap_size, max_nat_bitmap_size, max_nat_segments; > + u_int32_t sit_bitmap_size, max_sit_bitmap_size; > + u_int32_t max_nat_bitmap_size, max_nat_segments; > u_int32_t total_zones; > > super_block.magic = cpu_to_le32(F2FS_SUPER_MAGIC); > @@ -197,8 +198,26 @@ static int f2fs_prepare_super_block(void) > */ > sit_bitmap_size = ((le32_to_cpu(super_block.segment_count_sit) / 2) << > log_blks_per_seg) / 8; > - max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1 - > - sit_bitmap_size; > + > + if (sit_bitmap_size > MAX_SIT_BITMAP_SIZE) > + max_sit_bitmap_size = MAX_SIT_BITMAP_SIZE; > + else > + max_sit_bitmap_size = sit_bitmap_size; > + > + /* > + * It should be reserved minimum 1 segment for nat. > + * When sit is too large, we should expand cp area. It requires more pages for cp. > + */ > + if (max_sit_bitmap_size > > + (CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 65)) { > + max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1; > + super_block.cp_payload = F2FS_BLK_ALIGN(max_sit_bitmap_size); > + } else { > + max_nat_bitmap_size = CHECKSUM_OFFSET - sizeof(struct f2fs_checkpoint) + 1 > + - max_sit_bitmap_size; > + super_block.cp_payload = 0; > + } > + > max_nat_segments = (max_nat_bitmap_size * 8) >> log_blks_per_seg; > > if (le32_to_cpu(super_block.segment_count_nat) > max_nat_segments) > @@ -414,6 +433,7 @@ static int f2fs_write_check_point_pack(void) > u_int64_t cp_seg_blk_offset = 0; > u_int32_t crc = 0; > int i; > + char *cp_payload = NULL; > > ckp = calloc(F2FS_BLKSIZE, 1); > if (ckp == NULL) { > @@ -427,6 +447,12 @@ static int f2fs_write_check_point_pack(void) > return -1; > } > > + cp_payload = calloc(F2FS_BLKSIZE, 1); > + if (cp_payload == NULL) { > + MSG(1, "\tError: Calloc Failed for cp_payload!!!\n"); > + return -1; > + } > + > /* 1. cp page 1 of checkpoint pack 1 */ > ckp->checkpoint_ver = cpu_to_le64(1); > ckp->cur_node_segno[0] = > @@ -465,9 +491,10 @@ static int f2fs_write_check_point_pack(void) > ((le32_to_cpu(ckp->free_segment_count) + 6 - > le32_to_cpu(ckp->overprov_segment_count)) * > config.blks_per_seg)); > - ckp->cp_pack_total_block_count = cpu_to_le32(8); > + ckp->cp_pack_total_block_count = > + cpu_to_le32(8 + le32_to_cpu(super_block.cp_payload)); > ckp->ckpt_flags = cpu_to_le32(CP_UMOUNT_FLAG); > - ckp->cp_pack_start_sum = cpu_to_le32(1); > + ckp->cp_pack_start_sum = cpu_to_le32(1 + le32_to_cpu(super_block.cp_payload)); > ckp->valid_node_count = cpu_to_le32(1); > ckp->valid_inode_count = cpu_to_le32(1); > ckp->next_free_nid = cpu_to_le32( > @@ -491,11 +518,20 @@ static int f2fs_write_check_point_pack(void) > cp_seg_blk_offset *= blk_size_bytes; > > DBG(1, "\tWriting main segments, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the ckp to disk!!!\n"); > return -1; > } > > + for (i = 0; i < le32_to_cpu(super_block.cp_payload); i++) { > + cp_seg_blk_offset += blk_size_bytes; > + if (dev_fill(cp_payload, cp_seg_blk_offset, blk_size_bytes)) { > + MSG(1, "\tError: While zeroing out the sit bitmap area \ > + on disk!!!\n"); > + return -1; > + } > + } > + > /* 2. Prepare and write Segment summary for data blocks */ > memset(sum, 0, sizeof(struct f2fs_summary_block)); > SET_SUM_TYPE((&sum->footer), SUM_TYPE_DATA); > @@ -505,7 +541,7 @@ static int f2fs_write_check_point_pack(void) > > cp_seg_blk_offset += blk_size_bytes; > DBG(1, "\tWriting segment summary for data, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); > return -1; > } > @@ -516,7 +552,7 @@ static int f2fs_write_check_point_pack(void) > > cp_seg_blk_offset += blk_size_bytes; > DBG(1, "\tWriting segment summary, ckp at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); > return -1; > } > @@ -546,7 +582,7 @@ static int f2fs_write_check_point_pack(void) > > cp_seg_blk_offset += blk_size_bytes; > DBG(1, "\tWriting data sit for root, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); > return -1; > } > @@ -560,7 +596,7 @@ static int f2fs_write_check_point_pack(void) > > cp_seg_blk_offset += blk_size_bytes; > DBG(1, "\tWriting Segment summary for node blocks, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); > return -1; > } > @@ -571,7 +607,7 @@ static int f2fs_write_check_point_pack(void) > > cp_seg_blk_offset += blk_size_bytes; > DBG(1, "\tWriting Segment summary for data block (1/2), at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); > return -1; > } > @@ -581,7 +617,7 @@ static int f2fs_write_check_point_pack(void) > SET_SUM_TYPE((&sum->footer), SUM_TYPE_NODE); > cp_seg_blk_offset += blk_size_bytes; > DBG(1, "\tWriting Segment summary for data block (2/2), at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(sum, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the sum_blk to disk!!!\n"); > return -1; > } > @@ -589,7 +625,7 @@ static int f2fs_write_check_point_pack(void) > /* 8. cp page2 */ > cp_seg_blk_offset += blk_size_bytes; > DBG(1, "\tWriting cp page2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the ckp to disk!!!\n"); > return -1; > } > @@ -606,21 +642,32 @@ static int f2fs_write_check_point_pack(void) > config.blks_per_seg) * > blk_size_bytes; > DBG(1, "\tWriting cp page 1 of checkpoint pack 2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the ckp to disk!!!\n"); > return -1; > } > > + for (i = 0; i < le32_to_cpu(super_block.cp_payload); i++) { > + cp_seg_blk_offset += blk_size_bytes; > + if (dev_fill(cp_payload, cp_seg_blk_offset, blk_size_bytes)) { > + MSG(1, "\tError: While zeroing out the sit bitmap area \ > + on disk!!!\n"); > + return -1; > + } > + } > + > /* 10. cp page 2 of check point pack 2 */ > - cp_seg_blk_offset += blk_size_bytes * (le32_to_cpu(ckp->cp_pack_total_block_count) - 1); > + cp_seg_blk_offset += blk_size_bytes * (le32_to_cpu(ckp->cp_pack_total_block_count) > + - le32_to_cpu(super_block.cp_payload) - 1); > DBG(1, "\tWriting cp page 2 of checkpoint pack 2, at offset 0x%08"PRIx64"\n", cp_seg_blk_offset); > - if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) { > + if (dev_write(ckp, cp_seg_blk_offset, blk_size_bytes)) { > MSG(1, "\tError: While writing the ckp to disk!!!\n"); > return -1; > } > > free(sum) ; > free(ckp) ; > + free(cp_payload); > return 0; > } > > -- > 1.9.1 > > > ------------------------------------------------------------------------------ > Open source business process management suite built on Java and Eclipse > Turn processes into business applications with Bonita BPM Community Edition > Quickly connect people, data, and systems into organized workflows > Winner of BOSSIE, CODIE, OW2 and Gartner awards > http://p.sf.net/sfu/Bonitasoft > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel -- Jaegeuk Kim ------------------------------------------------------------------------------ Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-07-10 23:35 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-12 6:57 [PATCH 1/2] mkfs.f2fs: large volume support Changman Lee 2014-05-12 6:57 ` [PATCH 2/2] fsck.f2fs: " Changman Lee 2014-05-19 4:11 ` Changman Lee 2014-05-26 23:43 ` [PATCH 2/2 V3] " Changman Lee 2014-05-26 23:38 ` [PATCH 1/2 V3] mkfs.f2fs: " Changman Lee 2014-07-10 6:40 ` [PATCH 1/2 V4] " Changman Lee 2014-07-10 23:34 ` Jaegeuk Kim
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).