Skip to content

Commit 94c821f

Browse files
chaseyuJaegeuk Kim
chaseyu
authored and
Jaegeuk Kim
committed
f2fs: rebuild nat_bits during umount
If all free_nat_bitmap are available, we can rebuild nat_bits from free_nat_bitmap entirely during umount, let's make another chance to reenable nat_bits for image. Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent a4b6817 commit 94c821f

File tree

3 files changed

+95
-59
lines changed

3 files changed

+95
-59
lines changed

‎fs/f2fs/checkpoint.c

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,12 +1303,20 @@ static void update_ckpt_flags(struct f2fs_sb_info *sbi, struct cp_control *cpc)
13031303
struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
13041304
unsigned long flags;
13051305

1306-
spin_lock_irqsave(&sbi->cp_lock, flags);
1306+
if (cpc->reason & CP_UMOUNT) {
1307+
if (le32_to_cpu(ckpt->cp_pack_total_block_count) >
1308+
sbi->blocks_per_seg - NM_I(sbi)->nat_bits_blocks) {
1309+
clear_ckpt_flags(sbi, CP_NAT_BITS_FLAG);
1310+
f2fs_notice(sbi, "Disable nat_bits due to no space");
1311+
} else if (!is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG) &&
1312+
f2fs_nat_bitmap_enabled(sbi)) {
1313+
f2fs_enable_nat_bits(sbi);
1314+
set_ckpt_flags(sbi, CP_NAT_BITS_FLAG);
1315+
f2fs_notice(sbi, "Rebuild and enable nat_bits");
1316+
}
1317+
}
13071318

1308-
if ((cpc->reason & CP_UMOUNT) &&
1309-
le32_to_cpu(ckpt->cp_pack_total_block_count) >
1310-
sbi->blocks_per_seg - NM_I(sbi)->nat_bits_blocks)
1311-
disable_nat_bits(sbi, false);
1319+
spin_lock_irqsave(&sbi->cp_lock, flags);
13121320

13131321
if (cpc->reason & CP_TRIMMED)
13141322
__set_ckpt_flags(ckpt, CP_TRIMMED_FLAG);
@@ -1494,7 +1502,8 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
14941502
start_blk = __start_cp_next_addr(sbi);
14951503

14961504
/* write nat bits */
1497-
if (enabled_nat_bits(sbi, cpc)) {
1505+
if ((cpc->reason & CP_UMOUNT) &&
1506+
is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG)) {
14981507
__u64 cp_ver = cur_cp_version(ckpt);
14991508
block_t blk;
15001509

‎fs/f2fs/f2fs.h

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2073,36 +2073,6 @@ static inline void clear_ckpt_flags(struct f2fs_sb_info *sbi, unsigned int f)
20732073
spin_unlock_irqrestore(&sbi->cp_lock, flags);
20742074
}
20752075

2076-
static inline void disable_nat_bits(struct f2fs_sb_info *sbi, bool lock)
2077-
{
2078-
unsigned long flags;
2079-
unsigned char *nat_bits;
2080-
2081-
/*
2082-
* In order to re-enable nat_bits we need to call fsck.f2fs by
2083-
* set_sbi_flag(sbi, SBI_NEED_FSCK). But it may give huge cost,
2084-
* so let's rely on regular fsck or unclean shutdown.
2085-
*/
2086-
2087-
if (lock)
2088-
spin_lock_irqsave(&sbi->cp_lock, flags);
2089-
__clear_ckpt_flags(F2FS_CKPT(sbi), CP_NAT_BITS_FLAG);
2090-
nat_bits = NM_I(sbi)->nat_bits;
2091-
NM_I(sbi)->nat_bits = NULL;
2092-
if (lock)
2093-
spin_unlock_irqrestore(&sbi->cp_lock, flags);
2094-
2095-
kvfree(nat_bits);
2096-
}
2097-
2098-
static inline bool enabled_nat_bits(struct f2fs_sb_info *sbi,
2099-
struct cp_control *cpc)
2100-
{
2101-
bool set = is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG);
2102-
2103-
return (cpc) ? (cpc->reason & CP_UMOUNT) && set : set;
2104-
}
2105-
21062076
static inline void f2fs_lock_op(struct f2fs_sb_info *sbi)
21072077
{
21082078
down_read(&sbi->cp_rwsem);
@@ -3429,6 +3399,7 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from);
34293399
int f2fs_truncate_xattr_node(struct inode *inode);
34303400
int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi,
34313401
unsigned int seq_id);
3402+
bool f2fs_nat_bitmap_enabled(struct f2fs_sb_info *sbi);
34323403
int f2fs_remove_inode_page(struct inode *inode);
34333404
struct page *f2fs_new_inode_page(struct inode *inode);
34343405
struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs);
@@ -3453,6 +3424,7 @@ int f2fs_recover_xattr_data(struct inode *inode, struct page *page);
34533424
int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);
34543425
int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,
34553426
unsigned int segno, struct f2fs_summary_block *sum);
3427+
void f2fs_enable_nat_bits(struct f2fs_sb_info *sbi);
34563428
int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);
34573429
int f2fs_build_node_manager(struct f2fs_sb_info *sbi);
34583430
void f2fs_destroy_node_manager(struct f2fs_sb_info *sbi);

