From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH RFC 02/14] btrfs: qgroup: Implement data_rsv_map init/free functions
Date: Mon, 31 Aug 2015 16:54:33 +0800 [thread overview]
Message-ID: <1441011286-23733-3-git-send-email-quwenruo@cn.fujitsu.com> (raw)
In-Reply-To: <1441011286-23733-1-git-send-email-quwenruo@cn.fujitsu.com>
New functions btrfs_qgroup_init/free_data_rsv_map() to init/free data
reserve map.
Data reserve map is used to mark which range already holds reserved
space, to avoid current reserved space leak.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
fs/btrfs/btrfs_inode.h | 2 ++
fs/btrfs/inode.c | 10 +++++++
fs/btrfs/qgroup.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++
fs/btrfs/qgroup.h | 3 ++
4 files changed, 95 insertions(+)
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 6d799b8..c2da3a9 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -197,6 +197,8 @@ struct btrfs_inode {
/* qgroup dirty map for data space reserve */
struct btrfs_qgroup_data_rsv_map *qgroup_rsv_map;
+ /* lock to ensure rsv_map will only be initialized once */
+ spinlock_t qgroup_init_lock;
};
extern unsigned char btrfs_filetype_table[];
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 855935f..763197f 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8871,6 +8871,14 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)
INIT_LIST_HEAD(&ei->delalloc_inodes);
RB_CLEAR_NODE(&ei->rb_node);
+ /*
+ * Init qgroup info to empty, as they will be initialized at write
+ * time.
+ * This behavior is needed for enable quota later case.
+ */
+ spin_lock_init(&ei->qgroup_init_lock);
+ ei->qgroup_rsv_map = NULL;
+
return inode;
}
@@ -8928,6 +8936,8 @@ void btrfs_destroy_inode(struct inode *inode)
btrfs_put_ordered_extent(ordered);
}
}
+ /* free and check data rsv map */
+ btrfs_qgroup_free_data_rsv_map(inode);
inode_tree_del(inode);
btrfs_drop_extent_cache(inode, 0, (u64)-1, 0);
free:
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 640106a..2e9a93f 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -2511,3 +2511,83 @@ btrfs_qgroup_rescan_resume(struct btrfs_fs_info *fs_info)
btrfs_queue_work(fs_info->qgroup_rescan_workers,
&fs_info->qgroup_rescan_work);
}
+
+/*
+ * Init data_rsv_map for a given inode.
+ *
+ * This is needed at write time as quota can be disabled and then enabled
+ */
+int btrfs_qgroup_init_data_rsv_map(struct inode *inode)
+{
+ struct btrfs_inode *binode = BTRFS_I(inode);
+ struct btrfs_root *root = binode->root;
+ struct btrfs_qgroup_data_rsv_map *dirty_map;
+
+ if (!root->fs_info->quota_enabled || !is_fstree(root->objectid))
+ return 0;
+
+ spin_lock(&binode->qgroup_init_lock);
+ /* Quick route for init */
+ if (likely(binode->qgroup_rsv_map))
+ goto out;
+ spin_unlock(&binode->qgroup_init_lock);
+
+ /*
+ * Slow allocation route
+ *
+ * TODO: Use kmem_cache to speedup allocation
+ */
+ dirty_map = kmalloc(sizeof(*dirty_map), GFP_NOFS);
+ if (!dirty_map)
+ return -ENOMEM;
+
+ dirty_map->reserved = 0;
+ dirty_map->root = RB_ROOT;
+ spin_lock_init(&dirty_map->lock);
+
+ /* Lock again to ensure no one has already init it before */
+ spin_lock(&binode->qgroup_init_lock);
+ if (binode->qgroup_rsv_map) {
+ spin_unlock(&binode->qgroup_init_lock);
+ kfree(dirty_map);
+ return 0;
+ }
+ binode->qgroup_rsv_map = dirty_map;
+out:
+ spin_unlock(&binode->qgroup_init_lock);
+ return 0;
+}
+
+void btrfs_qgroup_free_data_rsv_map(struct inode *inode)
+{
+ struct btrfs_inode *binode = BTRFS_I(inode);
+ struct btrfs_root *root = binode->root;
+ struct btrfs_qgroup_data_rsv_map *dirty_map = binode->qgroup_rsv_map;
+ struct rb_node *node;
+
+ /*
+ * this function is called at inode destroy routine, so no concurrency
+ * will happen, no need to get the lock.
+ */
+ if (!dirty_map)
+ return;
+
+ /* insanity check */
+ WARN_ON(!root->fs_info->quota_enabled || !is_fstree(root->objectid));
+
+ /* Did we leak some space? */
+ WARN_ON(dirty_map->reserved || !RB_EMPTY_ROOT(&dirty_map->root));
+
+ btrfs_qgroup_free(root, dirty_map->reserved);
+ spin_lock(&dirty_map->lock);
+ while ((node = rb_first(&dirty_map->root)) != NULL) {
+ struct data_rsv_range *range;
+
+ range = rb_entry(node, struct data_rsv_range, node);
+ rb_erase(node, &dirty_map->root);
+ kfree(range);
+ }
+ spin_unlock(&dirty_map->lock);
+ kfree(dirty_map);
+ binode->qgroup_rsv_map = NULL;
+}
diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index 2f863a4..c87b7dc 100644
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -84,4 +84,7 @@ int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,
u64 rfer, u64 excl);
#endif
+/* for qgroup reserve */
+int btrfs_qgroup_init_data_rsv_map(struct inode *inode);
+void btrfs_qgroup_free_data_rsv_map(struct inode *inode);
#endif /* __BTRFS_QGROUP__ */
--
2.5.0
next prev parent reply other threads:[~2015-09-02 7:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-31 8:54 [PATCH RFC 00/14] Qgroup reserved space fixing framework Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 01/14] btrfs: qgroup: New function declaration for new reserve implement Qu Wenruo
2015-08-31 8:54 ` Qu Wenruo [this message]
2015-08-31 8:54 ` [PATCH RFC 03/14] btrfs: qgroup: Introduce new function to search most left reserve range Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 04/14] btrfs: qgroup: Introduce function to insert non-overlap " Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 05/14] btrfs: qgroup: Introduce function to reserve data range per inode Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 06/14] btrfs: qgroup: Introduce btrfs_qgroup_reserve_data function Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 07/14] btrfs: qgroup: Introduce function to release reserved range Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 08/14] btrfs: qgroup: Introduce function to release/free reserved data range Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 09/14] btrfs: delayed_ref: Add new function to record reserved space into delayed ref Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 10/14] btrfs: delayed_ref: release and free qgroup reserved at proper timing Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 11/14] btrfs: qgroup: Introduce new functions to reserve/free metadata Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 12/14] btrfs: qgroup: Use new metadata reservation Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 13/14] btrfs: extent-tree: Add new verions of btrfs_check_data_free_space Qu Wenruo
2015-08-31 8:54 ` [PATCH RFC 14/14] btrfs: Use new check_data_free_space for buffered write Qu Wenruo
2015-08-31 8:54 ` [PATCH 15/15] btrfs: fallocate: Add support to accurate qgroup reserve Qu Wenruo
-- strict thread matches above, loose matches on Subject: below --
2015-09-01 0:31 [PATCH RFC 00/14] Qgroup reserved space fixing framework Qu Wenruo
2015-09-01 0:31 ` [PATCH RFC 02/14] btrfs: qgroup: Implement data_rsv_map init/free functions Qu Wenruo
2015-09-01 7:21 [PATCH RFC 00/14] Qgroup reserved space fixing framework Qu Wenruo
2015-09-01 7:21 ` [PATCH RFC 02/14] btrfs: qgroup: Implement data_rsv_map init/free functions Qu Wenruo
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=1441011286-23733-3-git-send-email-quwenruo@cn.fujitsu.com \
--to=quwenruo@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).