f2fs: fix concurrent problem for updating free bitmap
A message that is not in the archive (sent off-list or not yet received): CGME20171114072951epcas5p17015caecd08127266436b5ef1bfd1762@epcas5p1.samsung.com
PATCH RESEND 1/1 f2fs: fix concurrent problem for updating free bitmap
alloc_nid_failed and scan_nat_page can be called at the same time, and we haven't protected add_free_nid and update_free_nid_bitmap with the same nid_list_lock. That could lead to
Thread A Thread B
- __build_free_nids
- scan_nat_page
- add_free_nid
- alloc_nid_failed
- update_free_nid_bitmap
- update_free_nid_bitmap
scan_nat_page will clear the free bitmap since the nid is PREALLOC_NID, but alloc_nid_failed needs to set the free bitmap. This results in free nid with free bitmap cleared.
This patch update the bitmap under the same nid_list_lock in add_free_nid.
--- fs/f2fs/node.c | 82 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 40 deletions(-)
fs/f2fs/node.c +42 -40
@@ -1811,8 +1811,33 @@ static void __move_free_nid(struct f2fs_sb_info *sbi, struct free_nid *i, } } +static void update_free_nid_bitmap (struct f2fs_sb_info *sbi,nid_t nid, +bool set,bool build) +{ +struct f2fs_nm_info *nm_i =NM_I (sbi); +unsigned int nat_ofs =NAT_BLOCK_OFFSET (nid); +unsigned int nid_ofs = nid -START_NID (nid); + +if (!test_bit_le (nat_ofs, nm_i->nat_block_bitmap)) +return ; + +if (set) { +if (test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) +return ; +__set_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); + nm_i->free_nid_count[nat_ofs]++; + }else { +if (!test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) +return ; +__clear_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); +if (!build) + nm_i->free_nid_count[nat_ofs]--; + } +} +/* return if the nid is recognized as free */ -static bool add_free_nid (struct f2fs_sb_info *sbi,nid_t nid,bool build) +static bool add_free_nid (struct f2fs_sb_info *sbi, +nid_t nid,bool build,bool update) {struct f2fs_nm_info *nm_i =NM_I (sbi);struct free_nid *i, *e;
@@ -1870,6 +1895,11 @@ static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build) ret = true; err =__insert_free_nid (sbi, i,FREE_NID ); err_out: +if (update) { +update_free_nid_bitmap (sbi, nid, ret, build); +if (!build) + nm_i->available_nids++; + }spin_unlock (&nm_i->nid_list_lock);radix_tree_preload_end (); err:
@@ -1896,30 +1926,6 @@ static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid)kmem_cache_free (free_nid_slab, i); } -static void update_free_nid_bitmap (struct f2fs_sb_info *sbi,nid_t nid, -bool set,bool build) -{ -struct f2fs_nm_info *nm_i =NM_I (sbi); -unsigned int nat_ofs =NAT_BLOCK_OFFSET (nid); -unsigned int nid_ofs = nid -START_NID (nid); - -if (!test_bit_le (nat_ofs, nm_i->nat_block_bitmap)) -return ; - -if (set) { -if (test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) -return ; -__set_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); - nm_i->free_nid_count[nat_ofs]++; - }else { -if (!test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) -return ; -__clear_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); -if (!build) - nm_i->free_nid_count[nat_ofs]--; - } -} -static void scan_nat_page (struct f2fs_sb_info *sbi,struct page *nat_page,nid_t start_nid) {
@@ -1937,18 +1943,18 @@ static void scan_nat_page(struct f2fs_sb_info *sbi, i = start_nid %NAT_ENTRY_PER_BLOCK ;for (; i <NAT_ENTRY_PER_BLOCK ; i++, start_nid++) { -bool freed = false; -if (unlikely (start_nid >= nm_i->max_nid))break ; blk_addr =le32_to_cpu (nat_blk->entries[i].block_addr);f2fs_bug_on (sbi, blk_addr ==NEW_ADDR ); -if (blk_addr ==NULL_ADDR ) - freed =add_free_nid (sbi, start_nid, true); -spin_lock (&NM_I (sbi)->nid_list_lock); -update_free_nid_bitmap (sbi, start_nid, freed, true); -spin_unlock (&NM_I (sbi)->nid_list_lock); +if (blk_addr ==NULL_ADDR ) { +add_free_nid (sbi, start_nid, true, true); + }else { +spin_lock (&NM_I (sbi)->nid_list_lock); +update_free_nid_bitmap (sbi, start_nid, false, true); +spin_unlock (&NM_I (sbi)->nid_list_lock); + } } }
@@ -1974,7 +1980,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi)break ; nid = i *NAT_ENTRY_PER_BLOCK + idx; -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);if (nm_i->nid_cnt[FREE_NID ] >=MAX_FREE_NIDS ) goto out;
@@ -1988,7 +1994,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi) addr =le32_to_cpu (nat_in_journal (journal, i).block_addr); nid =le32_to_cpu (nid_in_journal (journal, i));if (addr ==NULL_ADDR ) -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);else remove_free_nid (sbi, nid); }
@@ -2053,7 +2059,7 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount) addr =le32_to_cpu (nat_in_journal (journal, i).block_addr); nid =le32_to_cpu (nid_in_journal (journal, i));if (addr ==NULL_ADDR ) -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);else remove_free_nid (sbi, nid); }
@@ -2499,11 +2505,7 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,nat_reset_flag (ne);__clear_nat_cache_dirty (NM_I (sbi), set, ne);if (nat_get_blkaddr (ne) ==NULL_ADDR ) { -add_free_nid (sbi, nid, false); -spin_lock (&NM_I (sbi)->nid_list_lock); -NM_I (sbi)->available_nids++; -update_free_nid_bitmap (sbi, nid, true, false); -spin_unlock (&NM_I (sbi)->nid_list_lock); +add_free_nid (sbi, nid, false, true); }else {spin_lock (&NM_I (sbi)->nid_list_lock);update_free_nid_bitmap (sbi, nid, false, false);
Signature · 1 line
2.7.4
Hi,
Review static bool add_free_nid(struct f2fs_sb_info *sbi, · line 1895
Quoted 2 lines
(quoted diff) +0
-0@@ -1870,6 +1895,11 @@ static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)
Need to use radix_tree_preload(GFP_NOFS | __GFP_NOFAIL), otherwise, for out-of-memory case, we may skip bitmap updating.
Thanks,
Quoted 161 lines · LiFan
(quoted diff) +0
-0alloc_nid_failed and scan_nat_page can be called at the same time,and we haven't protected
add_free_nidandupdate_free_nid_bitmapwith the samenid_list_lock. That could lead toThread A Thread B
-__build_free_nids
-scan_nat_page
-add_free_nid
-alloc_nid_failed
-update_free_nid_bitmap
-update_free_nid_bitmap
scan_nat_pagewill clear the free bitmap since the nid isPREALLOC_NID, butalloc_nid_failedneeds to set the free bitmap. This results in free nid with free bitmap cleared.
This patch update the bitmap under the samenid_list_lockinadd_free_nid.Signed-off-by Fan li <[email protected]>--- fs/f2fs/node.c | 82 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 40 deletions(-)fs/f2fs/node.c +41
-35@@ -1811,8 +1811,33 @@ static void __move_free_nid(struct f2fs_sb_info *sbi, struct free_nid *i, } } +static void update_free_nid_bitmap (struct f2fs_sb_info *sbi,nid_t nid, +bool set,bool build) +{ +struct f2fs_nm_info *nm_i =NM_I (sbi); +unsigned int nat_ofs =NAT_BLOCK_OFFSET (nid); +unsigned int nid_ofs = nid -START_NID (nid); + +if (!test_bit_le (nat_ofs, nm_i->nat_block_bitmap)) +return ; + +if (set) { +if (test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) +return ; +__set_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); + nm_i->free_nid_count[nat_ofs]++; + }else { +if (!test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) +return ; +__clear_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); +if (!build) + nm_i->free_nid_count[nat_ofs]--; + } +} +/* return if the nid is recognized as free */ -static bool add_free_nid (struct f2fs_sb_info *sbi,nid_t nid,bool build) +static bool add_free_nid (struct f2fs_sb_info *sbi, +nid_t nid,bool build,bool update) {struct f2fs_nm_info *nm_i =NM_I (sbi);struct free_nid *i, *e;@@ -1870,6 +1895,11 @@ static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build) ret = true; err =__insert_free_nid (sbi, i,FREE_NID ); err_out: +if (update) { +update_free_nid_bitmap (sbi, nid, ret, build); +if (!build) + nm_i->available_nids++; + }spin_unlock (&nm_i->nid_list_lock);radix_tree_preload_end (); err:@@ -1896,30 +1926,6 @@ static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid)kmem_cache_free (free_nid_slab, i); } -static void update_free_nid_bitmap (struct f2fs_sb_info *sbi,nid_t nid, -bool set,bool build) -{ -struct f2fs_nm_info *nm_i =NM_I (sbi); -unsigned int nat_ofs =NAT_BLOCK_OFFSET (nid); -unsigned int nid_ofs = nid -START_NID (nid); - -if (!test_bit_le (nat_ofs, nm_i->nat_block_bitmap)) -return ; - -if (set) { -if (test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) -return ; -__set_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); - nm_i->free_nid_count[nat_ofs]++; - }else { -if (!test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) -return ; -__clear_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); -if (!build) - nm_i->free_nid_count[nat_ofs]--; - } -} -static void scan_nat_page (struct f2fs_sb_info *sbi,struct page *nat_page,nid_t start_nid) {@@ -1937,18 +1943,18 @@ static void scan_nat_page(struct f2fs_sb_info *sbi, i = start_nid %NAT_ENTRY_PER_BLOCK ;for (; i <NAT_ENTRY_PER_BLOCK ; i++, start_nid++) { -bool freed = false; -if (unlikely (start_nid >= nm_i->max_nid))break ; blk_addr =le32_to_cpu (nat_blk->entries[i].block_addr);f2fs_bug_on (sbi, blk_addr ==NEW_ADDR ); -if (blk_addr ==NULL_ADDR ) - freed =add_free_nid (sbi, start_nid, true); -spin_lock (&NM_I (sbi)->nid_list_lock); -update_free_nid_bitmap (sbi, start_nid, freed, true); -spin_unlock (&NM_I (sbi)->nid_list_lock); +if (blk_addr ==NULL_ADDR ) { +add_free_nid (sbi, start_nid, true, true); + }else { +spin_lock (&NM_I (sbi)->nid_list_lock); +update_free_nid_bitmap (sbi, start_nid, false, true); +spin_unlock (&NM_I (sbi)->nid_list_lock); + } } }@@ -1974,7 +1980,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi)break ; nid = i *NAT_ENTRY_PER_BLOCK + idx; -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);if (nm_i->nid_cnt[FREE_NID ] >=MAX_FREE_NIDS ) goto out;@@ -1988,7 +1994,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi) addr =le32_to_cpu (nat_in_journal (journal, i).block_addr); nid =le32_to_cpu (nid_in_journal (journal, i));if (addr ==NULL_ADDR ) -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);else remove_free_nid (sbi, nid); }@@ -2053,7 +2059,7 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount) addr =le32_to_cpu (nat_in_journal (journal, i).block_addr); nid =le32_to_cpu (nid_in_journal (journal, i));if (addr ==NULL_ADDR ) -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);else remove_free_nid (sbi, nid); }@@ -2499,11 +2505,7 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,nat_reset_flag (ne);__clear_nat_cache_dirty (NM_I (sbi), set, ne);
fs/f2fs/node.c static void __flush_nat_entry_set(struct f2fs_sb_info *sbi, · line 2511
Quoted 10 lines
fs/f2fs/node.c +1
-5if (nat_get_blkaddr (ne) ==NULL_ADDR ) { -add_free_nid (sbi, nid, false); -spin_lock (&NM_I (sbi)->nid_list_lock); -NM_I (sbi)->available_nids++; -update_free_nid_bitmap (sbi, nid, true, false); -spin_unlock (&NM_I (sbi)->nid_list_lock); +add_free_nid (sbi, nid, false, true); }else {spin_lock (&NM_I (sbi)->nid_list_lock);update_free_nid_bitmap (sbi, nid, false, false);
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linux-f2fs-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 9 lines
-----Original Message-----
From: Chao Yu [mailto:[email protected]]
Sent: Monday, November 20, 2017 11:00 AM
To: LiFan; 'Chao Yu'; 'Jaegeuk Kim'
Cc: [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH RESEND] f2fs: fix concurrent problem for updating free bitmap
Quoted 10 lines
Hi,
Review static bool add_free_nid(struct f2fs_sb_info · line 1895
Quoted 2 lines
(quoted diff) +0
-0@@ -1870,6 +1895,11 @@ static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)Need to use
radix_tree_preload(GFP_NOFS | __GFP_NOFAIL), otherwise, for out-of-memory case, we may skip bitmap updating.Thanks,
Yes, about this, in previous version, if we fail to read the radix, we will clear the free bitmap in scan_nat_page, But fail to read the radix tree indicates that we know nothing about current nid, so we probably shouldn't change the bitmap, otherwise the status we change into may not be right, so I use current patch to correct that.
But __GFP_NOFAIL may still be useful for __flush_nat_entry_set case where we update the free bitmap Anyway.
Quoted 173 lines · LiFan
Quoted 171 lines
alloc_nid_failedandscan_nat_pagecan be called at the same time, and we haven't protectedadd_free_nidandupdate_free_nid_bitmapwith the samenid_list_lock. That could lead toThread A Thread B
-__build_free_nids
-scan_nat_page
-add_free_nid
-alloc_nid_failed
-update_free_nid_bitmap
-update_free_nid_bitmap
scan_nat_pagewill clear the free bitmap since the nid isPREALLOC_NID, butalloc_nid_failedneeds to set the free bitmap. This results in free nid with free bitmap cleared.
This patch update the bitmap under the samenid_list_lockinadd_free_nid.Signed-off-by Fan li <[email protected]>--- fs/f2fs/node.c | 82 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 40 deletions(-)fs/f2fs/node.c index b965a53..0a217d2 renamed from fs/f2fs/node.c +0
-0100644
fs/f2fs/node.c +31
-24@@ -1811,8 +1811,33 @@ static void __move_free_nid(struct f2fs_sb_info *sbi, struct free_nid *i, } } +static void update_free_nid_bitmap (struct f2fs_sb_info *sbi,nid_t nid, +bool set,bool build) +{ +struct f2fs_nm_info *nm_i =NM_I (sbi); +unsigned int nat_ofs =NAT_BLOCK_OFFSET (nid); +unsigned int nid_ofs = nid -START_NID (nid); + +if (!test_bit_le (nat_ofs, nm_i->nat_block_bitmap)) +return ; + +if (set) { +if (test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) +return ; +__set_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); + nm_i->free_nid_count[nat_ofs]++; + }else { +if (!test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) +return ; +__clear_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); +if (!build) + nm_i->free_nid_count[nat_ofs]--; + } +} + /* return if the nid is recognized as free */ -static booladd_free_nid (struct f2fs_sb_info *sbi,nid_t nid,bool build) +static bool add_free_nid(struct f2fs_sb_info *sbi, + nid_t nid, bool build, bool update) {struct f2fs_nm_info *nm_i =NM_I (sbi);struct free_nid *i, *e;@@ -1870,6 +1895,11 @@ static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build) ret = true; err =__insert_free_nid (sbi, i,FREE_NID ); err_out: +if (update) { +update_free_nid_bitmap (sbi, nid, ret, build); +if (!build) + nm_i->available_nids++; + }spin_unlock (&nm_i->nid_list_lock);radix_tree_preload_end (); err:@@ -1896,30 +1926,6 @@ static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid)kmem_cache_free (free_nid_slab, i); } -static void update_free_nid_bitmap (struct f2fs_sb_info *sbi,nid_t nid, -bool set,bool build) -{ -struct f2fs_nm_info *nm_i =NM_I (sbi); -unsigned int nat_ofs =NAT_BLOCK_OFFSET (nid); -unsigned int nid_ofs = nid -START_NID (nid); - -if (!test_bit_le (nat_ofs, nm_i->nat_block_bitmap)) -return ; - -if (set) { -if (test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) -return ; -__set_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); - nm_i->free_nid_count[nat_ofs]++; - }else { -if (!test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) -return ; -__clear_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); -if (!build) - nm_i->free_nid_count[nat_ofs]--; - } -} -static void scan_nat_page (struct f2fs_sb_info *sbi, struct page *nat_page, nid_t start_nid) { @@ -1937,18 +1943,18 @@ static void scan_nat_page(struct f2fs_sb_info *sbi,fs/f2fs/node.c +11
-15i = start_nid %NAT_ENTRY_PER_BLOCK ;for (; i <NAT_ENTRY_PER_BLOCK ; i++, start_nid++) { -bool freed = false; -if (unlikely (start_nid >= nm_i->max_nid))break ; blk_addr =le32_to_cpu (nat_blk->entries[i].block_addr);f2fs_bug_on (sbi, blk_addr ==NEW_ADDR ); -if (blk_addr ==NULL_ADDR ) - freed =add_free_nid (sbi, start_nid, true); -spin_lock (&NM_I (sbi)->nid_list_lock); -update_free_nid_bitmap (sbi, start_nid, freed, true); -spin_unlock (&NM_I (sbi)->nid_list_lock); +if (blk_addr ==NULL_ADDR ) { +add_free_nid (sbi, start_nid, true, true); + }else { +spin_lock (&NM_I (sbi)->nid_list_lock); +update_free_nid_bitmap (sbi, start_nid, false, true); +spin_unlock (&NM_I (sbi)->nid_list_lock); + } } }@@ -1974,7 +1980,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi)break ; nid = i *NAT_ENTRY_PER_BLOCK + idx; -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);if (nm_i->nid_cnt[FREE_NID ] >=MAX_FREE_NIDS ) goto out;@@ -1988,7 +1994,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi) addr =le32_to_cpu (nat_in_journal (journal, i).block_addr); nid =le32_to_cpu (nid_in_journal (journal, i));if (addr ==NULL_ADDR ) -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);else remove_free_nid (sbi, nid); }@@ -2053,7 +2059,7 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount) addr =le32_to_cpu (nat_in_journal (journal, i).block_addr); nid =le32_to_cpu (nid_in_journal (journal, i));if (addr ==NULL_ADDR ) -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);else remove_free_nid (sbi, nid); }@@ -2499,11 +2505,7 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,nat_reset_flag (ne);__clear_nat_cache_dirty (NM_I (sbi), set, ne);if (nat_get_blkaddr (ne) ==NULL_ADDR ) { -add_free_nid (sbi, nid, false); -spin_lock (&NM_I (sbi)->nid_list_lock); -NM_I (sbi)->available_nids++; -update_free_nid_bitmap (sbi, nid, true, false); -spin_unlock (&NM_I (sbi)->nid_list_lock); +add_free_nid (sbi, nid, false, true); }else {spin_lock (&NM_I (sbi)->nid_list_lock);update_free_nid_bitmap (sbi, nid, false, false);
Chao Yu
maintainerQuoted 16 lines · LiFan
Quoted 16 lines
-----Original Message-----
From: Chao Yu [mailto:[email protected]]
Sent: Monday, November 20, 2017 11:00 AM
To: LiFan; 'Chao Yu'; 'Jaegeuk Kim'
Cc: [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH RESEND] f2fs: fix concurrent problem for updating free bitmapHi,
Review static bool add_free_nid(struct f2fs_sb_info · line 1895
Quoted 2 lines
(quoted diff) +0
-0@@ -1870,6 +1895,11 @@ static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)Need to use
radix_tree_preload(GFP_NOFS | __GFP_NOFAIL), otherwise, for out-of-memory case, we may skip bitmap updating.
Quoted 7 lines
Quoted 3 lines
Thanks,
Yes, about this, in previous version, if we fail to read the radix, we will clear the free bitmap in
scan_nat_page, But fail to read the radix tree indicates that we know nothing about current nid, so we probably shouldn't change the bitmap, otherwise the status we change into may not be right, so I use current patch to correct that.
I don't think we can skip changing the bitmap. In scan_nat_page we will enable in-memory free nid bitmap cache, then, free nid usage in that block will be updated in memory all the time, which means we should also keep its update being correct during initialization, otherwise if we skip changing bitmap due to fail to call radix_tree_preload, we will lose chance to use that free nid until remount.
Thanks,
Quoted 179 lines
But
__GFP_NOFAILmay still be useful for__flush_nat_entry_setcase where we update the free bitmap Anyway.Quoted 173 lines · LiFan
Quoted 171 lines
alloc_nid_failedandscan_nat_pagecan be called at the same time, and we haven't protectedadd_free_nidandupdate_free_nid_bitmapwith the samenid_list_lock. That could lead toThread A Thread B
-__build_free_nids
-scan_nat_page
-add_free_nid
-alloc_nid_failed
-update_free_nid_bitmap
-update_free_nid_bitmap
scan_nat_pagewill clear the free bitmap since the nid isPREALLOC_NID, butalloc_nid_failedneeds to set the free bitmap. This results in free nid with free bitmap cleared.
This patch update the bitmap under the samenid_list_lockinadd_free_nid.Signed-off-by Fan li <[email protected]>--- fs/f2fs/node.c | 82 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 40 deletions(-)fs/f2fs/node.c index b965a53..0a217d2 renamed from fs/f2fs/node.c +0
-0100644
fs/f2fs/node.c +31
-24@@ -1811,8 +1811,33 @@ static void __move_free_nid(struct f2fs_sb_info *sbi, struct free_nid *i, } } +static void update_free_nid_bitmap (struct f2fs_sb_info *sbi,nid_t nid, +bool set,bool build) +{ +struct f2fs_nm_info *nm_i =NM_I (sbi); +unsigned int nat_ofs =NAT_BLOCK_OFFSET (nid); +unsigned int nid_ofs = nid -START_NID (nid); + +if (!test_bit_le (nat_ofs, nm_i->nat_block_bitmap)) +return ; + +if (set) { +if (test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) +return ; +__set_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); + nm_i->free_nid_count[nat_ofs]++; + }else { +if (!test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) +return ; +__clear_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); +if (!build) + nm_i->free_nid_count[nat_ofs]--; + } +} + /* return if the nid is recognized as free */ -static booladd_free_nid (struct f2fs_sb_info *sbi,nid_t nid,bool build) +static bool add_free_nid(struct f2fs_sb_info *sbi, + nid_t nid, bool build, bool update) {struct f2fs_nm_info *nm_i =NM_I (sbi);struct free_nid *i, *e;@@ -1870,6 +1895,11 @@ static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build) ret = true; err =__insert_free_nid (sbi, i,FREE_NID ); err_out: +if (update) { +update_free_nid_bitmap (sbi, nid, ret, build); +if (!build) + nm_i->available_nids++; + }spin_unlock (&nm_i->nid_list_lock);radix_tree_preload_end (); err:@@ -1896,30 +1926,6 @@ static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid)kmem_cache_free (free_nid_slab, i); } -static void update_free_nid_bitmap (struct f2fs_sb_info *sbi,nid_t nid, -bool set,bool build) -{ -struct f2fs_nm_info *nm_i =NM_I (sbi); -unsigned int nat_ofs =NAT_BLOCK_OFFSET (nid); -unsigned int nid_ofs = nid -START_NID (nid); - -if (!test_bit_le (nat_ofs, nm_i->nat_block_bitmap)) -return ; - -if (set) { -if (test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) -return ; -__set_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); - nm_i->free_nid_count[nat_ofs]++; - }else { -if (!test_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs])) -return ; -__clear_bit_le (nid_ofs, nm_i->free_nid_bitmap[nat_ofs]); -if (!build) - nm_i->free_nid_count[nat_ofs]--; - } -} -static void scan_nat_page (struct f2fs_sb_info *sbi, struct page *nat_page, nid_t start_nid) { @@ -1937,18 +1943,18 @@ static void scan_nat_page(struct f2fs_sb_info *sbi,fs/f2fs/node.c +11
-15i = start_nid %NAT_ENTRY_PER_BLOCK ;for (; i <NAT_ENTRY_PER_BLOCK ; i++, start_nid++) { -bool freed = false; -if (unlikely (start_nid >= nm_i->max_nid))break ; blk_addr =le32_to_cpu (nat_blk->entries[i].block_addr);f2fs_bug_on (sbi, blk_addr ==NEW_ADDR ); -if (blk_addr ==NULL_ADDR ) - freed =add_free_nid (sbi, start_nid, true); -spin_lock (&NM_I (sbi)->nid_list_lock); -update_free_nid_bitmap (sbi, start_nid, freed, true); -spin_unlock (&NM_I (sbi)->nid_list_lock); +if (blk_addr ==NULL_ADDR ) { +add_free_nid (sbi, start_nid, true, true); + }else { +spin_lock (&NM_I (sbi)->nid_list_lock); +update_free_nid_bitmap (sbi, start_nid, false, true); +spin_unlock (&NM_I (sbi)->nid_list_lock); + } } }@@ -1974,7 +1980,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi)break ; nid = i *NAT_ENTRY_PER_BLOCK + idx; -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);if (nm_i->nid_cnt[FREE_NID ] >=MAX_FREE_NIDS ) goto out;@@ -1988,7 +1994,7 @@ static void scan_free_nid_bits(struct f2fs_sb_info *sbi) addr =le32_to_cpu (nat_in_journal (journal, i).block_addr); nid =le32_to_cpu (nid_in_journal (journal, i));if (addr ==NULL_ADDR ) -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);else remove_free_nid (sbi, nid); }@@ -2053,7 +2059,7 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount) addr =le32_to_cpu (nat_in_journal (journal, i).block_addr); nid =le32_to_cpu (nid_in_journal (journal, i));if (addr ==NULL_ADDR ) -add_free_nid (sbi, nid, true); +add_free_nid (sbi, nid, true, false);else remove_free_nid (sbi, nid); }@@ -2499,11 +2505,7 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,nat_reset_flag (ne);__clear_nat_cache_dirty (NM_I (sbi), set, ne);if (nat_get_blkaddr (ne) ==NULL_ADDR ) { -add_free_nid (sbi, nid, false); -spin_lock (&NM_I (sbi)->nid_list_lock); -NM_I (sbi)->available_nids++; -update_free_nid_bitmap (sbi, nid, true, false); -spin_unlock (&NM_I (sbi)->nid_list_lock); +add_free_nid (sbi, nid, false, true); }else {spin_lock (&NM_I (sbi)->nid_list_lock);update_free_nid_bitmap (sbi, nid, false, false);