On 7/22/25 22:36, wangzijie wrote:
> When we need to alloc nat entry and set it dirty, we can directly add it to
> dirty set list(or initialize its list_head for new_ne) instead of adding it
> to clean list and make a move. Introduce init_dirty flag to do it.
>
> Signed-off-by: wangzijie <wangzij...@honor.com>
> ---
> fs/f2fs/node.c | 37 ++++++++++++++++++++++++++++++-------
> 1 file changed, 30 insertions(+), 7 deletions(-)
>
> diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
> index a23db6238..20bcf8559 100644
> --- a/fs/f2fs/node.c
> +++ b/fs/f2fs/node.c
> @@ -185,7 +185,7 @@ static void __free_nat_entry(struct nat_entry *e)
>
> /* must be locked by nat_tree_lock */
> static struct nat_entry *__init_nat_entry(struct f2fs_nm_info *nm_i,
> - struct nat_entry *ne, struct f2fs_nat_entry *raw_ne, bool no_fail)
> + struct nat_entry *ne, struct f2fs_nat_entry *raw_ne, bool no_fail, bool
> init_dirty)
> {
> if (no_fail)
> f2fs_radix_tree_insert(&nm_i->nat_root, nat_get_nid(ne), ne);
> @@ -195,6 +195,11 @@ static struct nat_entry *__init_nat_entry(struct
> f2fs_nm_info *nm_i,
> if (raw_ne)
> node_info_from_raw_nat(&ne->ni, raw_ne);
>
> + if (init_dirty) {
> + nm_i->nat_cnt[TOTAL_NAT]++;
> + return ne;
> + }
> +
> spin_lock(&nm_i->nat_list_lock);
> list_add_tail(&ne->list, &nm_i->nat_entries);
> spin_unlock(&nm_i->nat_list_lock);
> @@ -256,7 +261,7 @@ static struct nat_entry_set *__grab_nat_entry_set(struct
> f2fs_nm_info *nm_i,
> }
>
> static void __set_nat_cache_dirty(struct f2fs_nm_info *nm_i,
> - struct nat_entry *ne)
> + struct nat_entry *ne, bool init_dirty)
> {
> struct nat_entry_set *head;
> bool new_ne = nat_get_blkaddr(ne) == NEW_ADDR;
> @@ -275,6 +280,18 @@ static void __set_nat_cache_dirty(struct f2fs_nm_info
> *nm_i,
>
> set_nat_flag(ne, IS_PREALLOC, new_ne);
>
> + if (init_dirty) {
> + nm_i->nat_cnt[DIRTY_NAT]++;
> + set_nat_flag(ne, IS_DIRTY, true);
> + spin_lock(&nm_i->nat_list_lock);
> + if (new_ne)
> + INIT_LIST_HEAD(&ne->list);
> + else
> + list_add_tail(&ne->list, &head->entry_list);
> + spin_unlock(&nm_i->nat_list_lock);
> + return;
> + }
Nit issue, above blanks should be replaced w/ tab.
Can we clean up like this?
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index de99b42437c6..60fc2c7b8e10 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -280,30 +280,23 @@ static void __set_nat_cache_dirty(struct f2fs_nm_info
*nm_i,
set_nat_flag(ne, IS_PREALLOC, new_ne);
- if (init_dirty) {
- nm_i->nat_cnt[DIRTY_NAT]++;
- set_nat_flag(ne, IS_DIRTY, true);
- spin_lock(&nm_i->nat_list_lock);
- if (new_ne)
- INIT_LIST_HEAD(&ne->list);
- else
- list_add_tail(&ne->list, &head->entry_list);
- spin_unlock(&nm_i->nat_list_lock);
- return;
- }
-
if (get_nat_flag(ne, IS_DIRTY))
goto refresh_list;
nm_i->nat_cnt[DIRTY_NAT]++;
- nm_i->nat_cnt[RECLAIMABLE_NAT]--;
+ if (!init_dirty)
+ nm_i->nat_cnt[RECLAIMABLE_NAT]--;
set_nat_flag(ne, IS_DIRTY, true);
refresh_list:
spin_lock(&nm_i->nat_list_lock);
- if (new_ne)
- list_del_init(&ne->list);
- else
+ if (new_ne) {
+ if (init_dirty)
+ INIT_LIST_HEAD(&ne->list);
+ else
+ list_del_init(&ne->list);
+ } else {
list_move_tail(&ne->list, &head->entry_list);
+ }
spin_unlock(&nm_i->nat_list_lock);
}
Thanks,
> +
> if (get_nat_flag(ne, IS_DIRTY))
> goto refresh_list;
>
> @@ -441,7 +458,7 @@ static void cache_nat_entry(struct f2fs_sb_info *sbi,
> nid_t nid,
> f2fs_down_write(&nm_i->nat_tree_lock);
> e = __lookup_nat_cache(nm_i, nid, false);
> if (!e)
> - e = __init_nat_entry(nm_i, new, ne, false);
> + e = __init_nat_entry(nm_i, new, ne, false, false);
> else
> f2fs_bug_on(sbi, nat_get_ino(e) != le32_to_cpu(ne->ino) ||
> nat_get_blkaddr(e) !=
> @@ -458,11 +475,13 @@ static void set_node_addr(struct f2fs_sb_info *sbi,
> struct node_info *ni,
> struct f2fs_nm_info *nm_i = NM_I(sbi);
> struct nat_entry *e;
> struct nat_entry *new = __alloc_nat_entry(sbi, ni->nid, true);
> + bool init_dirty = false;
>
> f2fs_down_write(&nm_i->nat_tree_lock);
> e = __lookup_nat_cache(nm_i, ni->nid, true);
> if (!e) {
> - e = __init_nat_entry(nm_i, new, NULL, true);
> + init_dirty = true;
> + e = __init_nat_entry(nm_i, new, NULL, true, true);
> copy_node_info(&e->ni, ni);
> f2fs_bug_on(sbi, ni->blk_addr == NEW_ADDR);
> } else if (new_blkaddr == NEW_ADDR) {
> @@ -498,7 +517,7 @@ static void set_node_addr(struct f2fs_sb_info *sbi,
> struct node_info *ni,
> nat_set_blkaddr(e, new_blkaddr);
> if (!__is_valid_data_blkaddr(new_blkaddr))
> set_nat_flag(e, IS_CHECKPOINTED, false);
> - __set_nat_cache_dirty(nm_i, e);
> + __set_nat_cache_dirty(nm_i, e, init_dirty);
>
> /* update fsync_mark if its inode nat entry is still alive */
> if (ni->nid != ni->ino)
> @@ -2924,6 +2943,7 @@ static void remove_nats_in_journal(struct f2fs_sb_info
> *sbi)
> struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
> struct f2fs_journal *journal = curseg->journal;
> int i;
> + bool init_dirty;
>
> down_write(&curseg->journal_rwsem);
> for (i = 0; i < nats_in_cursum(journal); i++) {
> @@ -2934,12 +2954,15 @@ static void remove_nats_in_journal(struct
> f2fs_sb_info *sbi)
> if (f2fs_check_nid_range(sbi, nid))
> continue;
>
> + init_dirty = false;
> +
> raw_ne = nat_in_journal(journal, i);
>
> ne = __lookup_nat_cache(nm_i, nid, true);
> if (!ne) {
> + init_dirty = true;
> ne = __alloc_nat_entry(sbi, nid, true);
> - __init_nat_entry(nm_i, ne, &raw_ne, true);
> + __init_nat_entry(nm_i, ne, &raw_ne, true, true);
> }
>
> /*
> @@ -2954,7 +2977,7 @@ static void remove_nats_in_journal(struct f2fs_sb_info
> *sbi)
> spin_unlock(&nm_i->nid_list_lock);
> }
>
> - __set_nat_cache_dirty(nm_i, ne);
> + __set_nat_cache_dirty(nm_i, ne, init_dirty);
> }
> update_nats_in_cursum(journal, -i);
> up_write(&curseg->journal_rwsem);
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
