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 51/83] Rebuild: directory inode. Date: Sat, 10 Mar 2018 10:18:32 -0800 [thread overview] Message-ID: <1520705944-6723-52-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> When vfs issues a read inode command, or when the inode is newly allocated, walk through the inode log to rebuild inode information and the radix tree. Signed-off-by: Andiry Xu <jix024@cs.ucsd.edu> --- fs/nova/inode.h | 15 +++ fs/nova/nova.h | 21 ++++ fs/nova/rebuild.c | 329 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 364 insertions(+), 1 deletion(-) diff --git a/fs/nova/inode.h b/fs/nova/inode.h index 62c8bdc..42690e6 100644 --- a/fs/nova/inode.h +++ b/fs/nova/inode.h @@ -97,6 +97,21 @@ struct nova_inode_info_header { u8 i_blk_type; }; +/* For rebuild purpose, temporarily store pi infomation */ +struct nova_inode_rebuild { + u64 i_size; + u32 i_flags; /* Inode flags */ + u32 i_ctime; /* Inode modification time */ + u32 i_mtime; /* Inode b-tree Modification time */ + u32 i_atime; /* Access time */ + u32 i_uid; /* Owner Uid */ + u32 i_gid; /* Group Id */ + u32 i_generation; /* File version (for NFS) */ + u16 i_links_count; /* Links count */ + u16 i_mode; /* File mode */ + u64 trans_id; +}; + /* * DRAM state for inodes */ diff --git a/fs/nova/nova.h b/fs/nova/nova.h index 3a51dae..983c6b2 100644 --- a/fs/nova/nova.h +++ b/fs/nova/nova.h @@ -301,6 +301,24 @@ static inline u64 nova_get_epoch_id(struct super_block *sb) } #include "inode.h" + +static inline int nova_get_head_tail(struct super_block *sb, + struct nova_inode *pi, struct nova_inode_info_header *sih) +{ + struct nova_inode fake_pi; + int rc; + + rc = memcpy_mcsafe(&fake_pi, pi, sizeof(struct nova_inode)); + if (rc) + return rc; + + sih->i_blk_type = fake_pi.i_blk_type; + sih->log_head = fake_pi.log_head; + sih->log_tail = fake_pi.log_tail; + + return rc; +} + #include "log.h" struct nova_range_node_lowhigh { @@ -467,6 +485,9 @@ int nova_remove_dentry(struct dentry *dentry, int dec_link, struct nova_inode_update *update, u64 epoch_id); /* rebuild.c */ +int nova_rebuild_dir_inode_tree(struct super_block *sb, + struct nova_inode *pi, u64 pi_addr, + struct nova_inode_info_header *sih); int nova_rebuild_inode(struct super_block *sb, struct nova_inode_info *si, u64 ino, u64 pi_addr, int rebuild_dir); diff --git a/fs/nova/rebuild.c b/fs/nova/rebuild.c index 0595851..9a1327d 100644 --- a/fs/nova/rebuild.c +++ b/fs/nova/rebuild.c @@ -18,6 +18,319 @@ #include "nova.h" #include "inode.h" +/* entry given to this function is a copy in dram */ +static void nova_apply_setattr_entry(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_inode_info_header *sih, + struct nova_setattr_logentry *entry) +{ + unsigned int data_bits = blk_type_to_shift[sih->i_blk_type]; + unsigned long first_blocknr, last_blocknr; + loff_t start, end; + int freed = 0; + + reb->i_mode = entry->mode; + reb->i_uid = entry->uid; + reb->i_gid = entry->gid; + reb->i_atime = entry->atime; + + if (S_ISREG(reb->i_mode)) { + start = entry->size; + end = reb->i_size; + + first_blocknr = (start + (1UL << data_bits) - 1) >> data_bits; + + if (end > 0) + last_blocknr = (end - 1) >> data_bits; + else + last_blocknr = 0; + + freed = nova_delete_file_tree(sb, sih, first_blocknr, + last_blocknr, false, false, 0); + } +} + +/* entry given to this function is a copy in dram */ +static void nova_apply_link_change_entry(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_link_change_entry *entry) +{ + reb->i_links_count = entry->links; + reb->i_ctime = entry->ctime; + reb->i_flags = entry->flags; + reb->i_generation = entry->generation; + + /* Do not flush now */ +} + +static void nova_update_inode_with_rebuild(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_inode *pi) +{ + pi->i_size = cpu_to_le64(reb->i_size); + pi->i_flags = cpu_to_le32(reb->i_flags); + pi->i_uid = cpu_to_le32(reb->i_uid); + pi->i_gid = cpu_to_le32(reb->i_gid); + pi->i_atime = cpu_to_le32(reb->i_atime); + pi->i_ctime = cpu_to_le32(reb->i_ctime); + pi->i_mtime = cpu_to_le32(reb->i_mtime); + pi->i_generation = cpu_to_le32(reb->i_generation); + pi->i_links_count = cpu_to_le16(reb->i_links_count); + pi->i_mode = cpu_to_le16(reb->i_mode); +} + +static int nova_init_inode_rebuild(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_inode *pi) +{ + struct nova_inode fake_pi; + int rc; + + rc = memcpy_mcsafe(&fake_pi, pi, sizeof(struct nova_inode)); + if (rc) + return rc; + + reb->i_size = le64_to_cpu(fake_pi.i_size); + reb->i_flags = le32_to_cpu(fake_pi.i_flags); + reb->i_uid = le32_to_cpu(fake_pi.i_uid); + reb->i_gid = le32_to_cpu(fake_pi.i_gid); + reb->i_atime = le32_to_cpu(fake_pi.i_atime); + reb->i_ctime = le32_to_cpu(fake_pi.i_ctime); + reb->i_mtime = le32_to_cpu(fake_pi.i_mtime); + reb->i_generation = le32_to_cpu(fake_pi.i_generation); + reb->i_links_count = le16_to_cpu(fake_pi.i_links_count); + reb->i_mode = le16_to_cpu(fake_pi.i_mode); + reb->trans_id = 0; + + return rc; +} + +static inline void nova_rebuild_file_time_and_size(struct super_block *sb, + struct nova_inode_rebuild *reb, u32 mtime, u32 ctime, u64 size) +{ + reb->i_mtime = cpu_to_le32(mtime); + reb->i_ctime = cpu_to_le32(ctime); + reb->i_size = cpu_to_le64(size); +} + +static int nova_rebuild_inode_start(struct super_block *sb, + struct nova_inode *pi, struct nova_inode_info_header *sih, + struct nova_inode_rebuild *reb, u64 pi_addr) +{ + int ret; + + ret = nova_get_head_tail(sb, pi, sih); + if (ret) + return ret; + + ret = nova_init_inode_rebuild(sb, reb, pi); + if (ret) + return ret; + + sih->pi_addr = pi_addr; + + nova_dbg_verbose("Log head 0x%llx, tail 0x%llx\n", + sih->log_head, sih->log_tail); + sih->log_pages = 1; + + return ret; +} + +static int nova_rebuild_inode_finish(struct super_block *sb, + struct nova_inode *pi, struct nova_inode_info_header *sih, + struct nova_inode_rebuild *reb, u64 curr_p) +{ + u64 next; + + sih->i_size = le64_to_cpu(reb->i_size); + sih->i_mode = le64_to_cpu(reb->i_mode); + sih->i_flags = le32_to_cpu(reb->i_flags); + sih->trans_id = reb->trans_id + 1; + + nova_update_inode_with_rebuild(sb, reb, pi); + nova_persist_inode(pi); + + /* Keep traversing until log ends */ + curr_p &= PAGE_MASK; + while ((next = next_log_page(sb, curr_p)) > 0) { + sih->log_pages++; + curr_p = next; + } + + return 0; +} + +/******************* Directory rebuild *********************/ + +static inline void nova_rebuild_dir_time_and_size(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_dentry *entry) +{ + if (!entry || !reb) + return; + + reb->i_ctime = entry->mtime; + reb->i_mtime = entry->mtime; + reb->i_links_count = entry->links_count; + //reb->i_size = entry->size; +} + +static void nova_reassign_last_dentry(struct super_block *sb, + struct nova_inode_info_header *sih, u64 curr_p) +{ + struct nova_dentry *dentry, *old_dentry; + + if (sih->last_dentry == 0) { + sih->last_dentry = curr_p; + } else { + old_dentry = (struct nova_dentry *)nova_get_block(sb, + sih->last_dentry); + dentry = (struct nova_dentry *)nova_get_block(sb, curr_p); + if (dentry->trans_id >= old_dentry->trans_id) + sih->last_dentry = curr_p; + } +} + +static inline int nova_replay_add_dentry(struct super_block *sb, + struct nova_inode_info_header *sih, struct nova_dentry *entry) +{ + if (!entry->name_len) + return -EINVAL; + + nova_dbg_verbose("%s: add %s\n", __func__, entry->name); + return nova_insert_dir_radix_tree(sb, sih, + entry->name, entry->name_len, entry); +} + +/* entry given to this function is a copy in dram */ +static inline int nova_replay_remove_dentry(struct super_block *sb, + struct nova_inode_info_header *sih, struct nova_dentry *entry) +{ + nova_dbg_verbose("%s: remove %s\n", __func__, entry->name); + nova_remove_dir_radix_tree(sb, sih, entry->name, + entry->name_len, 1, NULL); + return 0; +} + +static int nova_rebuild_handle_dentry(struct super_block *sb, + struct nova_inode_info_header *sih, struct nova_inode_rebuild *reb, + struct nova_dentry *entry, u64 curr_p) +{ + int ret = 0; + + nova_dbgv("curr_p: 0x%llx, type %d, ino %llu, name %s, namelen %u, rec len %u\n", + curr_p, + entry->entry_type, le64_to_cpu(entry->ino), + entry->name, entry->name_len, + le16_to_cpu(entry->de_len)); + + nova_reassign_last_dentry(sb, sih, curr_p); + + if (entry->invalid == 0) { + if (entry->ino > 0) + ret = nova_replay_add_dentry(sb, sih, entry); + else + ret = nova_replay_remove_dentry(sb, sih, entry); + } + + if (ret) { + nova_err(sb, "%s ERROR %d\n", __func__, ret); + return ret; + } + + if (entry->trans_id >= reb->trans_id) { + nova_rebuild_dir_time_and_size(sb, reb, entry); + reb->trans_id = entry->trans_id; + } + + return ret; +} + +int nova_rebuild_dir_inode_tree(struct super_block *sb, + struct nova_inode *pi, u64 pi_addr, + struct nova_inode_info_header *sih) +{ + struct nova_dentry *entry = NULL; + struct nova_setattr_logentry *attr_entry = NULL; + struct nova_link_change_entry *lc_entry = NULL; + struct nova_inode_rebuild rebuild, *reb; + u64 ino = pi->nova_ino; + unsigned short de_len; + timing_t rebuild_time; + void *addr, *entryc = NULL; + u64 curr_p; + u8 type; + int ret; + + NOVA_START_TIMING(rebuild_dir_t, rebuild_time); + nova_dbgv("Rebuild dir %llu tree\n", ino); + + reb = &rebuild; + ret = nova_rebuild_inode_start(sb, pi, sih, reb, pi_addr); + if (ret) + goto out; + + curr_p = sih->log_head; + if (curr_p == 0) { + nova_err(sb, "Dir %llu log is NULL!\n", ino); + ret = -ENOSPC; + goto out; + } + + while (curr_p != sih->log_tail) { + if (goto_next_page(sb, curr_p)) { + sih->log_pages++; + curr_p = next_log_page(sb, curr_p); + } + + if (curr_p == 0) { + nova_err(sb, "Dir %llu log is NULL!\n", ino); + ret = -EIO; + goto out; + } + + addr = (void *)nova_get_block(sb, curr_p); + + entryc = addr; + + type = nova_get_entry_type(entryc); + + switch (type) { + case SET_ATTR: + attr_entry = (struct nova_setattr_logentry *)entryc; + nova_apply_setattr_entry(sb, reb, sih, attr_entry); + sih->last_setattr = curr_p; + curr_p += sizeof(struct nova_setattr_logentry); + break; + case LINK_CHANGE: + lc_entry = (struct nova_link_change_entry *)entryc; + if (lc_entry->trans_id >= reb->trans_id) { + nova_apply_link_change_entry(sb, reb, lc_entry); + reb->trans_id = lc_entry->trans_id; + } + sih->last_link_change = curr_p; + curr_p += sizeof(struct nova_link_change_entry); + break; + case DIR_LOG: + entry = (struct nova_dentry *)addr; + ret = nova_rebuild_handle_dentry(sb, sih, reb, + entry, curr_p); + if (ret) + goto out; + de_len = le16_to_cpu(DENTRY(entryc)->de_len); + curr_p += de_len; + break; + default: + nova_dbg("%s: unknown type %d, 0x%llx\n", + __func__, type, curr_p); + NOVA_ASSERT(0); + break; + } + } + + ret = nova_rebuild_inode_finish(sb, pi, sih, reb, curr_p); + sih->i_blocks = sih->log_pages; + +out: + NOVA_END_TIMING(rebuild_dir_t, rebuild_time); + return ret; +} + /* initialize nova inode header and other DRAM data structures */ int nova_rebuild_inode(struct super_block *sb, struct nova_inode_info *si, u64 ino, u64 pi_addr, int rebuild_dir) @@ -42,7 +355,21 @@ int nova_rebuild_inode(struct super_block *sb, struct nova_inode_info *si, sih->ino = ino; - /* Traverse the log */ + switch (__le16_to_cpu(pi->i_mode) & S_IFMT) { + case S_IFLNK: + /* Treat symlink files as normal files */ + /* Fall through */ + case S_IFREG: + break; + case S_IFDIR: + if (rebuild_dir) + nova_rebuild_dir_inode_tree(sb, pi, pi_addr, sih); + break; + default: + sih->pi_addr = pi_addr; + break; + } + return 0; } -- 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 51/83] Rebuild: directory inode. Date: Sat, 10 Mar 2018 10:18:32 -0800 [thread overview] Message-ID: <1520705944-6723-52-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> When vfs issues a read inode command, or when the inode is newly allocated, walk through the inode log to rebuild inode information and the radix tree. Signed-off-by: Andiry Xu <jix024@cs.ucsd.edu> --- fs/nova/inode.h | 15 +++ fs/nova/nova.h | 21 ++++ fs/nova/rebuild.c | 329 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 364 insertions(+), 1 deletion(-) diff --git a/fs/nova/inode.h b/fs/nova/inode.h index 62c8bdc..42690e6 100644 --- a/fs/nova/inode.h +++ b/fs/nova/inode.h @@ -97,6 +97,21 @@ struct nova_inode_info_header { u8 i_blk_type; }; +/* For rebuild purpose, temporarily store pi infomation */ +struct nova_inode_rebuild { + u64 i_size; + u32 i_flags; /* Inode flags */ + u32 i_ctime; /* Inode modification time */ + u32 i_mtime; /* Inode b-tree Modification time */ + u32 i_atime; /* Access time */ + u32 i_uid; /* Owner Uid */ + u32 i_gid; /* Group Id */ + u32 i_generation; /* File version (for NFS) */ + u16 i_links_count; /* Links count */ + u16 i_mode; /* File mode */ + u64 trans_id; +}; + /* * DRAM state for inodes */ diff --git a/fs/nova/nova.h b/fs/nova/nova.h index 3a51dae..983c6b2 100644 --- a/fs/nova/nova.h +++ b/fs/nova/nova.h @@ -301,6 +301,24 @@ static inline u64 nova_get_epoch_id(struct super_block *sb) } #include "inode.h" + +static inline int nova_get_head_tail(struct super_block *sb, + struct nova_inode *pi, struct nova_inode_info_header *sih) +{ + struct nova_inode fake_pi; + int rc; + + rc = memcpy_mcsafe(&fake_pi, pi, sizeof(struct nova_inode)); + if (rc) + return rc; + + sih->i_blk_type = fake_pi.i_blk_type; + sih->log_head = fake_pi.log_head; + sih->log_tail = fake_pi.log_tail; + + return rc; +} + #include "log.h" struct nova_range_node_lowhigh { @@ -467,6 +485,9 @@ int nova_remove_dentry(struct dentry *dentry, int dec_link, struct nova_inode_update *update, u64 epoch_id); /* rebuild.c */ +int nova_rebuild_dir_inode_tree(struct super_block *sb, + struct nova_inode *pi, u64 pi_addr, + struct nova_inode_info_header *sih); int nova_rebuild_inode(struct super_block *sb, struct nova_inode_info *si, u64 ino, u64 pi_addr, int rebuild_dir); diff --git a/fs/nova/rebuild.c b/fs/nova/rebuild.c index 0595851..9a1327d 100644 --- a/fs/nova/rebuild.c +++ b/fs/nova/rebuild.c @@ -18,6 +18,319 @@ #include "nova.h" #include "inode.h" +/* entry given to this function is a copy in dram */ +static void nova_apply_setattr_entry(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_inode_info_header *sih, + struct nova_setattr_logentry *entry) +{ + unsigned int data_bits = blk_type_to_shift[sih->i_blk_type]; + unsigned long first_blocknr, last_blocknr; + loff_t start, end; + int freed = 0; + + reb->i_mode = entry->mode; + reb->i_uid = entry->uid; + reb->i_gid = entry->gid; + reb->i_atime = entry->atime; + + if (S_ISREG(reb->i_mode)) { + start = entry->size; + end = reb->i_size; + + first_blocknr = (start + (1UL << data_bits) - 1) >> data_bits; + + if (end > 0) + last_blocknr = (end - 1) >> data_bits; + else + last_blocknr = 0; + + freed = nova_delete_file_tree(sb, sih, first_blocknr, + last_blocknr, false, false, 0); + } +} + +/* entry given to this function is a copy in dram */ +static void nova_apply_link_change_entry(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_link_change_entry *entry) +{ + reb->i_links_count = entry->links; + reb->i_ctime = entry->ctime; + reb->i_flags = entry->flags; + reb->i_generation = entry->generation; + + /* Do not flush now */ +} + +static void nova_update_inode_with_rebuild(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_inode *pi) +{ + pi->i_size = cpu_to_le64(reb->i_size); + pi->i_flags = cpu_to_le32(reb->i_flags); + pi->i_uid = cpu_to_le32(reb->i_uid); + pi->i_gid = cpu_to_le32(reb->i_gid); + pi->i_atime = cpu_to_le32(reb->i_atime); + pi->i_ctime = cpu_to_le32(reb->i_ctime); + pi->i_mtime = cpu_to_le32(reb->i_mtime); + pi->i_generation = cpu_to_le32(reb->i_generation); + pi->i_links_count = cpu_to_le16(reb->i_links_count); + pi->i_mode = cpu_to_le16(reb->i_mode); +} + +static int nova_init_inode_rebuild(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_inode *pi) +{ + struct nova_inode fake_pi; + int rc; + + rc = memcpy_mcsafe(&fake_pi, pi, sizeof(struct nova_inode)); + if (rc) + return rc; + + reb->i_size = le64_to_cpu(fake_pi.i_size); + reb->i_flags = le32_to_cpu(fake_pi.i_flags); + reb->i_uid = le32_to_cpu(fake_pi.i_uid); + reb->i_gid = le32_to_cpu(fake_pi.i_gid); + reb->i_atime = le32_to_cpu(fake_pi.i_atime); + reb->i_ctime = le32_to_cpu(fake_pi.i_ctime); + reb->i_mtime = le32_to_cpu(fake_pi.i_mtime); + reb->i_generation = le32_to_cpu(fake_pi.i_generation); + reb->i_links_count = le16_to_cpu(fake_pi.i_links_count); + reb->i_mode = le16_to_cpu(fake_pi.i_mode); + reb->trans_id = 0; + + return rc; +} + +static inline void nova_rebuild_file_time_and_size(struct super_block *sb, + struct nova_inode_rebuild *reb, u32 mtime, u32 ctime, u64 size) +{ + reb->i_mtime = cpu_to_le32(mtime); + reb->i_ctime = cpu_to_le32(ctime); + reb->i_size = cpu_to_le64(size); +} + +static int nova_rebuild_inode_start(struct super_block *sb, + struct nova_inode *pi, struct nova_inode_info_header *sih, + struct nova_inode_rebuild *reb, u64 pi_addr) +{ + int ret; + + ret = nova_get_head_tail(sb, pi, sih); + if (ret) + return ret; + + ret = nova_init_inode_rebuild(sb, reb, pi); + if (ret) + return ret; + + sih->pi_addr = pi_addr; + + nova_dbg_verbose("Log head 0x%llx, tail 0x%llx\n", + sih->log_head, sih->log_tail); + sih->log_pages = 1; + + return ret; +} + +static int nova_rebuild_inode_finish(struct super_block *sb, + struct nova_inode *pi, struct nova_inode_info_header *sih, + struct nova_inode_rebuild *reb, u64 curr_p) +{ + u64 next; + + sih->i_size = le64_to_cpu(reb->i_size); + sih->i_mode = le64_to_cpu(reb->i_mode); + sih->i_flags = le32_to_cpu(reb->i_flags); + sih->trans_id = reb->trans_id + 1; + + nova_update_inode_with_rebuild(sb, reb, pi); + nova_persist_inode(pi); + + /* Keep traversing until log ends */ + curr_p &= PAGE_MASK; + while ((next = next_log_page(sb, curr_p)) > 0) { + sih->log_pages++; + curr_p = next; + } + + return 0; +} + +/******************* Directory rebuild *********************/ + +static inline void nova_rebuild_dir_time_and_size(struct super_block *sb, + struct nova_inode_rebuild *reb, struct nova_dentry *entry) +{ + if (!entry || !reb) + return; + + reb->i_ctime = entry->mtime; + reb->i_mtime = entry->mtime; + reb->i_links_count = entry->links_count; + //reb->i_size = entry->size; +} + +static void nova_reassign_last_dentry(struct super_block *sb, + struct nova_inode_info_header *sih, u64 curr_p) +{ + struct nova_dentry *dentry, *old_dentry; + + if (sih->last_dentry == 0) { + sih->last_dentry = curr_p; + } else { + old_dentry = (struct nova_dentry *)nova_get_block(sb, + sih->last_dentry); + dentry = (struct nova_dentry *)nova_get_block(sb, curr_p); + if (dentry->trans_id >= old_dentry->trans_id) + sih->last_dentry = curr_p; + } +} + +static inline int nova_replay_add_dentry(struct super_block *sb, + struct nova_inode_info_header *sih, struct nova_dentry *entry) +{ + if (!entry->name_len) + return -EINVAL; + + nova_dbg_verbose("%s: add %s\n", __func__, entry->name); + return nova_insert_dir_radix_tree(sb, sih, + entry->name, entry->name_len, entry); +} + +/* entry given to this function is a copy in dram */ +static inline int nova_replay_remove_dentry(struct super_block *sb, + struct nova_inode_info_header *sih, struct nova_dentry *entry) +{ + nova_dbg_verbose("%s: remove %s\n", __func__, entry->name); + nova_remove_dir_radix_tree(sb, sih, entry->name, + entry->name_len, 1, NULL); + return 0; +} + +static int nova_rebuild_handle_dentry(struct super_block *sb, + struct nova_inode_info_header *sih, struct nova_inode_rebuild *reb, + struct nova_dentry *entry, u64 curr_p) +{ + int ret = 0; + + nova_dbgv("curr_p: 0x%llx, type %d, ino %llu, name %s, namelen %u, rec len %u\n", + curr_p, + entry->entry_type, le64_to_cpu(entry->ino), + entry->name, entry->name_len, + le16_to_cpu(entry->de_len)); + + nova_reassign_last_dentry(sb, sih, curr_p); + + if (entry->invalid == 0) { + if (entry->ino > 0) + ret = nova_replay_add_dentry(sb, sih, entry); + else + ret = nova_replay_remove_dentry(sb, sih, entry); + } + + if (ret) { + nova_err(sb, "%s ERROR %d\n", __func__, ret); + return ret; + } + + if (entry->trans_id >= reb->trans_id) { + nova_rebuild_dir_time_and_size(sb, reb, entry); + reb->trans_id = entry->trans_id; + } + + return ret; +} + +int nova_rebuild_dir_inode_tree(struct super_block *sb, + struct nova_inode *pi, u64 pi_addr, + struct nova_inode_info_header *sih) +{ + struct nova_dentry *entry = NULL; + struct nova_setattr_logentry *attr_entry = NULL; + struct nova_link_change_entry *lc_entry = NULL; + struct nova_inode_rebuild rebuild, *reb; + u64 ino = pi->nova_ino; + unsigned short de_len; + timing_t rebuild_time; + void *addr, *entryc = NULL; + u64 curr_p; + u8 type; + int ret; + + NOVA_START_TIMING(rebuild_dir_t, rebuild_time); + nova_dbgv("Rebuild dir %llu tree\n", ino); + + reb = &rebuild; + ret = nova_rebuild_inode_start(sb, pi, sih, reb, pi_addr); + if (ret) + goto out; + + curr_p = sih->log_head; + if (curr_p == 0) { + nova_err(sb, "Dir %llu log is NULL!\n", ino); + ret = -ENOSPC; + goto out; + } + + while (curr_p != sih->log_tail) { + if (goto_next_page(sb, curr_p)) { + sih->log_pages++; + curr_p = next_log_page(sb, curr_p); + } + + if (curr_p == 0) { + nova_err(sb, "Dir %llu log is NULL!\n", ino); + ret = -EIO; + goto out; + } + + addr = (void *)nova_get_block(sb, curr_p); + + entryc = addr; + + type = nova_get_entry_type(entryc); + + switch (type) { + case SET_ATTR: + attr_entry = (struct nova_setattr_logentry *)entryc; + nova_apply_setattr_entry(sb, reb, sih, attr_entry); + sih->last_setattr = curr_p; + curr_p += sizeof(struct nova_setattr_logentry); + break; + case LINK_CHANGE: + lc_entry = (struct nova_link_change_entry *)entryc; + if (lc_entry->trans_id >= reb->trans_id) { + nova_apply_link_change_entry(sb, reb, lc_entry); + reb->trans_id = lc_entry->trans_id; + } + sih->last_link_change = curr_p; + curr_p += sizeof(struct nova_link_change_entry); + break; + case DIR_LOG: + entry = (struct nova_dentry *)addr; + ret = nova_rebuild_handle_dentry(sb, sih, reb, + entry, curr_p); + if (ret) + goto out; + de_len = le16_to_cpu(DENTRY(entryc)->de_len); + curr_p += de_len; + break; + default: + nova_dbg("%s: unknown type %d, 0x%llx\n", + __func__, type, curr_p); + NOVA_ASSERT(0); + break; + } + } + + ret = nova_rebuild_inode_finish(sb, pi, sih, reb, curr_p); + sih->i_blocks = sih->log_pages; + +out: + NOVA_END_TIMING(rebuild_dir_t, rebuild_time); + return ret; +} + /* initialize nova inode header and other DRAM data structures */ int nova_rebuild_inode(struct super_block *sb, struct nova_inode_info *si, u64 ino, u64 pi_addr, int rebuild_dir) @@ -42,7 +355,21 @@ int nova_rebuild_inode(struct super_block *sb, struct nova_inode_info *si, sih->ino = ino; - /* Traverse the log */ + switch (__le16_to_cpu(pi->i_mode) & S_IFMT) { + case S_IFLNK: + /* Treat symlink files as normal files */ + /* Fall through */ + case S_IFREG: + break; + case S_IFDIR: + if (rebuild_dir) + nova_rebuild_dir_inode_tree(sb, pi, pi_addr, sih); + break; + default: + sih->pi_addr = pi_addr; + break; + } + return 0; } -- 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 ` [RFC v2 26/83] Add inode_map to track inuse inodes Andiry Xu 2018-03-10 18:18 ` 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 ` Andiry Xu [this message] 2018-03-10 18:18 ` [RFC v2 51/83] Rebuild: directory inode 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-52-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.