* [PATCH v4] f2fs: Separate nat entry mem alloc from nat_tree_locks
@ 2017-11-07 9:36 Yunlei He
0 siblings, 0 replies; only message in thread
From: Yunlei He @ 2017-11-07 9:36 UTC (permalink / raw)
To: jaegeuk, yuchao0, linux-f2fs-devel; +Cc: ning.jia, heyunlei
This path separate nat_entry mem alloc from nat_tree_lock,
which will benefit in some low mem case.
Signed-off-by: Yunlei He <heyunlei@huawei.com>
---
fs/f2fs/node.c | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 38 insertions(+), 17 deletions(-)
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index fef5c68..31909f8 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -257,22 +257,15 @@ static struct nat_entry *grab_nat_entry(struct f2fs_nm_info *nm_i, nid_t nid,
if (no_fail) {
new = f2fs_kmem_cache_alloc(nat_entry_slab, GFP_NOFS);
- f2fs_radix_tree_insert(&nm_i->nat_root, nid, new);
} else {
new = kmem_cache_alloc(nat_entry_slab, GFP_NOFS);
if (!new)
return NULL;
- if (radix_tree_insert(&nm_i->nat_root, nid, new)) {
- kmem_cache_free(nat_entry_slab, new);
- return NULL;
- }
}
memset(new, 0, sizeof(struct nat_entry));
nat_set_nid(new, nid);
nat_reset_flag(new);
- list_add_tail(&new->list, &nm_i->nat_entries);
- nm_i->nat_cnt++;
return new;
}
@@ -282,17 +275,31 @@ static void cache_nat_entry(struct f2fs_sb_info *sbi, nid_t nid,
struct f2fs_nm_info *nm_i = NM_I(sbi);
struct nat_entry *e;
+#ifdef CONFIG_F2FS_CHECK_FS
+ down_read(&nm_i->nat_tree_lock);
e = __lookup_nat_cache(nm_i, nid);
- if (!e) {
- e = grab_nat_entry(nm_i, nid, false);
- if (e)
- node_info_from_raw_nat(&e->ni, ne);
- } else {
+ if (e) {
f2fs_bug_on(sbi, nat_get_ino(e) != le32_to_cpu(ne->ino) ||
- nat_get_blkaddr(e) !=
- le32_to_cpu(ne->block_addr) ||
+ nat_get_blkaddr(e) != le32_to_cpu(ne->block_addr) ||
nat_get_version(e) != ne->version);
+ return;
+ }
+ up_read(&nm_i->nat_tree_lock);
+#endif
+ e = grab_nat_entry(nm_i, nid, false);
+ down_write(&nm_i->nat_tree_lock);
+ if (!e)
+ goto out;
+
+ if (!radix_tree_insert(&nm_i->nat_root, nid, e)) {
+ list_add_tail(&e->list, &nm_i->nat_entries);
+ nm_i->nat_cnt++;
+ node_info_from_raw_nat(&e->ni, ne);
+ } else {
+ kmem_cache_free(nat_entry_slab, e);
}
+out:
+ up_write(&nm_i->nat_tree_lock);
}
static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
@@ -300,11 +307,21 @@ 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 = grab_nat_entry(nm_i, ni->nid, true);
+retry:
down_write(&nm_i->nat_tree_lock);
e = __lookup_nat_cache(nm_i, ni->nid);
if (!e) {
- e = grab_nat_entry(nm_i, ni->nid, true);
+ e = new;
+ if (radix_tree_insert(&nm_i->nat_root, ni->nid, e)) {
+ up_write(&nm_i->nat_tree_lock);
+ cond_resched();
+ goto retry;
+ }
+
+ list_add_tail(&e->list, &nm_i->nat_entries);
+ nm_i->nat_cnt++;
copy_node_info(&e->ni, ni);
f2fs_bug_on(sbi, ni->blk_addr == NEW_ADDR);
} else if (new_blkaddr == NEW_ADDR) {
@@ -315,6 +332,9 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
*/
copy_node_info(&e->ni, ni);
f2fs_bug_on(sbi, ni->blk_addr != NULL_ADDR);
+ kmem_cache_free(nat_entry_slab, new);
+ } else {
+ kmem_cache_free(nat_entry_slab, new);
}
/* sanity check */
@@ -424,9 +444,7 @@ void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni)
f2fs_put_page(page, 1);
cache:
/* cache nat entry */
- down_write(&nm_i->nat_tree_lock);
cache_nat_entry(sbi, nid, &ne);
- up_write(&nm_i->nat_tree_lock);
}
/*
@@ -2375,6 +2393,9 @@ static void remove_nats_in_journal(struct f2fs_sb_info *sbi)
ne = __lookup_nat_cache(nm_i, nid);
if (!ne) {
ne = grab_nat_entry(nm_i, nid, true);
+ f2fs_radix_tree_insert(&nm_i->nat_root, nid, ne);
+ list_add_tail(&ne->list, &nm_i->nat_entries);
+ nm_i->nat_cnt++;
node_info_from_raw_nat(&ne->ni, &raw_ne);
}
--
1.9.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-11-07 9:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-07 9:36 [PATCH v4] f2fs: Separate nat entry mem alloc from nat_tree_locks Yunlei He
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.