‎fs/f2fs/node.c

Lines changed: 78 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2213,6 +2213,24 @@ static void __move_free_nid(struct f2fs_sb_info *sbi, struct free_nid *i,
22132213
}
22142214
}
22152215

2216+
bool f2fs_nat_bitmap_enabled(struct f2fs_sb_info *sbi)
2217+
{
2218+
struct f2fs_nm_info *nm_i = NM_I(sbi);
2219+
unsigned int i;
2220+
bool ret = true;
2221+
2222+
down_read(&nm_i->nat_tree_lock);
2223+
for (i = 0; i < nm_i->nat_blocks; i++) {
2224+
if (!test_bit_le(i, nm_i->nat_block_bitmap)) {
2225+
ret = false;
2226+
break;
2227+
}
2228+
}
2229+
up_read(&nm_i->nat_tree_lock);
2230+
2231+
return ret;
2232+
}
2233+
22162234
static void update_free_nid_bitmap(struct f2fs_sb_info *sbi, nid_t nid,
22172235
bool set, bool build)
22182236
{
@@ -2884,7 +2902,23 @@ static void __adjust_nat_entry_set(struct nat_entry_set *nes,
28842902
list_add_tail(&nes->set_list, head);
28852903
}
28862904

2887-
static void __update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,
2905+
static void __update_nat_bits(struct f2fs_nm_info *nm_i, unsigned int nat_ofs,
2906+
unsigned int valid)
2907+
{
2908+
if (valid == 0) {
2909+
__set_bit_le(nat_ofs, nm_i->empty_nat_bits);
2910+
__clear_bit_le(nat_ofs, nm_i->full_nat_bits);
2911+
return;
2912+
}
2913+
2914+
__clear_bit_le(nat_ofs, nm_i->empty_nat_bits);
2915+
if (valid == NAT_ENTRY_PER_BLOCK)
2916+
__set_bit_le(nat_ofs, nm_i->full_nat_bits);
2917+
else
2918+
__clear_bit_le(nat_ofs, nm_i->full_nat_bits);
2919+
}
2920+
2921+
static void update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,
28882922
struct page *page)
28892923
{
28902924
struct f2fs_nm_info *nm_i = NM_I(sbi);
@@ -2893,7 +2927,7 @@ static void __update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,
28932927
int valid = 0;
28942928
int i = 0;
28952929

2896-
if (!enabled_nat_bits(sbi, NULL))
2930+
if (!is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG))
28972931
return;
28982932

28992933
if (nat_index == 0) {
@@ -2904,17 +2938,36 @@ static void __update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,
29042938
if (le32_to_cpu(nat_blk->entries[i].block_addr) != NULL_ADDR)
29052939
valid++;
29062940
}
2907-
if (valid == 0) {
2908-
__set_bit_le(nat_index, nm_i->empty_nat_bits);
2909-
__clear_bit_le(nat_index, nm_i->full_nat_bits);
2910-
return;
2941+
2942+
__update_nat_bits(nm_i, nat_index, valid);
2943+
}
2944+
2945+
void f2fs_enable_nat_bits(struct f2fs_sb_info *sbi)
2946+
{
2947+
struct f2fs_nm_info *nm_i = NM_I(sbi);
2948+
unsigned int nat_ofs;
2949+
2950+
down_read(&nm_i->nat_tree_lock);
2951+
2952+
for (nat_ofs = 0; nat_ofs < nm_i->nat_blocks; nat_ofs++) {
2953+
unsigned int valid = 0, nid_ofs = 0;
2954+
2955+
/* handle nid zero due to it should never be used */
2956+
if (unlikely(nat_ofs == 0)) {
2957+
valid = 1;
2958+
nid_ofs = 1;
2959+
}
2960+
2961+
for (; nid_ofs < NAT_ENTRY_PER_BLOCK; nid_ofs++) {
2962+
if (!test_bit_le(nid_ofs,
2963+
nm_i->free_nid_bitmap[nat_ofs]))
2964+
valid++;
2965+
}
2966+
2967+
__update_nat_bits(nm_i, nat_ofs, valid);
29112968
}
29122969

2913-
__clear_bit_le(nat_index, nm_i->empty_nat_bits);
2914-
if (valid == NAT_ENTRY_PER_BLOCK)
2915-
__set_bit_le(nat_index, nm_i->full_nat_bits);
2916-
else
2917-
__clear_bit_le(nat_index, nm_i->full_nat_bits);
2970+
up_read(&nm_i->nat_tree_lock);
29182971
}
29192972

