Skip to contentSkip to conversation

btrfs: Turn delayed_nodes_tree into an XArray

PATCH Superseded Gabriel Niebler 1 participant 2 messages Apr 19, 2022 Btrfs file system

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 btrfs: Turn delayed_nodes_tree into an XArray

… in the btrfs_root struct and adjust all usages of this object to use the XArray API, because it is notionally easier to use and unserstand, as it provides array semantics, and also takes care of locking for us, further simplifying the code.

---

Changes from v3:
- Replaced goto-label construct with do-while loop (Nikolay)
- Replaced break with equivalent return for better understandability (Nikolay)
- Made use of delayed_nodes array more efficient (Nikolay)

Changes from v2:
- Fixed uninitialised index variable (Nikolay)
- Fixed missing storage of node in array (Nikolay)
- Improved commit message to motivate patch (David)

Changes from v1:
- Reworked patch set into single patch (David)
- New member name delayed_nodes is independent of data strutcture used (David)
- Shortened commit message and made it start with 'btrfs:' (David)

---
 fs/btrfs/ctree.h         |  4 +--
 fs/btrfs/delayed-inode.c | 78 +++++++++++++++++++---------------------
 fs/btrfs/disk-io.c       |  2 +-
 fs/btrfs/inode.c         |  2 +-
 4 files changed, 41 insertions(+), 45 deletions(-)
fs/btrfs/ctree.h +2 -2
index b7631b88426e..9377dded9679 100644
@@ -1224,10 +1224,10 @@ struct btrfs_root {
 	struct rb_root inode_tree;
 
 	/*
-	 * radix tree that keeps track of delayed nodes of every inode,
+	 * XArray that keeps track of delayed nodes of every inode,
 	 * protected by inode_lock
 	 */
-	struct radix_tree_root delayed_nodes_tree;
+	struct xarray delayed_nodes;
 	/*
 	 * right now this just gets used so that a root has its own devid
 	 * for stat.  It may be used for more later
fs/btrfs/delayed-inode.c +37 -41

133 lines not on this page · raw message

fs/btrfs/disk-io.c +1 -1
index 126f244cdf88..913261481c1a 100644
@@ -1164,7 +1164,7 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,
 	root->nr_delalloc_inodes = 0;
 	root->nr_ordered_extents = 0;
 	root->inode_tree = RB_ROOT;
-	INIT_RADIX_TREE(&root->delayed_nodes_tree, GFP_ATOMIC);
+	xa_init_flags(&root->delayed_nodes, GFP_ATOMIC);
 
 	btrfs_init_root_block_rsv(root);
 
fs/btrfs/inode.c +1 -1
index 5082b9c70f8c..50a699ece606 100644
@@ -3826,7 +3826,7 @@ static int btrfs_read_locked_inode(struct inode *inode,
 	 * cache.
 	 *
 	 * This is required for both inode re-read from disk and delayed inode
-	 * in delayed_nodes_tree.
+	 * in the delayed_nodes XArray.
 	 */
 	if (BTRFS_I(inode)->last_trans == fs_info->generation)
 		set_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
Signature · 1 line
2.35.1
#1 lore raw

RETRACTED [PATCH v4] btrfs: Turn delayed_nodes_tree into an XArray

Disregard this patch, please, it has a syntax error and won't even compile...

Am 19.04.22 um 15:37 schrieb Gabriel Niebler:

Quoted 6 lines

… in the btrfs_root struct and adjust all usages of this object to use the XArray API, because it is notionally easier to use and unserstand, as it provides array semantics, and also takes care of locking for us, further simplifying the code.

<snip>

Quoted 39 lines
fs/btrfs/delayed-inode.c +10 -22
@@ -128,36 +128,29 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(
  	u64 ino = btrfs_ino(btrfs_inode);
  	int ret;
 
-again:
-	node = btrfs_get_delayed_node(btrfs_inode);
-	if (node)
-		return node;
-
-	node = kmem_cache_zalloc(delayed_node_cache, GFP_NOFS);
-	if (!node)
-		return ERR_PTR(-ENOMEM);
-	btrfs_init_delayed_node(node, root, ino);
+        do {
+		node = btrfs_get_delayed_node(btrfs_inode);
+		if (node)
+			return node;
 
-	/* cached in the btrfs inode and can be accessed */
-	refcount_set(&node->refs, 2);
+		node = kmem_cache_zalloc(delayed_node_cache, GFP_NOFS);
+		if (!node)
+			return ERR_PTR(-ENOMEM);
+		btrfs_init_delayed_node(node, root, ino);
 
-	ret = radix_tree_preload(GFP_NOFS);
-	if (ret) {
-		kmem_cache_free(delayed_node_cache, node);
-		return ERR_PTR(ret);
-	}
+		/* cached in the btrfs inode and can be accessed */
+		refcount_set(&node->refs, 2);
 
-	spin_lock(&root->inode_lock);
-	ret = radix_tree_insert(&root->delayed_nodes_tree, ino, node);
-	if (ret == -EEXIST) {
-		spin_unlock(&root->inode_lock);
-		kmem_cache_free(delayed_node_cache, node);
-		radix_tree_preload_end();

fs/btrfs/delayed-inode.c static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node( · line 151

Quoted 10 lines
fs/btrfs/delayed-inode.c +8 -2
-		goto again;
-	}
+		spin_lock(&root->inode_lock);
+		ret = xa_insert(&root->delayed_nodes, ino, node, GFP_NOFS);
+		if (ret) {
+			spin_unlock(&root->inode_lock);
+			kmem_cache_free(delayed_node_cache, node);
+			if (ret != -EBUSY)
+				return ERR_PTR(ret);
+	} while (ret);

Here it is: missing "}"!

<snip>

Resubmission pending, sorry for the inconvenience