From: Andiry Xu <jix024@eng.ucsd.edu> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org Cc: coughlan@redhat.com, miklos@szeredi.hu, Andiry Xu <jix024@cs.ucsd.edu>, david@fromorbit.com, jack@suse.com, swanson@cs.ucsd.edu, swhiteho@redhat.com, andiry.xu@gmail.com Subject: [RFC v2 26/83] Add inode_map to track inuse inodes. Date: Sat, 10 Mar 2018 10:18:07 -0800 [thread overview] Message-ID: <1520705944-6723-27-git-send-email-jix024@eng.ucsd.edu> (raw) In-Reply-To: <1520705944-6723-1-git-send-email-jix024@eng.ucsd.edu> From: Andiry Xu <jix024@cs.ucsd.edu> NOVA uses per-CPU inode map to track inuse inodes. It works in the same way as the allocator, the only difference is that inode map tracks in-use inodes, while free list contains free ranges. NOVA always try to allocate the first available inode number. Signed-off-by: Andiry Xu <jix024@cs.ucsd.edu> --- fs/nova/inode.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/nova/inode.h | 3 + fs/nova/nova.h | 10 +++ fs/nova/super.c | 44 +++++++++++++ fs/nova/super.h | 9 +++ 5 files changed, 256 insertions(+) diff --git a/fs/nova/inode.c b/fs/nova/inode.c index 4e2842d..7c10d0e 100644 --- a/fs/nova/inode.c +++ b/fs/nova/inode.c @@ -29,6 +29,43 @@ unsigned int blk_type_to_shift[NOVA_BLOCK_TYPE_MAX] = {12, 21, 30}; uint32_t blk_type_to_size[NOVA_BLOCK_TYPE_MAX] = {0x1000, 0x200000, 0x40000000}; +int nova_init_inode_inuse_list(struct super_block *sb) +{ + struct nova_sb_info *sbi = NOVA_SB(sb); + struct nova_range_node *range_node; + struct inode_map *inode_map; + unsigned long range_high; + int i; + int ret; + + sbi->s_inodes_used_count = NOVA_NORMAL_INODE_START; + + range_high = NOVA_NORMAL_INODE_START / sbi->cpus; + if (NOVA_NORMAL_INODE_START % sbi->cpus) + range_high++; + + for (i = 0; i < sbi->cpus; i++) { + inode_map = &sbi->inode_maps[i]; + range_node = nova_alloc_inode_node(sb); + if (range_node == NULL) + /* FIXME: free allocated memories */ + return -ENOMEM; + + range_node->range_low = 0; + range_node->range_high = range_high; + ret = nova_insert_inodetree(sbi, range_node, i); + if (ret) { + nova_err(sb, "%s failed\n", __func__); + nova_free_inode_node(sb, range_node); + return ret; + } + inode_map->num_range_node_inode = 1; + inode_map->first_inode_range = range_node; + } + + return 0; +} + static int nova_alloc_inode_table(struct super_block *sb, struct nova_inode_info_header *sih) { @@ -298,3 +335,156 @@ struct inode *nova_iget(struct super_block *sb, unsigned long ino) return ERR_PTR(err); } +inline int nova_insert_inodetree(struct nova_sb_info *sbi, + struct nova_range_node *new_node, int cpu) +{ + struct rb_root *tree; + int ret; + + tree = &sbi->inode_maps[cpu].inode_inuse_tree; + ret = nova_insert_range_node(tree, new_node); + if (ret) + nova_dbg("ERROR: %s failed %d\n", __func__, ret); + + return ret; +} + +static inline int nova_search_inodetree(struct nova_sb_info *sbi, + unsigned long ino, struct nova_range_node **ret_node) +{ + struct rb_root *tree; + unsigned long internal_ino; + int cpu; + + cpu = ino % sbi->cpus; + tree = &sbi->inode_maps[cpu].inode_inuse_tree; + internal_ino = ino / sbi->cpus; + return nova_find_range_node(sbi, tree, internal_ino, ret_node); +} + +int nova_alloc_unused_inode(struct super_block *sb, int cpuid, + unsigned long *ino) +{ + struct nova_sb_info *sbi = NOVA_SB(sb); + struct inode_map *inode_map; + struct nova_range_node *i, *next_i; + struct rb_node *temp, *next; + unsigned long next_range_low; + unsigned long new_ino; + unsigned long MAX_INODE = 1UL << 31; + + inode_map = &sbi->inode_maps[cpuid]; + i = inode_map->first_inode_range; + NOVA_ASSERT(i); + + temp = &i->node; + next = rb_next(temp); + + if (!next) { + next_i = NULL; + next_range_low = MAX_INODE; + } else { + next_i = container_of(next, struct nova_range_node, node); + next_range_low = next_i->range_low; + } + + new_ino = i->range_high + 1; + + if (next_i && new_ino == (next_range_low - 1)) { + /* Fill the gap completely */ + i->range_high = next_i->range_high; + rb_erase(&next_i->node, &inode_map->inode_inuse_tree); + nova_free_inode_node(sb, next_i); + inode_map->num_range_node_inode--; + } else if (new_ino < (next_range_low - 1)) { + /* Aligns to left */ + i->range_high = new_ino; + } else { + nova_dbg("%s: ERROR: new ino %lu, next low %lu\n", __func__, + new_ino, next_range_low); + return -ENOSPC; + } + + *ino = new_ino * sbi->cpus + cpuid; + sbi->s_inodes_used_count++; + inode_map->allocated++; + + nova_dbg_verbose("Alloc ino %lu\n", *ino); + return 0; +} + +int nova_free_inuse_inode(struct super_block *sb, unsigned long ino) +{ + struct nova_sb_info *sbi = NOVA_SB(sb); + struct inode_map *inode_map; + struct nova_range_node *i = NULL; + struct nova_range_node *curr_node; + int found = 0; + int cpuid = ino % sbi->cpus; + unsigned long internal_ino = ino / sbi->cpus; + int ret = 0; + + nova_dbg_verbose("Free inuse ino: %lu\n", ino); + inode_map = &sbi->inode_maps[cpuid]; + + mutex_lock(&inode_map->inode_table_mutex); + found = nova_search_inodetree(sbi, ino, &i); + if (!found) { + nova_dbg("%s ERROR: ino %lu not found\n", __func__, ino); + mutex_unlock(&inode_map->inode_table_mutex); + return -EINVAL; + } + + if ((internal_ino == i->range_low) && (internal_ino == i->range_high)) { + /* fits entire node */ + rb_erase(&i->node, &inode_map->inode_inuse_tree); + nova_free_inode_node(sb, i); + inode_map->num_range_node_inode--; + goto block_found; + } + if ((internal_ino == i->range_low) && (internal_ino < i->range_high)) { + /* Aligns left */ + i->range_low = internal_ino + 1; + goto block_found; + } + if ((internal_ino > i->range_low) && (internal_ino == i->range_high)) { + /* Aligns right */ + i->range_high = internal_ino - 1; + goto block_found; + } + if ((internal_ino > i->range_low) && (internal_ino < i->range_high)) { + /* Aligns somewhere in the middle */ + curr_node = nova_alloc_inode_node(sb); + NOVA_ASSERT(curr_node); + if (curr_node == NULL) { + /* returning without freeing the block */ + goto block_found; + } + curr_node->range_low = internal_ino + 1; + curr_node->range_high = i->range_high; + + i->range_high = internal_ino - 1; + + ret = nova_insert_inodetree(sbi, curr_node, cpuid); + if (ret) { + nova_free_inode_node(sb, curr_node); + goto err; + } + inode_map->num_range_node_inode++; + goto block_found; + } + +err: + nova_error_mng(sb, "Unable to free inode %lu\n", ino); + nova_error_mng(sb, "Found inuse block %lu - %lu\n", + i->range_low, i->range_high); + mutex_unlock(&inode_map->inode_table_mutex); + return ret; + +block_found: + sbi->s_inodes_used_count--; + inode_map->freed++; + mutex_unlock(&inode_map->inode_table_mutex); + return ret; +} + diff --git a/fs/nova/inode.h b/fs/nova/inode.h index a88f0a2..497343d 100644 --- a/fs/nova/inode.h +++ b/fs/nova/inode.h @@ -221,9 +221,12 @@ static inline int nova_persist_inode(struct nova_inode *pi) } +int nova_init_inode_inuse_list(struct super_block *sb); int nova_init_inode_table(struct super_block *sb); int nova_get_inode_address(struct super_block *sb, u64 ino, u64 *pi_addr, int extendable); struct inode *nova_iget(struct super_block *sb, unsigned long ino); +inline int nova_insert_inodetree(struct nova_sb_info *sbi, + struct nova_range_node *new_node, int cpu); #endif diff --git a/fs/nova/nova.h b/fs/nova/nova.h index aa88d9f..bf4b6ac 100644 --- a/fs/nova/nova.h +++ b/fs/nova/nova.h @@ -318,6 +318,16 @@ struct nova_range_node { }; #include "bbuild.h" + +struct inode_map { + struct mutex inode_table_mutex; + struct rb_root inode_inuse_tree; + unsigned long num_range_node_inode; + struct nova_range_node *first_inode_range; + int allocated; + int freed; +}; + #include "balloc.h" static inline unsigned long diff --git a/fs/nova/super.c b/fs/nova/super.c index 32fe29b..9b60873 100644 --- a/fs/nova/super.c +++ b/fs/nova/super.c @@ -378,6 +378,9 @@ static struct nova_inode *nova_init(struct super_block *sb, nova_init_blockmap(sb, 0); + if (nova_init_inode_inuse_list(sb) < 0) + return ERR_PTR(-EINVAL); + if (nova_init_inode_table(sb) < 0) return ERR_PTR(-EINVAL); @@ -420,6 +423,7 @@ static inline void set_default_opts(struct nova_sb_info *sbi) sbi->head_reserved_blocks = HEAD_RESERVED_BLOCKS; sbi->tail_reserved_blocks = TAIL_RESERVED_BLOCKS; sbi->cpus = num_online_cpus(); + sbi->map_id = 0; } static void nova_root_check(struct super_block *sb, struct nova_inode *root_pi) @@ -481,9 +485,11 @@ static int nova_fill_super(struct super_block *sb, void *data, int silent) struct nova_sb_info *sbi = NULL; struct nova_inode *root_pi; struct inode *root_i = NULL; + struct inode_map *inode_map; unsigned long blocksize; u32 random = 0; int retval = -EINVAL; + int i; timing_t mount_time; NOVA_START_TIMING(mount_t, mount_time); @@ -533,6 +539,21 @@ static int nova_fill_super(struct super_block *sb, void *data, int silent) sbi->gid = current_fsgid(); set_opt(sbi->s_mount_opt, HUGEIOREMAP); + sbi->inode_maps = kcalloc(sbi->cpus, sizeof(struct inode_map), + GFP_KERNEL); + if (!sbi->inode_maps) { + retval = -ENOMEM; + nova_dbg("%s: Allocating inode maps failed.", + __func__); + goto out; + } + + for (i = 0; i < sbi->cpus; i++) { + inode_map = &sbi->inode_maps[i]; + mutex_init(&inode_map->inode_table_mutex); + inode_map->inode_inuse_tree = RB_ROOT; + } + mutex_init(&sbi->s_lock); sbi->zeroed_page = kzalloc(PAGE_SIZE, GFP_KERNEL); @@ -625,6 +646,9 @@ static int nova_fill_super(struct super_block *sb, void *data, int silent) nova_delete_free_lists(sb); + kfree(sbi->inode_maps); + sbi->inode_maps = NULL; + kfree(sbi->nova_sb); kfree(sbi); nova_dbg("%s failed: return %d\n", __func__, retval); @@ -706,6 +730,8 @@ static int nova_remount(struct super_block *sb, int *mntflags, char *data) static void nova_put_super(struct super_block *sb) { struct nova_sb_info *sbi = NOVA_SB(sb); + struct inode_map *inode_map; + int i; if (sbi->virt_addr) { /* Save everything before blocknode mapping! */ @@ -718,6 +744,13 @@ static void nova_put_super(struct super_block *sb) kfree(sbi->zeroed_page); nova_dbgmask = 0; + for (i = 0; i < sbi->cpus; i++) { + inode_map = &sbi->inode_maps[i]; + nova_dbgv("CPU %d: inode allocated %d, freed %d\n", + i, inode_map->allocated, inode_map->freed); + } + + kfree(sbi->inode_maps); kfree(sbi->nova_sb); kfree(sbi); sb->s_fs_info = NULL; @@ -728,6 +761,12 @@ inline void nova_free_range_node(struct nova_range_node *node) kmem_cache_free(nova_range_node_cachep, node); } +inline void nova_free_inode_node(struct super_block *sb, + struct nova_range_node *node) +{ + nova_free_range_node(node); +} + inline struct nova_range_node *nova_alloc_range_node(struct super_block *sb) { struct nova_range_node *p; @@ -737,6 +776,11 @@ inline struct nova_range_node *nova_alloc_range_node(struct super_block *sb) return p; } +inline struct nova_range_node *nova_alloc_inode_node(struct super_block *sb) +{ + return nova_alloc_range_node(sb); +} + static struct inode *nova_alloc_inode(struct super_block *sb) { struct nova_inode_info *vi; diff --git a/fs/nova/super.h b/fs/nova/super.h index dcafbd8..9772d2f 100644 --- a/fs/nova/super.h +++ b/fs/nova/super.h @@ -119,6 +119,12 @@ struct nova_sb_info { /* ZEROED page for cache page initialized */ void *zeroed_page; + /* Per-CPU inode map */ + struct inode_map *inode_maps; + + /* Decide new inode map id */ + unsigned long map_id; + /* Per-CPU free block list */ struct free_list *free_lists; unsigned long per_list_blocks; @@ -150,6 +156,9 @@ static inline struct nova_super_block *nova_get_super(struct super_block *sb) extern void nova_error_mng(struct super_block *sb, const char *fmt, ...); extern struct nova_range_node *nova_alloc_range_node(struct super_block *sb); +extern inline struct nova_range_node *nova_alloc_inode_node(struct super_block *sb); extern void nova_free_range_node(struct nova_range_node *node); +extern inline void nova_free_inode_node(struct super_block *sb, + struct nova_range_node *node); #endif -- 2.7.4 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Andiry Xu <jix024@eng.ucsd.edu> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org Cc: dan.j.williams@intel.com, andy.rudoff@intel.com, coughlan@redhat.com, swanson@cs.ucsd.edu, david@fromorbit.com, jack@suse.com, swhiteho@redhat.com, miklos@szeredi.hu, andiry.xu@gmail.com, Andiry Xu <jix024@cs.ucsd.edu> Subject: [RFC v2 26/83] Add inode_map to track inuse inodes. Date: Sat, 10 Mar 2018 10:18:07 -0800 [thread overview] Message-ID: <1520705944-6723-27-git-send-email-jix024@eng.ucsd.edu> (raw) In-Reply-To: <1520705944-6723-1-git-send-email-jix024@eng.ucsd.edu> From: Andiry Xu <jix024@cs.ucsd.edu> NOVA uses per-CPU inode map to track inuse inodes. It works in the same way as the allocator, the only difference is that inode map tracks in-use inodes, while free list contains free ranges. NOVA always try to allocate the first available inode number. Signed-off-by: Andiry Xu <jix024@cs.ucsd.edu> --- fs/nova/inode.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/nova/inode.h | 3 + fs/nova/nova.h | 10 +++ fs/nova/super.c | 44 +++++++++++++ fs/nova/super.h | 9 +++ 5 files changed, 256 insertions(+) diff --git a/fs/nova/inode.c b/fs/nova/inode.c index 4e2842d..7c10d0e 100644 --- a/fs/nova/inode.c +++ b/fs/nova/inode.c @@ -29,6 +29,43 @@ unsigned int blk_type_to_shift[NOVA_BLOCK_TYPE_MAX] = {12, 21, 30}; uint32_t blk_type_to_size[NOVA_BLOCK_TYPE_MAX] = {0x1000, 0x200000, 0x40000000}; +int nova_init_inode_inuse_list(struct super_block *sb) +{ + struct nova_sb_info *sbi = NOVA_SB(sb); + struct nova_range_node *range_node; + struct inode_map *inode_map; + unsigned long range_high; + int i; + int ret; + + sbi->s_inodes_used_count = NOVA_NORMAL_INODE_START; + + range_high = NOVA_NORMAL_INODE_START / sbi->cpus; + if (NOVA_NORMAL_INODE_START % sbi->cpus) + range_high++; + + for (i = 0; i < sbi->cpus; i++) { + inode_map = &sbi->inode_maps[i]; + range_node = nova_alloc_inode_node(sb); + if (range_node == NULL) + /* FIXME: free allocated memories */ + return -ENOMEM; + + range_node->range_low = 0; + range_node->range_high = range_high; + ret = nova_insert_inodetree(sbi, range_node, i); + if (ret) { + nova_err(sb, "%s failed\n", __func__); + nova_free_inode_node(sb, range_node); + return ret; + } + inode_map->num_range_node_inode = 1; + inode_map->first_inode_range = range_node; + } + + return 0; +} + static int nova_alloc_inode_table(struct super_block *sb, struct nova_inode_info_header *sih) { @@ -298,3 +335,156 @@ struct inode *nova_iget(struct super_block *sb, unsigned long ino) return ERR_PTR(err); } +inline int nova_insert_inodetree(struct nova_sb_info *sbi, + struct nova_range_node *new_node, int cpu) +{ + struct rb_root *tree; + int ret; + + tree = &sbi->inode_maps[cpu].inode_inuse_tree; + ret = nova_insert_range_node(tree, new_node); + if (ret) + nova_dbg("ERROR: %s failed %d\n", __func__, ret); + + return ret; +} + +static inline int nova_search_inodetree(struct nova_sb_info *sbi, + unsigned long ino, struct nova_range_node **ret_node) +{ + struct rb_root *tree; + unsigned long internal_ino; + int cpu; + + cpu = ino % sbi->cpus; + tree = &sbi->inode_maps[cpu].inode_inuse_tree; + internal_ino = ino / sbi->cpus; + return nova_find_range_node(sbi, tree, internal_ino, ret_node); +} + +int nova_alloc_unused_inode(struct super_block *sb, int cpuid, + unsigned long *ino) +{ + struct nova_sb_info *sbi = NOVA_SB(sb); + struct inode_map *inode_map; + struct nova_range_node *i, *next_i; + struct rb_node *temp, *next; + unsigned long next_range_low; + unsigned long new_ino; + unsigned long MAX_INODE = 1UL << 31; + + inode_map = &sbi->inode_maps[cpuid]; + i = inode_map->first_inode_range; + NOVA_ASSERT(i); + + temp = &i->node; + next = rb_next(temp); + + if (!next) { + next_i = NULL; + next_range_low = MAX_INODE; + } else { + next_i = container_of(next, struct nova_range_node, node); + next_range_low = next_i->range_low; + } + + new_ino = i->range_high + 1; + + if (next_i && new_ino == (next_range_low - 1)) { + /* Fill the gap completely */ + i->range_high = next_i->range_high; + rb_erase(&next_i->node, &inode_map->inode_inuse_tree); + nova_free_inode_node(sb, next_i); + inode_map->num_range_node_inode--; + } else if (new_ino < (next_range_low - 1)) { + /* Aligns to left */ + i->range_high = new_ino; + } else { + nova_dbg("%s: ERROR: new ino %lu, next low %lu\n", __func__, + new_ino, next_range_low); + return -ENOSPC; + } + + *ino = new_ino * sbi->cpus + cpuid; + sbi->s_inodes_used_count++; + inode_map->allocated++; + + nova_dbg_verbose("Alloc ino %lu\n", *ino); + return 0; +} + +int nova_free_inuse_inode(struct super_block *sb, unsigned long ino) +{ + struct nova_sb_info *sbi = NOVA_SB(sb); + struct inode_map *inode_map; + struct nova_range_node *i = NULL; + struct nova_range_node *curr_node; + int found = 0; + int cpuid = ino % sbi->cpus; + unsigned long internal_ino = ino / sbi->cpus; + int ret = 0; + + nova_dbg_verbose("Free inuse ino: %lu\n", ino); + inode_map = &sbi->inode_maps[cpuid]; + + mutex_lock(&inode_map->inode_table_mutex); + found = nova_search_inodetree(sbi, ino, &i); + if (!found) { + nova_dbg("%s ERROR: ino %lu not found\n", __func__, ino); + mutex_unlock(&inode_map->inode_table_mutex); + return -EINVAL; + } + + if ((internal_ino == i->range_low) && (internal_ino == i->range_high)) { + /* fits entire node */ + rb_erase(&i->node, &inode_map->inode_inuse_tree); + nova_free_inode_node(sb, i); + inode_map->num_range_node_inode--; + goto block_found; + } + if ((internal_ino == i->range_low) && (internal_ino < i->range_high)) { + /* Aligns left */ + i->range_low = internal_ino + 1; + goto block_found; + } + if ((internal_ino > i->range_low) && (internal_ino == i->range_high)) { + /* Aligns right */ + i->range_high = internal_ino - 1; + goto block_found; + } + if ((internal_ino > i->range_low) && (internal_ino < i->range_high)) { + /* Aligns somewhere in the middle */ + curr_node = nova_alloc_inode_node(sb); + NOVA_ASSERT(curr_node); + if (curr_node == NULL) { + /* returning without freeing the block */ + goto block_found; + } + curr_node->range_low = internal_ino + 1; + curr_node->range_high = i->range_high; + + i->range_high = internal_ino - 1; + + ret = nova_insert_inodetree(sbi, curr_node, cpuid); + if (ret) { + nova_free_inode_node(sb, curr_node); + goto err; + } + inode_map->num_range_node_inode++; + goto block_found; + } + +err: + nova_error_mng(sb, "Unable to free inode %lu\n", ino); + nova_error_mng(sb, "Found inuse block %lu - %lu\n", + i->range_low, i->range_high); + mutex_unlock(&inode_map->inode_table_mutex); + return ret; + +block_found: + sbi->s_inodes_used_count--; + inode_map->freed++; + mutex_unlock(&inode_map->inode_table_mutex); + return ret; +} + diff --git a/fs/nova/inode.h b/fs/nova/inode.h index a88f0a2..497343d 100644 --- a/fs/nova/inode.h +++ b/fs/nova/inode.h @@ -221,9 +221,12 @@ static inline int nova_persist_inode(struct nova_inode *pi) } +int nova_init_inode_inuse_list(struct super_block *sb); int nova_init_inode_table(struct super_block *sb); int nova_get_inode_address(struct super_block *sb, u64 ino, u64 *pi_addr, int extendable); struct inode *nova_iget(struct super_block *sb, unsigned long ino); +inline int nova_insert_inodetree(struct nova_sb_info *sbi, + struct nova_range_node *new_node, int cpu); #endif diff --git a/fs/nova/nova.h b/fs/nova/nova.h index aa88d9f..bf4b6ac 100644 --- a/fs/nova/nova.h +++ b/fs/nova/nova.h @@ -318,6 +318,16 @@ struct nova_range_node { }; #include "bbuild.h" + +struct inode_map { + struct mutex inode_table_mutex; + struct rb_root inode_inuse_tree; + unsigned long num_range_node_inode; + struct nova_range_node *first_inode_range; + int allocated; + int freed; +}; + #include "balloc.h" static inline unsigned long diff --git a/fs/nova/super.c b/fs/nova/super.c index 32fe29b..9b60873 100644 --- a/fs/nova/super.c +++ b/fs/nova/super.c @@ -378,6 +378,9 @@ static struct nova_inode *nova_init(struct super_block *sb, nova_init_blockmap(sb, 0); + if (nova_init_inode_inuse_list(sb) < 0) + return ERR_PTR(-EINVAL); + if (nova_init_inode_table(sb) < 0) return ERR_PTR(-EINVAL); @@ -420,6 +423,7 @@ static inline void set_default_opts(struct nova_sb_info *sbi) sbi->head_reserved_blocks = HEAD_RESERVED_BLOCKS; sbi->tail_reserved_blocks = TAIL_RESERVED_BLOCKS; sbi->cpus = num_online_cpus(); + sbi->map_id = 0; } static void nova_root_check(struct super_block *sb, struct nova_inode *root_pi) @@ -481,9 +485,11 @@ static int nova_fill_super(struct super_block *sb, void *data, int silent) struct nova_sb_info *sbi = NULL; struct nova_inode *root_pi; struct inode *root_i = NULL; + struct inode_map *inode_map; unsigned long blocksize; u32 random = 0; int retval = -EINVAL; + int i; timing_t mount_time; NOVA_START_TIMING(mount_t, mount_time); @@ -533,6 +539,21 @@ static int nova_fill_super(struct super_block *sb, void *data, int silent) sbi->gid = current_fsgid(); set_opt(sbi->s_mount_opt, HUGEIOREMAP); + sbi->inode_maps = kcalloc(sbi->cpus, sizeof(struct inode_map), + GFP_KERNEL); + if (!sbi->inode_maps) { + retval = -ENOMEM; + nova_dbg("%s: Allocating inode maps failed.", + __func__); + goto out; + } + + for (i = 0; i < sbi->cpus; i++) { + inode_map = &sbi->inode_maps[i]; + mutex_init(&inode_map->inode_table_mutex); + inode_map->inode_inuse_tree = RB_ROOT; + } + mutex_init(&sbi->s_lock); sbi->zeroed_page = kzalloc(PAGE_SIZE, GFP_KERNEL); @@ -625,6 +646,9 @@ static int nova_fill_super(struct super_block *sb, void *data, int silent) nova_delete_free_lists(sb); + kfree(sbi->inode_maps); + sbi->inode_maps = NULL; + kfree(sbi->nova_sb); kfree(sbi); nova_dbg("%s failed: return %d\n", __func__, retval); @@ -706,6 +730,8 @@ static int nova_remount(struct super_block *sb, int *mntflags, char *data) static void nova_put_super(struct super_block *sb) { struct nova_sb_info *sbi = NOVA_SB(sb); + struct inode_map *inode_map; + int i; if (sbi->virt_addr) { /* Save everything before blocknode mapping! */ @@ -718,6 +744,13 @@ static void nova_put_super(struct super_block *sb) kfree(sbi->zeroed_page); nova_dbgmask = 0; + for (i = 0; i < sbi->cpus; i++) { + inode_map = &sbi->inode_maps[i]; + nova_dbgv("CPU %d: inode allocated %d, freed %d\n", + i, inode_map->allocated, inode_map->freed); + } + + kfree(sbi->inode_maps); kfree(sbi->nova_sb); kfree(sbi); sb->s_fs_info = NULL; @@ -728,6 +761,12 @@ inline void nova_free_range_node(struct nova_range_node *node) kmem_cache_free(nova_range_node_cachep, node); } +inline void nova_free_inode_node(struct super_block *sb, + struct nova_range_node *node) +{ + nova_free_range_node(node); +} + inline struct nova_range_node *nova_alloc_range_node(struct super_block *sb) { struct nova_range_node *p; @@ -737,6 +776,11 @@ inline struct nova_range_node *nova_alloc_range_node(struct super_block *sb) return p; } +inline struct nova_range_node *nova_alloc_inode_node(struct super_block *sb) +{ + return nova_alloc_range_node(sb); +} + static struct inode *nova_alloc_inode(struct super_block *sb) { struct nova_inode_info *vi; diff --git a/fs/nova/super.h b/fs/nova/super.h index dcafbd8..9772d2f 100644 --- a/fs/nova/super.h +++ b/fs/nova/super.h @@ -119,6 +119,12 @@ struct nova_sb_info { /* ZEROED page for cache page initialized */ void *zeroed_page; + /* Per-CPU inode map */ + struct inode_map *inode_maps; + + /* Decide new inode map id */ + unsigned long map_id; + /* Per-CPU free block list */ struct free_list *free_lists; unsigned long per_list_blocks; @@ -150,6 +156,9 @@ static inline struct nova_super_block *nova_get_super(struct super_block *sb) extern void nova_error_mng(struct super_block *sb, const char *fmt, ...); extern struct nova_range_node *nova_alloc_range_node(struct super_block *sb); +extern inline struct nova_range_node *nova_alloc_inode_node(struct super_block *sb); extern void nova_free_range_node(struct nova_range_node *node); +extern inline void nova_free_inode_node(struct super_block *sb, + struct nova_range_node *node); #endif -- 2.7.4
next prev parent reply other threads:[~2018-03-10 18:14 UTC|newest] Thread overview: 236+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-10 18:17 [RFC v2 00/83] NOVA: a new file system for persistent memory Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 01/83] Introduction and documentation of NOVA filesystem Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-19 20:43 ` Randy Dunlap 2018-03-19 20:43 ` Randy Dunlap 2018-03-19 23:00 ` Andiry Xu 2018-03-19 23:00 ` Andiry Xu 2018-04-22 8:05 ` Pavel Machek 2018-03-10 18:17 ` [RFC v2 02/83] Add nova_def.h Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 03/83] Add super.h Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-15 4:54 ` Darrick J. Wong 2018-03-15 4:54 ` Darrick J. Wong 2018-03-15 6:11 ` Andiry Xu 2018-03-15 6:11 ` Andiry Xu 2018-03-15 9:05 ` Arnd Bergmann 2018-03-15 9:05 ` Arnd Bergmann 2018-03-15 17:51 ` Andiry Xu 2018-03-15 17:51 ` Andiry Xu 2018-03-15 20:04 ` Andreas Dilger 2018-03-15 20:38 ` Arnd Bergmann 2018-03-15 20:38 ` Arnd Bergmann 2018-03-16 2:59 ` Theodore Y. Ts'o 2018-03-16 2:59 ` Theodore Y. Ts'o 2018-03-16 6:17 ` Andiry Xu 2018-03-16 6:17 ` Andiry Xu 2018-03-16 6:30 ` Darrick J. Wong 2018-03-16 6:30 ` Darrick J. Wong 2018-03-16 9:19 ` Arnd Bergmann 2018-03-16 9:19 ` Arnd Bergmann 2018-03-10 18:17 ` [RFC v2 04/83] NOVA inode definition Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-15 5:06 ` Darrick J. Wong 2018-03-15 5:06 ` Darrick J. Wong 2018-03-15 6:16 ` Andiry Xu 2018-03-15 6:16 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 05/83] Add NOVA filesystem definitions and useful helper routines Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-11 12:00 ` Nikolay Borisov 2018-03-11 12:00 ` Nikolay Borisov 2018-03-11 19:22 ` Eric Biggers 2018-03-11 19:22 ` Eric Biggers 2018-03-11 21:45 ` Andiry Xu 2018-03-11 21:45 ` Andiry Xu 2018-03-19 19:39 ` Andiry Xu 2018-03-19 19:39 ` Andiry Xu 2018-03-19 20:30 ` Eric Biggers 2018-03-19 20:30 ` Eric Biggers 2018-03-19 21:59 ` Andiry Xu 2018-03-19 21:59 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 06/83] Add inode get/read methods Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-04-23 6:12 ` Darrick J. Wong 2018-04-23 6:12 ` Darrick J. Wong 2018-04-23 15:55 ` Andiry Xu 2018-04-23 15:55 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 07/83] Initialize inode_info and rebuild inode information in nova_iget() Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 08/83] NOVA superblock operations Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 09/83] Add Kconfig and Makefile Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-11 12:15 ` Nikolay Borisov 2018-03-11 12:15 ` Nikolay Borisov 2018-03-11 21:32 ` Andiry Xu 2018-03-11 21:32 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 10/83] Add superblock integrity check Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 11/83] Add timing and I/O statistics for performance analysis and profiling Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 12/83] Add timing for mount and init Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 13/83] Add remount_fs and show_options methods Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 14/83] Add range node kmem cache Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-11 11:55 ` Nikolay Borisov 2018-03-11 11:55 ` Nikolay Borisov 2018-03-11 21:31 ` Andiry Xu 2018-03-11 21:31 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 15/83] Add free list data structure Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 16/83] Initialize block map and free lists in nova_init() Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-11 12:12 ` Nikolay Borisov 2018-03-11 12:12 ` Nikolay Borisov 2018-03-11 21:30 ` Andiry Xu 2018-03-11 21:30 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 17/83] Add statfs support Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:17 ` [RFC v2 18/83] Add freelist statistics printing Andiry Xu 2018-03-10 18:17 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 19/83] Add pmem block free routines Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 20/83] Pmem block allocation routines Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 21/83] Add log structure Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 22/83] Inode log pages allocation and reclaimation Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 23/83] Save allocator to pmem in put_super Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 24/83] Initialize and allocate inode table Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 25/83] Support get normal inode address and inode table extentsion Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` Andiry Xu [this message] 2018-03-10 18:18 ` [RFC v2 26/83] Add inode_map to track inuse inodes Andiry Xu 2018-03-10 18:18 ` [RFC v2 27/83] Save the inode inuse list to pmem upon umount Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 28/83] Add NOVA address space operations Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 29/83] Add write_inode and dirty_inode routines Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 30/83] New NOVA inode allocation Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 31/83] Add new vfs " Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 32/83] Add log entry definitions Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 33/83] Inode log and entry printing for debug purpose Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 34/83] Journal: NOVA light weight journal definitions Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 35/83] Journal: Lite journal helper routines Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 36/83] Journal: Lite journal recovery Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 37/83] Journal: Lite journal create and commit Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 38/83] Journal: NOVA lite journal initialization Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 39/83] Log operation: dentry append Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 40/83] Log operation: file write entry append Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 41/83] Log operation: setattr " Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 42/83] Log operation: link change append Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 43/83] Log operation: in-place update log entry Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 44/83] Log operation: invalidate log entries Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 45/83] Log operation: file inode log lookup and assign Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 46/83] Dir: Add Directory radix tree insert/remove methods Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 47/83] Dir: Add initial dentries when initializing a directory inode log Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 48/83] Dir: Readdir operation Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 49/83] Dir: Append create/remove dentry Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 50/83] Inode: Add nova_evict_inode Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 51/83] Rebuild: directory inode Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 52/83] Rebuild: file inode Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 53/83] Namei: lookup Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 54/83] Namei: create and mknod Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 55/83] Namei: mkdir Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 56/83] Namei: link and unlink Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 57/83] Namei: rmdir Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 58/83] Namei: rename Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 59/83] Namei: setattr Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 60/83] Add special inode operations Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 61/83] Super: Add nova_export_ops Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 62/83] File: getattr and file inode operations Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 63/83] File operation: llseek Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 64/83] File operation: open, fsync, flush Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 65/83] File operation: read Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 66/83] Super: Add file write item cache Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 67/83] Dax: commit list of file write items to log Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 68/83] File operation: copy-on-write write Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 69/83] Super: Add module param inplace_data_updates Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 70/83] File operation: Inplace write Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 71/83] Symlink support Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 72/83] File operation: fallocate Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 73/83] Dax: Add iomap operations Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 74/83] File operation: Mmap Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 75/83] File operation: read/write iter Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 76/83] Ioctl support Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 77/83] GC: Fast garbage collection Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:18 ` [RFC v2 78/83] GC: Thorough " Andiry Xu 2018-03-10 18:18 ` Andiry Xu 2018-03-10 18:19 ` [RFC v2 79/83] Normal recovery Andiry Xu 2018-03-10 18:19 ` Andiry Xu 2018-03-10 18:19 ` [RFC v2 80/83] Failure recovery: bitmap operations Andiry Xu 2018-03-10 18:19 ` Andiry Xu 2018-03-10 18:19 ` [RFC v2 81/83] Failure recovery: Inode pages recovery routines Andiry Xu 2018-03-10 18:19 ` Andiry Xu 2018-03-10 18:19 ` [RFC v2 82/83] Failure recovery: Per-CPU recovery Andiry Xu 2018-03-10 18:19 ` Andiry Xu 2018-03-10 18:19 ` [RFC v2 83/83] Sysfs support Andiry Xu 2018-03-10 18:19 ` Andiry Xu 2018-03-15 0:33 ` Randy Dunlap 2018-03-15 0:33 ` Randy Dunlap 2018-03-15 6:07 ` Andiry Xu 2018-03-15 6:07 ` Andiry Xu 2018-03-22 15:00 ` David Sterba 2018-03-22 15:00 ` David Sterba 2018-03-23 0:31 ` Andiry Xu 2018-03-23 0:31 ` Andiry Xu 2018-03-11 2:14 ` [RFC v2 00/83] NOVA: a new file system for persistent memory Theodore Y. Ts'o 2018-03-11 2:14 ` Theodore Y. Ts'o 2018-03-11 4:58 ` Andiry Xu 2018-03-11 4:58 ` Andiry Xu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1520705944-6723-27-git-send-email-jix024@eng.ucsd.edu \ --to=jix024@eng.ucsd.edu \ --cc=andiry.xu@gmail.com \ --cc=coughlan@redhat.com \ --cc=david@fromorbit.com \ --cc=jack@suse.com \ --cc=jix024@cs.ucsd.edu \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ --cc=miklos@szeredi.hu \ --cc=swanson@cs.ucsd.edu \ --cc=swhiteho@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.