29202973
static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,
@@ -2933,7 +2986,7 @@ static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,
29332986
* #1, flush nat entries to journal in current hot data summary block.
29342987
* #2, flush nat entries to nat page.
29352988
*/
2936-
if (enabled_nat_bits(sbi, cpc) ||
2989+
if ((cpc->reason & CP_UMOUNT) ||
29372990
!__has_cursum_space(journal, set->entry_cnt, NAT_JOURNAL))
29382991
to_journal = false;
29392992

@@ -2980,7 +3033,7 @@ static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,
29803033
if (to_journal) {
29813034
up_write(&curseg->journal_rwsem);
29823035
} else {
2983-
__update_nat_bits(sbi, start_nid, page);
3036+
update_nat_bits(sbi, start_nid, page);
29843037
f2fs_put_page(page, 1);
29853038
}
29863039

@@ -3011,7 +3064,7 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)
30113064
* during unmount, let's flush nat_bits before checking
30123065
* nat_cnt[DIRTY_NAT].
30133066
*/
3014-
if (enabled_nat_bits(sbi, cpc)) {
3067+
if (cpc->reason & CP_UMOUNT) {
30153068
down_write(&nm_i->nat_tree_lock);
30163069
remove_nats_in_journal(sbi);
30173070
up_write(&nm_i->nat_tree_lock);
@@ -3027,7 +3080,7 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)
30273080
* entries, remove all entries from journal and merge them
30283081
* into nat entry set.
30293082
*/
3030-
if (enabled_nat_bits(sbi, cpc) ||
3083+
if (cpc->reason & CP_UMOUNT ||
30313084
!__has_cursum_space(journal,
30323085
nm_i->nat_cnt[DIRTY_NAT], NAT_JOURNAL))
30333086
remove_nats_in_journal(sbi);
@@ -3064,15 +3117,18 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)
30643117
__u64 cp_ver = cur_cp_version(ckpt);
30653118
block_t nat_bits_addr;
30663119

3067-
if (!enabled_nat_bits(sbi, NULL))
3068-
return 0;
3069-
30703120
nm_i->nat_bits_blocks = F2FS_BLK_ALIGN((nat_bits_bytes << 1) + 8);
30713121
nm_i->nat_bits = f2fs_kvzalloc(sbi,
30723122
nm_i->nat_bits_blocks << F2FS_BLKSIZE_BITS, GFP_KERNEL);
30733123
if (!nm_i->nat_bits)
30743124
return -ENOMEM;
30753125

3126+
nm_i->full_nat_bits = nm_i->nat_bits + 8;
3127+
nm_i->empty_nat_bits = nm_i->full_nat_bits + nat_bits_bytes;
3128+
3129+
if (!is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG))
3130+
return 0;
3131+
30763132
nat_bits_addr = __start_cp_addr(sbi) + sbi->blocks_per_seg -
30773133
nm_i->nat_bits_blocks;
30783134
for (i = 0; i < nm_i->nat_bits_blocks; i++) {
@@ -3089,13 +3145,12 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)
30893145

30903146
cp_ver |= (cur_cp_crc(ckpt) << 32);
30913147
if (cpu_to_le64(cp_ver) != *(__le64 *)nm_i->nat_bits) {
3092-
disable_nat_bits(sbi, true);
3148+
clear_ckpt_flags(sbi, CP_NAT_BITS_FLAG);
3149+
f2fs_notice(sbi, "Disable nat_bits due to incorrect cp_ver (%llu, %llu)",
3150+
cp_ver, le64_to_cpu(*(__le64 *)nm_i->nat_bits));
30933151
return 0;
30943152
}
30953153

3096-
nm_i->full_nat_bits = nm_i->nat_bits + 8;
3097-
nm_i->empty_nat_bits = nm_i->full_nat_bits + nat_bits_bytes;
3098-
30993154
f2fs_notice(sbi, "Found nat_bits in checkpoint");
31003155
return 0;
31013156
}
@@ -3106,7 +3161,7 @@ static inline void load_free_nid_bitmap(struct f2fs_sb_info *sbi)
31063161
unsigned int i = 0;
31073162
nid_t nid, last_nid;
31083163

3109-
if (!enabled_nat_bits(sbi, NULL))
3164+
if (!is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG))
31103165
return;
31113166

31123167
for (i = 0; i < nm_i->nat_blocks; i++) {

0 commit comments

Comments
 (0)