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=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 A0F77C433EA for ; Tue, 21 Jul 2020 16:38:46 +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 7004720720; Tue, 21 Jul 2020 16:38:46 +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="NMOwUQ1v"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="XrgUnYSQ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="rwGxFk+k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7004720720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.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-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jxvHx-0005sT-FV; Tue, 21 Jul 2020 16:38:45 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxvHv-0005sG-C9 for linux-f2fs-devel@lists.sourceforge.net; Tue, 21 Jul 2020 16:38:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: 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=+KHfeNKe6AFv+aAuo3skfjBo0H3PYVmgqaR7OZ0DDKE=; b=NMOwUQ1vuM03M2JYPQp7yb+/1L y/KY/CUVTNrtGsj8nKJ4uW1wjRQ7nKNcDHy5IjzXjcuK7SIPeZpeSWCVgTSK9HtdQNQnBWa1rbnN8 8NSBI3YioIQMyIYbXqzQksa3FhbUfcbh/xc9ha26WxMKkEEP0cnBpKdS7pyZXi8usRtI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=+KHfeNKe6AFv+aAuo3skfjBo0H3PYVmgqaR7OZ0DDKE=; b=XrgUnYSQayS9oS2NgHSTKWJyVH wbo2Bm+9c3eX5m26AE1lnE82zrBlxw4Onff+VR++OortLtry/BVfekRsYt5+FFbCT11PtnMAtYwJv 7l0IKgMyS1ANDdlPlOwxwBTgmVyV5xT9n3r46xCF0EaofjoUyTPm+ezd6Uqu3dLsdPaQ=; Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jxvHr-00CK8T-4C for linux-f2fs-devel@lists.sourceforge.net; Tue, 21 Jul 2020 16:38:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1595349519; x=1626885519; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kYRFmVJ6Qw62BzJr0/bag1IAi1YxF5BfhDSlwlLQ1UQ=; b=rwGxFk+ke946c//GFI1iHvLfB18jARUWOCYIwDj8e/HOPMELHjgNQZHN r4mxCkZPPQ3G1RoEFDgOyhSdLJNgatJxQmkhdIPfkLo9LZVmLqNALNKIy cxesv/Tn/PAcm9i563lv2IphuKxV5gWvAMUC00p1H/X/BtmmseGCEF/aw WFI+e9CaJQleRJhXgAyQAOmF9Ag9H6jcI8asHq1wPmvFXjK2/yhIDPoaO q2PVvbqrnahBSqTYncfzNNXbOQjbZy2KzWb9dL0mGBWDvYAt9J/IKvHM8 imrdeqimjdzL1GQ3AJcy7hQ8r5fGQrrBWaRy+x3jol8QgnCmUSXUqLxB2 w==; IronPort-SDR: boASoo8VVUMAHQOdkr77E7Iirmz4GygsFAefmtImRBt0wW2qkEmqJhRXtconYRqT0NVBQNo3nP FaXwxIFVZd487aq/wiHew0b8auRlvJTe0Y9kNmkujPFH3kVrLvtRIXsOLiKhHN/HuepGtSZec/ FSh+Tgczsl/cNrToqDl2DgCgHtUFHbPB43HhaNXjgWxqXzd7hCxxeXnFcPWranzJ6NxW6vd1Eu oELLotbrhWWp7bMrojTso+GzRjWA50TmBnxFDWuwyGs7XaRHR3RQ3cvzhCkOCvFJVPhUH0XN4g vVM= X-IronPort-AV: E=Sophos;i="5.75,379,1589212800"; d="scan'208";a="144300020" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 22 Jul 2020 00:38:24 +0800 IronPort-SDR: IKtDdhdDAyHvMgcxs0iEuNhiuBM7eIDOZ2lsVCEQZVAbHCuYjIxFSkJftesLxsJfG9zGHCdvur J9ldbVO9QESiD7A5ycp3/kEiuIYbVLX28= Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 09:26:40 -0700 IronPort-SDR: bkbHB2ARw7Ef3ZzrzR3HcO+Z/ZRt9wTpF/sIpvT5cLR5SVJMfIwFonX9DPFDdP6ptWmpEggkY4 ahR7YY76gpAQ== WDCIronportException: Internal Received: from aravind-workstation.hgst.com (HELO localhost.localdomain) ([10.64.18.44]) by uls-op-cesaip01.wdc.com with ESMTP; 21 Jul 2020 09:38:21 -0700 From: Aravind Ramesh To: jaegeuk@kernel.org, yuchao0@huawei.com, linux-f2fs-devel@lists.sourceforge.net Date: Tue, 21 Jul 2020 22:08:11 +0530 Message-Id: <20200721163811.18593-2-aravind.ramesh@wdc.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200721163811.18593-1-aravind.ramesh@wdc.com> References: <20200721163811.18593-1-aravind.ramesh@wdc.com> MIME-Version: 1.0 X-Headers-End: 1jxvHr-00CK8T-4C Subject: [f2fs-dev] [PATCH v2 1/1] f2fs-tools: zns zone-capacity support. 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: Aravind Ramesh , matias.bjorling@wdc.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net NVM Express Zoned Namespace (ZNS) devices can have zone-capacity(zc) less than the zone-size. ZNS defines a per zone capacity which can be equal or less than the zone-size. Zone-capacity is the number of usable blocks in the zone. If zone-capacity is less than zone-size, then the segments which start at/after zone-capacity are considered unusable. Only those segments which start before the zone-capacity are considered as usable and added to the free_segment_count and free_segment_bitmap of the kernel. In such cases, the filesystem should not write/read beyond the zone-capacity. Update the super block with the usable number of blocks and free segment count in the ZNS device zones, if zone-capacity is less than zone-size. Set reserved segment count and overprovision ratio based on the usable segments in the zone. Allow fsck to find the free_segment_count based on the zone-capacity and compare with checkpoint values. Signed-off-by: Aravind Ramesh Signed-off-by: Shin'ichiro Kawasaki --- configure.ac | 4 +++ fsck/fsck.c | 5 +-- fsck/fsck.h | 2 ++ fsck/mount.c | 75 +++++++++++++++++++++++++++++++++++++++++++-- include/f2fs_fs.h | 41 ++++++++++++++++++++++--- lib/libf2fs_io.c | 1 + lib/libf2fs_zoned.c | 52 +++++++++++++++++++++++++++++-- mkfs/f2fs_format.c | 25 ++++++++++++--- 8 files changed, 190 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 9ac0c24..e9acd1a 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,10 @@ AC_CONFIG_FILES([ tools/f2fs_io/Makefile ]) +AC_CHECK_MEMBER([struct blk_zone.capacity], + [AC_DEFINE(HAVE_BLK_ZONE_REP_V2, [1], [report zones includes zone capacity])], + [], [[#include ]]) + # export library version info for mkfs/libf2fs_format_la AC_SUBST(FMT_CURRENT, 6) AC_SUBST(FMT_REVISION, 0) diff --git a/fsck/fsck.c b/fsck/fsck.c index e110f3d..ba2340d 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -1905,11 +1905,12 @@ int fsck_chk_meta(struct f2fs_sb_info *sbi) if (IS_NODESEG(se->type)) sit_node_blks += se->valid_blocks; } - if (fsck->chk.sit_free_segs + sit_valid_segs != TOTAL_SEGS(sbi)) { + if (fsck->chk.sit_free_segs + sit_valid_segs != + get_usable_seg_count(sbi)) { ASSERT_MSG("SIT usage does not match: sit_free_segs %u, " "sit_valid_segs %u, total_segs %u", fsck->chk.sit_free_segs, sit_valid_segs, - TOTAL_SEGS(sbi)); + get_usable_seg_count(sbi)); return -EINVAL; } diff --git a/fsck/fsck.h b/fsck/fsck.h index bc6a435..e86730c 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -224,6 +224,8 @@ extern u32 update_nat_bits_flags(struct f2fs_super_block *, struct f2fs_checkpoint *, u32); extern void write_nat_bits(struct f2fs_sb_info *, struct f2fs_super_block *, struct f2fs_checkpoint *, int); +extern unsigned int get_usable_seg_count(struct f2fs_sb_info *); +extern bool is_usable_seg(struct f2fs_sb_info *, unsigned int); /* dump.c */ struct dump_option { diff --git a/fsck/mount.c b/fsck/mount.c index d0f2eab..72ca0cb 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -30,6 +30,76 @@ #define ACL_OTHER (0x20) #endif +static int get_device_idx(struct f2fs_sb_info *sbi, u_int32_t segno) +{ + block_t seg_start_blkaddr; + int i; + + seg_start_blkaddr = SM_I(sbi)->main_blkaddr + + segno * DEFAULT_BLOCKS_PER_SEGMENT; + for (i = 0; i < c.ndevs; i++) + if (c.devices[i].start_blkaddr <= seg_start_blkaddr && + c.devices[i].end_blkaddr > seg_start_blkaddr) + return i; + return 0; +} + +#ifdef HAVE_LINUX_BLKZONED_H + +static int get_zone_idx_from_dev(struct f2fs_sb_info *sbi, + u_int32_t segno, u_int32_t dev_idx) +{ + block_t seg_start_blkaddr = START_BLOCK(sbi, segno); + + return (seg_start_blkaddr - c.devices[dev_idx].start_blkaddr) >> + log_base_2(sbi->segs_per_sec * sbi->blocks_per_seg); +} + +bool is_usable_seg(struct f2fs_sb_info *sbi, unsigned int segno) +{ + unsigned int secno = segno / sbi->segs_per_sec; + block_t seg_start = START_BLOCK(sbi, segno); + block_t blocks_per_sec = sbi->blocks_per_seg * sbi->segs_per_sec; + unsigned int dev_idx = get_device_idx(sbi, segno); + unsigned int zone_idx = get_zone_idx_from_dev(sbi, segno, dev_idx); + unsigned int sec_off = SM_I(sbi)->main_blkaddr >> + log_base_2(blocks_per_sec); + + if (zone_idx < c.devices[dev_idx].nr_rnd_zones) + return true; + + if (c.devices[dev_idx].zoned_model != F2FS_ZONED_HM) + return true; + + return seg_start < ((sec_off + secno) * blocks_per_sec) + + c.devices[dev_idx].zone_cap_blocks[zone_idx]; +} + +unsigned int get_usable_seg_count(struct f2fs_sb_info *sbi) +{ + unsigned int i, usable_seg_count = 0; + + for (i = 0; i < TOTAL_SEGS(sbi); i++) + if (is_usable_seg(sbi, i)) + usable_seg_count++; + + return usable_seg_count; +} + +#else + +bool is_usable_seg(struct f2fs_sb_info *sbi, unsigned int segno) +{ + return true; +} + +unsigned int get_usable_seg_count(struct f2fs_sb_info *sbi) +{ + return TOTAL_SEGS(sbi); +} + +#endif + u32 get_free_segments(struct f2fs_sb_info *sbi) { u32 i, free_segs = 0; @@ -37,7 +107,8 @@ u32 get_free_segments(struct f2fs_sb_info *sbi) for (i = 0; i < TOTAL_SEGS(sbi); i++) { struct seg_entry *se = get_seg_entry(sbi, i); - if (se->valid_blocks == 0x0 && !IS_CUR_SEGNO(sbi, i)) + if (se->valid_blocks == 0x0 && !IS_CUR_SEGNO(sbi, i) && + is_usable_seg(sbi, i)) free_segs++; } return free_segs; @@ -2337,7 +2408,7 @@ void build_sit_area_bitmap(struct f2fs_sb_info *sbi) memcpy(ptr, se->cur_valid_map, SIT_VBLOCK_MAP_SIZE); ptr += SIT_VBLOCK_MAP_SIZE; - if (se->valid_blocks == 0x0) { + if (se->valid_blocks == 0x0 && is_usable_seg(sbi, segno)) { if (le32_to_cpu(sbi->ckpt->cur_node_segno[0]) == segno || le32_to_cpu(sbi->ckpt->cur_data_segno[0]) == segno || le32_to_cpu(sbi->ckpt->cur_node_segno[1]) == segno || diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 709bfd8..3df1e4f 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -332,6 +332,7 @@ struct device_info { u_int32_t nr_zones; u_int32_t nr_rnd_zones; size_t zone_blocks; + size_t *zone_cap_blocks; }; typedef struct { @@ -536,6 +537,7 @@ struct f2fs_configuration { (void) (&_max1 == &_max2); \ _max1 > _max2 ? _max1 : _max2; }) +#define round_up(x, y) (((x) + (y) - 1) / (y)) /* * Copied from fs/f2fs/f2fs.h */ @@ -1324,13 +1326,42 @@ blk_zone_cond_str(struct blk_zone *blkz) return "Unknown-cond"; } -#define blk_zone_empty(z) (blk_zone_cond(z) == BLK_ZONE_COND_EMPTY) +/* + * Handle kernel zone capacity support + */ +#ifndef HAVE_BLK_ZONE_REP_V2 +#define BLK_ZONE_REP_CAPACITY (1 << 0) +struct blk_zone_v2 { + __u64 start; /* Zone start sector */ + __u64 len; /* Zone length in number of sectors */ + __u64 wp; /* Zone write pointer position */ + __u8 type; /* Zone type */ + __u8 cond; /* Zone condition */ + __u8 non_seq; /* Non-sequential write resources active */ + __u8 reset; /* Reset write pointer recommended */ + __u8 resv[4]; + __u64 capacity; /* Zone capacity in number of sectors */ + __u8 reserved[24]; +}; +#define blk_zone blk_zone_v2 +struct blk_zone_report_v2 { + __u64 sector; + __u32 nr_zones; + __u32 flags; +struct blk_zone zones[0]; +}; +#define blk_zone_report blk_zone_report_v2 +#endif /* HAVE_BLK_ZONE_REP_V2 */ + +#define blk_zone_empty(z) (blk_zone_cond(z) == BLK_ZONE_COND_EMPTY) #define blk_zone_sector(z) (z)->start #define blk_zone_length(z) (z)->len #define blk_zone_wp_sector(z) (z)->wp #define blk_zone_need_reset(z) (int)(z)->reset #define blk_zone_non_seq(z) (int)(z)->non_seq +#define blk_zone_capacity(z, f) ((f & BLK_ZONE_REP_CAPACITY) ? \ + (z)->capacity : (z)->len) #endif @@ -1342,6 +1373,7 @@ extern int f2fs_report_zones(int, report_zones_cb_t *, void *); extern int f2fs_check_zones(int); int f2fs_reset_zone(int, void *); extern int f2fs_reset_zones(int); +extern uint32_t f2fs_get_usable_segments(struct f2fs_super_block *sb); #define SIZE_ALIGN(val, size) ((val) + (size) - 1) / (size) #define SEG_ALIGN(blks) SIZE_ALIGN(blks, c.blks_per_seg) @@ -1352,6 +1384,7 @@ static inline double get_best_overprovision(struct f2fs_super_block *sb) { double reserved, ovp, candidate, end, diff, space; double max_ovp = 0, max_space = 0; + u_int32_t usable_main_segs = f2fs_get_usable_segments(sb); if (get_sb(segment_count_main) < 256) { candidate = 10; @@ -1365,9 +1398,9 @@ static inline double get_best_overprovision(struct f2fs_super_block *sb) for (; candidate <= end; candidate += diff) { reserved = (2 * (100 / candidate + 1) + 6) * - get_sb(segs_per_sec); - ovp = (get_sb(segment_count_main) - reserved) * candidate / 100; - space = get_sb(segment_count_main) - reserved - ovp; + round_up(usable_main_segs, get_sb(section_count)); + ovp = (usable_main_segs - reserved) * candidate / 100; + space = usable_main_segs - reserved - ovp; if (max_space < space) { max_space = space; max_ovp = candidate; diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c index 1f597a9..138285d 100644 --- a/lib/libf2fs_io.c +++ b/lib/libf2fs_io.c @@ -784,6 +784,7 @@ int f2fs_finalize_device(void) break; } free(c.devices[i].path); + free(c.devices[i].zone_cap_blocks); } close(c.kd); diff --git a/lib/libf2fs_zoned.c b/lib/libf2fs_zoned.c index efc687c..56c97d1 100644 --- a/lib/libf2fs_zoned.c +++ b/lib/libf2fs_zoned.c @@ -291,6 +291,13 @@ int f2fs_check_zones(int j) return -ENOMEM; } + dev->zone_cap_blocks = malloc(dev->nr_zones * sizeof(size_t)); + if (!dev->zone_cap_blocks) { + ERR_MSG("No memory for zone capacity list.\n"); + return -ENOMEM; + } + memset(dev->zone_cap_blocks, 0, (dev->nr_zones * sizeof(size_t))); + dev->nr_rnd_zones = 0; sector = 0; total_sectors = (dev->total_sectors * c.sector_size) >> 9; @@ -335,10 +342,15 @@ int f2fs_check_zones(int j) blk_zone_cond_str(blkz), blk_zone_sector(blkz), blk_zone_length(blkz)); + dev->zone_cap_blocks[n] = + blk_zone_length(blkz) >> + (F2FS_BLKSIZE_BITS - SECTOR_SHIFT); } else { DBG(2, - "Zone %05u: type 0x%x (%s), cond 0x%x (%s), need_reset %d, " - "non_seq %d, sector %llu, %llu sectors, wp sector %llu\n", + "Zone %05u: type 0x%x (%s), cond 0x%x (%s)," + " need_reset %d, non_seq %d, sector %llu," + " %llu sectors, capacity %llu," + " wp sector %llu\n", n, blk_zone_type(blkz), blk_zone_type_str(blkz), @@ -348,7 +360,11 @@ int f2fs_check_zones(int j) blk_zone_non_seq(blkz), blk_zone_sector(blkz), blk_zone_length(blkz), + blk_zone_capacity(blkz, rep->flags), blk_zone_wp_sector(blkz)); + dev->zone_cap_blocks[n] = + blk_zone_capacity(blkz, rep->flags) >> + (F2FS_BLKSIZE_BITS - SECTOR_SHIFT); } sector = blk_zone_sector(blkz) + blk_zone_length(blkz); @@ -473,6 +489,34 @@ out: return ret; } +uint32_t f2fs_get_usable_segments(struct f2fs_super_block *sb) +{ +#ifdef HAVE_BLK_ZONE_REP_V2 + int i, j; + uint32_t usable_segs = 0, zone_segs; + + for (i = 0; i < c.ndevs; i++) { + if (c.devices[i].zoned_model != F2FS_ZONED_HM) { + usable_segs += c.devices[i].total_segments; + continue; + } + for (j = 0; j < c.devices[i].nr_zones; j++) { + zone_segs = c.devices[i].zone_cap_blocks[j] >> + get_sb(log_blocks_per_seg); + if (c.devices[i].zone_cap_blocks[j] % + DEFAULT_BLOCKS_PER_SEGMENT) + usable_segs += zone_segs + 1; + else + usable_segs += zone_segs; + } + } + usable_segs -= (get_sb(main_blkaddr) - get_sb(segment0_blkaddr)) >> + get_sb(log_blocks_per_seg); + return usable_segs; +#endif + return get_sb(segment_count_main); +} + #else int f2fs_report_zone(int i, u_int64_t UNUSED(sector), void *UNUSED(blkzone)) @@ -527,5 +571,9 @@ int f2fs_reset_zones(int i) return -1; } +uint32_t f2fs_get_usable_segments(struct f2fs_super_block *sb) +{ + return get_sb(segment_count_main); +} #endif diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index 4999cac..9107df4 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -425,13 +425,19 @@ static int f2fs_prepare_super_block(void) set_sb(segment_count_main, get_sb(section_count) * c.segs_per_sec); - /* Let's determine the best reserved and overprovisioned space */ + /* + * Let's determine the best reserved and overprovisioned space. + * For Zoned device, if zone capacity less than zone size, the segments + * starting after the zone capacity are unusable in each zone. So get + * overprovision ratio and reserved seg count based on avg usable + * segs_per_sec. + */ if (c.overprovision == 0) c.overprovision = get_best_overprovision(sb); c.reserved_segments = - (2 * (100 / c.overprovision + 1) + NR_CURSEG_TYPE) - * c.segs_per_sec; + (2 * (100 / c.overprovision + 1) + NR_CURSEG_TYPE) * + round_up(f2fs_get_usable_segments(sb), get_sb(section_count)); if (c.overprovision == 0 || c.total_segments < F2FS_MIN_SEGMENTS || (c.devices[0].total_sectors * @@ -672,19 +678,28 @@ static int f2fs_write_check_point_pack(void) set_cp(valid_block_count, 2 + c.quota_inum + c.quota_dnum + c.lpf_inum + c.lpf_dnum); set_cp(rsvd_segment_count, c.reserved_segments); - set_cp(overprov_segment_count, (get_sb(segment_count_main) - + + /* + * For zoned devices, if zone capacity less than zone size, get + * overprovision segment count based on usable segments in the device. + */ + set_cp(overprov_segment_count, (f2fs_get_usable_segments(sb) - get_cp(rsvd_segment_count)) * c.overprovision / 100); set_cp(overprov_segment_count, get_cp(overprov_segment_count) + get_cp(rsvd_segment_count)); + if (f2fs_get_usable_segments(sb) <= get_cp(overprov_segment_count)) { + MSG(0, "\tError: Not enough segments to create F2FS Volume\n"); + goto free_nat_bits; + } MSG(0, "Info: Overprovision ratio = %.3lf%%\n", c.overprovision); MSG(0, "Info: Overprovision segments = %u (GC reserved = %u)\n", get_cp(overprov_segment_count), c.reserved_segments); /* main segments - reserved segments - (node + data segments) */ - set_cp(free_segment_count, get_sb(segment_count_main) - 6); + set_cp(free_segment_count, f2fs_get_usable_segments(sb) - 6); set_cp(user_block_count, ((get_cp(free_segment_count) + 6 - get_cp(overprov_segment_count)) * c.blks_per_seg)); /* cp page (2), data summaries (1), node summaries (3) */ -- 2.19.1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel