btrfs: avoid expensive search when dropping inode items from log

Whenever we are logging a directory inode, logging that an inode exists or
logging an inode that has changes in its references or xattrs, we attempt
to delete items of this inode we may have previously logged (through calls
to drop_objectid_items()).

That attempt does a btree search for deletion, which is expensive because
it always acquires write locks for extent buffers at levels 2, 1 and 0,
and it balances any node that is less than half full. Acquiring the write
locks can block the task if the extent buffers are already locked or block
other tasks attempting to lock them, which is specially bad in case of log
trees since they are small due to their short life, with a root node at a
level typically not greater than level 2.

If we know that we are logging the inode for the first time in the current
transaction, we can skip the search. This change does that.

This patch is part of a patch set comprised of the following patches:

  btrfs: check if a log tree exists at inode_logged()
  btrfs: remove no longer needed checks for NULL log context
  btrfs: do not log new dentries when logging that a new name exists
  btrfs: always update the logged transaction when logging new names
  btrfs: avoid expensive search when dropping inode items from log
  btrfs: add helper to truncate inode items when logging inode
  btrfs: avoid expensive search when truncating inode items from the log
  btrfs: avoid search for logged i_size when logging inode if possible
  btrfs: avoid attempt to drop extents when logging inode for the first time
  btrfs: do not commit delayed inode when logging a file in full sync mode

This is patch 5/10 and test results are listed in the change log of the
last patch in the set.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index fc22cd81ea910c19fa96e6fd7310f081327460e0..39648f4048bc7b7f3137eb40b95e2688da66d004 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3881,17 +3881,21 @@ again:
  * This cannot be run for file data extents because it does not
  * free the extents they point to.
  */
-static int drop_objectid_items(struct btrfs_trans_handle *trans,
+static int drop_inode_items(struct btrfs_trans_handle *trans,
                                  struct btrfs_root *log,
                                  struct btrfs_path *path,
-                                 u64 objectid, int max_key_type)
+                                 struct btrfs_inode *inode,
+                                 int max_key_type)
 {
        int ret;
        struct btrfs_key key;
        struct btrfs_key found_key;
        int start_slot;
 
-       key.objectid = objectid;
+       if (!inode_logged(trans, inode))
+               return 0;
+
+       key.objectid = btrfs_ino(inode);
        key.type = max_key_type;
        key.offset = (u64)-1;
 
@@ -3908,7 +3912,7 @@ static int drop_objectid_items(struct btrfs_trans_handle *trans,
                btrfs_item_key_to_cpu(path->nodes[0], &found_key,
                                      path->slots[0]);
 
-               if (found_key.objectid != objectid)
+               if (found_key.objectid != key.objectid)
                        break;
 
                found_key.offset = 0;
@@ -5442,7 +5446,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
                clear_bit(BTRFS_INODE_COPY_EVERYTHING, &inode->runtime_flags);
                if (inode_only == LOG_INODE_EXISTS)
                        max_key_type = BTRFS_XATTR_ITEM_KEY;
-               ret = drop_objectid_items(trans, log, path, ino, max_key_type);
+               ret = drop_inode_items(trans, log, path, inode, max_key_type);
        } else {
                if (inode_only == LOG_INODE_EXISTS) {
                        /*
@@ -5466,8 +5470,8 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
                             &inode->runtime_flags)) {
                        if (inode_only == LOG_INODE_EXISTS) {
                                max_key.type = BTRFS_XATTR_ITEM_KEY;
-                               ret = drop_objectid_items(trans, log, path, ino,
-                                                         max_key.type);
+                               ret = drop_inode_items(trans, log, path, inode,
+                                                      max_key.type);
                        } else {
                                clear_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
                                          &inode->runtime_flags);
@@ -5486,8 +5490,8 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
                        if (inode_only == LOG_INODE_ALL)
                                fast_search = true;
                        max_key.type = BTRFS_XATTR_ITEM_KEY;
-                       ret = drop_objectid_items(trans, log, path, ino,
-                                                 max_key.type);
+                       ret = drop_inode_items(trans, log, path, inode,
+                                              max_key.type);
                } else {
                        if (inode_only == LOG_INODE_ALL)
                                fast_search = true;