From patchwork Sat Mar 10 18:18:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andiry Xu X-Patchwork-Id: 10273925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 17382601A0 for ; Sat, 10 Mar 2018 18:21:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06AEE28BAE for ; Sat, 10 Mar 2018 18:21:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF546296E5; Sat, 10 Mar 2018 18:21:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6C44229106 for ; Sat, 10 Mar 2018 18:21:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E9F1B22631492; Sat, 10 Mar 2018 10:14:59 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c05::242; helo=mail-pg0-x242.google.com; envelope-from=jix024@eng.ucsd.edu; receiver=linux-nvdimm@lists.01.org Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0E1102263148B for ; Sat, 10 Mar 2018 10:14:58 -0800 (PST) Received: by mail-pg0-x242.google.com with SMTP id g12so4844525pgs.0 for ; Sat, 10 Mar 2018 10:21:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eng.ucsd.edu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SWKi99XUWd7ihx1RTP/dBtIY0pqyFpS5woLnMh0iCGY=; b=XtQ4/9514BSUrhTk1yCc5YQxaCP9Wuuwj6pC8zzCNaPCxrZi0vVGUmoxA4h5A2VfaT EP/sv6JCNK+ex5yPK15CsFfu8wdMBI1QI3Ts/BCBSVjqgauzTCOMkGnvTxMofNqU8sN8 iC8ZwpY5fBvK62pYdTBumMcXqcEvFtt613gHs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SWKi99XUWd7ihx1RTP/dBtIY0pqyFpS5woLnMh0iCGY=; b=qdcop2+V4tU6Eed5g+uQ8safMdOlPPEUzm7vjm8QLwW9+hwgVl8PP47taJn38PYYwr /pyKZnTKru83aaEAk98dMkHEwUkCtUKxUmXbZ85i/Du4X4/5y2ErOFuFAVq795Shajk0 FNvZryizlvPYIb4Xn9MhDjEuqVwsjh9rILuTPq37ufaHDO5BtP2NBTnGucb0JzMv1OH3 vYVaRnDHR7M/nuhK77SkHsmzT8ATW5K5W9301fPHehZy39+OpsXavIyVxciT1AMt4o68 uzsELK0bVtlw4Bi9t0lXTQ1jXWInUflbtYEC5s2xiYYXUGc7vZClmCbxNhh0drd2lZtN dCgg== X-Gm-Message-State: AElRT7FUwI028+LgW9N0mD1piITniSUZWIkgn0vW1WISzFVNwrg6l7h4 C/Fs+AWggdPErgyPSqlx+yc5mA== X-Google-Smtp-Source: AG47ELu7ucIGCWGmJvrGInRA6d/Hj0iHIqBBgi6cylWOjaCFY9Oeakjndg5SqskM0fenMFd0hbMp0g== X-Received: by 10.98.9.130 with SMTP id 2mr2657066pfj.149.1520706076409; Sat, 10 Mar 2018 10:21:16 -0800 (PST) Received: from brienza-desktop.8.8.4.4 (andxu.ucsd.edu. [132.239.17.134]) by smtp.gmail.com with ESMTPSA id h80sm9210167pfj.181.2018.03.10.10.21.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Mar 2018 10:21:15 -0800 (PST) From: Andiry Xu To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org Subject: [RFC v2 50/83] Inode: Add nova_evict_inode. Date: Sat, 10 Mar 2018 10:18:31 -0800 Message-Id: <1520705944-6723-51-git-send-email-jix024@eng.ucsd.edu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520705944-6723-1-git-send-email-jix024@eng.ucsd.edu> References: <1520705944-6723-1-git-send-email-jix024@eng.ucsd.edu> X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: coughlan@redhat.com, miklos@szeredi.hu, Andiry Xu , david@fromorbit.com, jack@suse.com, swanson@cs.ucsd.edu, swhiteho@redhat.com, andiry.xu@gmail.com MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP From: Andiry Xu If the inode still have links, release the DRAM resource (radix tree, etc). Otherwise reclaim data pages and log pages. Signed-off-by: Andiry Xu --- fs/nova/inode.c | 257 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- fs/nova/inode.h | 5 ++ fs/nova/log.h | 7 ++ fs/nova/super.c | 1 + 4 files changed, 269 insertions(+), 1 deletion(-) diff --git a/fs/nova/inode.c b/fs/nova/inode.c index 41417e3..17addd3 100644 --- a/fs/nova/inode.c +++ b/fs/nova/inode.c @@ -457,7 +457,7 @@ static int nova_alloc_unused_inode(struct super_block *sb, int cpuid, return 0; } -int nova_free_inuse_inode(struct super_block *sb, unsigned long ino) +static 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; @@ -532,6 +532,261 @@ int nova_free_inuse_inode(struct super_block *sb, unsigned long ino) return ret; } +static int nova_free_inode(struct super_block *sb, struct nova_inode *pi, + struct nova_inode_info_header *sih) +{ + int err = 0; + timing_t free_time; + + NOVA_START_TIMING(free_inode_t, free_time); + + nova_free_inode_log(sb, pi, sih); + + sih->log_pages = 0; + sih->i_mode = 0; + sih->pi_addr = 0; + sih->i_size = 0; + sih->i_blocks = 0; + + err = nova_free_inuse_inode(sb, pi->nova_ino); + + NOVA_END_TIMING(free_inode_t, free_time); + return err; +} + +/* + * We do not really rely on this last blocknr + * because blocks can be allocated beyond file end + */ +static unsigned long nova_get_last_blocknr(struct super_block *sb, + struct nova_inode_info_header *sih) +{ + struct nova_inode *pi, fake_pi; + unsigned long last_blocknr; + unsigned int btype; + unsigned int data_bits; + int ret; + + ret = nova_get_reference(sb, sih->pi_addr, &fake_pi, + (void **)&pi, sizeof(struct nova_inode)); + if (ret) { + nova_dbg("%s: read pi @ 0x%lx failed\n", + __func__, sih->pi_addr); + btype = 0; + } else { + btype = sih->i_blk_type; + } + + data_bits = blk_type_to_shift[btype]; + + if (sih->i_size == 0) + last_blocknr = 0; + else + last_blocknr = (sih->i_size - 1) >> data_bits; + + return last_blocknr; +} + +int nova_delete_file_tree(struct super_block *sb, + struct nova_inode_info_header *sih, unsigned long start_blocknr, + unsigned long last_blocknr, bool delete_nvmm, bool delete_dead, + u64 epoch_id) +{ + struct nova_file_write_entry *entry; + struct nova_file_write_entry *old_entry = NULL; + unsigned long pgoff = start_blocknr; + unsigned long old_pgoff = 0; + unsigned int num_free = 0; + int freed = 0; + void *ret; + timing_t delete_time; + + NOVA_START_TIMING(delete_file_tree_t, delete_time); + + /* Handle EOF blocks */ + do { + entry = radix_tree_lookup(&sih->tree, pgoff); + if (entry) { + ret = radix_tree_delete(&sih->tree, pgoff); + WARN_ON(!ret || ret != entry); + if (entry != old_entry) { + if (old_entry && delete_nvmm) { + nova_free_old_entry(sb, sih, + old_entry, old_pgoff, + num_free, delete_dead, + epoch_id); + freed += num_free; + } + + old_entry = entry; + old_pgoff = pgoff; + num_free = 1; + } else { + num_free++; + } + pgoff++; + } else { + /* We are finding a hole. Jump to the next entry. */ + entry = nova_find_next_entry(sb, sih, pgoff); + if (!entry) + break; + + pgoff++; + pgoff = pgoff > entry->pgoff ? pgoff : entry->pgoff; + } + } while (1); + + if (old_entry && delete_nvmm) { + nova_free_old_entry(sb, sih, old_entry, old_pgoff, + num_free, delete_dead, epoch_id); + freed += num_free; + } + + nova_dbgv("Inode %lu: delete file tree from pgoff %lu to %lu, %d blocks freed\n", + sih->ino, start_blocknr, last_blocknr, freed); + + NOVA_END_TIMING(delete_file_tree_t, delete_time); + return freed; +} + +static int nova_free_dram_resource(struct super_block *sb, + struct nova_inode_info_header *sih) +{ + unsigned long last_blocknr; + int freed = 0; + + if (sih->ino == 0) + return 0; + + if (!(S_ISREG(sih->i_mode)) && !(S_ISDIR(sih->i_mode))) + return 0; + + if (S_ISREG(sih->i_mode)) { + last_blocknr = nova_get_last_blocknr(sb, sih); + freed = nova_delete_file_tree(sb, sih, 0, + last_blocknr, false, false, 0); + } else { + nova_delete_dir_tree(sb, sih); + freed = 1; + } + + return freed; +} + +static int nova_free_inode_resource(struct super_block *sb, + struct nova_inode *pi, struct nova_inode_info_header *sih) +{ + unsigned long last_blocknr; + int ret = 0; + int freed = 0; + + pi->deleted = 1; + + if (pi->valid) { + nova_dbg("%s: inode %lu still valid\n", + __func__, sih->ino); + pi->valid = 0; + } + nova_persist_inode(pi); + + /* We need the log to free the blocks from the b-tree */ + switch (__le16_to_cpu(pi->i_mode) & S_IFMT) { + case S_IFREG: + last_blocknr = nova_get_last_blocknr(sb, sih); + nova_dbgv("%s: file ino %lu\n", __func__, sih->ino); + freed = nova_delete_file_tree(sb, sih, 0, + last_blocknr, true, true, 0); + break; + case S_IFDIR: + nova_dbgv("%s: dir ino %lu\n", __func__, sih->ino); + nova_delete_dir_tree(sb, sih); + break; + case S_IFLNK: + /* Log will be freed later */ + nova_dbgv("%s: symlink ino %lu\n", + __func__, sih->ino); + freed = nova_delete_file_tree(sb, sih, 0, 0, + true, true, 0); + break; + default: + nova_dbgv("%s: special ino %lu\n", + __func__, sih->ino); + break; + } + + nova_dbg_verbose("%s: Freed %d\n", __func__, freed); + /* Then we can free the inode */ + ret = nova_free_inode(sb, pi, sih); + if (ret) + nova_err(sb, "%s: free inode %lu failed\n", + __func__, sih->ino); + + return ret; +} + +void nova_evict_inode(struct inode *inode) +{ + struct super_block *sb = inode->i_sb; + struct nova_inode *pi = nova_get_inode(sb, inode); + struct nova_inode_info *si = NOVA_I(inode); + struct nova_inode_info_header *sih = &si->header; + timing_t evict_time; + int destroy = 0; + int ret; + + NOVA_START_TIMING(evict_inode_t, evict_time); + if (!sih) { + nova_err(sb, "%s: ino %lu sih is NULL!\n", + __func__, inode->i_ino); + NOVA_ASSERT(0); + goto out; + } + + // pi can be NULL if the file has already been deleted, but a handle + // remains. + if (pi && pi->nova_ino != inode->i_ino) { + nova_err(sb, "%s: inode %lu ino does not match: %llu\n", + __func__, inode->i_ino, pi->nova_ino); + nova_dbg("inode size %llu, pi addr 0x%lx, pi head 0x%llx, tail 0x%llx, mode %u\n", + inode->i_size, sih->pi_addr, sih->log_head, + sih->log_tail, pi->i_mode); + nova_dbg("sih: ino %lu, inode size %lu, mode %u, inode mode %u\n", + sih->ino, sih->i_size, + sih->i_mode, inode->i_mode); + nova_print_inode_log(sb, inode); + } + + nova_dbg_verbose("%s: %lu\n", __func__, inode->i_ino); + if (!inode->i_nlink && !is_bad_inode(inode)) { + if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) + goto out; + + if (pi) { + ret = nova_free_inode_resource(sb, pi, sih); + if (ret) + goto out; + } + + destroy = 1; + pi = NULL; /* we no longer own the nova_inode */ + + inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_size = 0; + } +out: + if (destroy == 0) { + nova_dbgv("%s: destroying %lu\n", __func__, inode->i_ino); + nova_free_dram_resource(sb, sih); + } + /* TODO: Since we don't use page-cache, do we really need the following + * call? + */ + truncate_inode_pages(&inode->i_data, 0); + + clear_inode(inode); + NOVA_END_TIMING(evict_inode_t, evict_time); +} + /* Returns 0 on failure */ u64 nova_new_nova_inode(struct super_block *sb, u64 *pi_addr) { diff --git a/fs/nova/inode.h b/fs/nova/inode.h index 6970872..62c8bdc 100644 --- a/fs/nova/inode.h +++ b/fs/nova/inode.h @@ -245,6 +245,11 @@ u64 nova_new_nova_inode(struct super_block *sb, u64 *pi_addr); struct inode *nova_new_vfs_inode(enum nova_new_inode_type type, struct inode *dir, u64 pi_addr, u64 ino, umode_t mode, size_t size, dev_t rdev, const struct qstr *qstr, u64 epoch_id); +int nova_delete_file_tree(struct super_block *sb, + struct nova_inode_info_header *sih, unsigned long start_blocknr, + unsigned long last_blocknr, bool delete_nvmm, bool delete_dead, + u64 epoch_id); +extern void nova_evict_inode(struct inode *inode); extern int nova_write_inode(struct inode *inode, struct writeback_control *wbc); extern void nova_dirty_inode(struct inode *inode, int flags); diff --git a/fs/nova/log.h b/fs/nova/log.h index f5149f7..87ce5f9 100644 --- a/fs/nova/log.h +++ b/fs/nova/log.h @@ -364,6 +364,13 @@ static inline int is_dir_init_entry(struct super_block *sb, } +unsigned int nova_free_old_entry(struct super_block *sb, + struct nova_inode_info_header *sih, + struct nova_file_write_entry *entry, + unsigned long pgoff, unsigned int num_free, + bool delete_dead, u64 epoch_id); +struct nova_file_write_entry *nova_find_next_entry(struct super_block *sb, + struct nova_inode_info_header *sih, pgoff_t pgoff); int nova_handle_setattr_operation(struct super_block *sb, struct inode *inode, struct nova_inode *pi, unsigned int ia_valid, struct iattr *attr, u64 epoch_id); diff --git a/fs/nova/super.c b/fs/nova/super.c index 1e67062..daf3270 100644 --- a/fs/nova/super.c +++ b/fs/nova/super.c @@ -884,6 +884,7 @@ static struct super_operations nova_sops = { .destroy_inode = nova_destroy_inode, .write_inode = nova_write_inode, .dirty_inode = nova_dirty_inode, + .evict_inode = nova_evict_inode, .put_super = nova_put_super, .statfs = nova_statfs, .remount_fs = nova_remount,