Skip to content

Commit 25bf1e6

Browse files
fdmananakdave
authored andcommitted
btrfs: fix race between logging inode and checking if it was logged before
There's a race between checking if an inode was logged before and logging an inode that can cause us to mark an inode as not logged just after it was logged by a concurrent task: 1) We have inode X which was not logged before neither in the current transaction not in past transaction since the inode was loaded into memory, so it's ->logged_trans value is 0; 2) We are at transaction N; 3) Task A calls inode_logged() against inode X, sees that ->logged_trans is 0 and there is a log tree and so it proceeds to search in the log tree for an inode item for inode X. It doesn't see any, but before it sets ->logged_trans to N - 1... 3) Task B calls btrfs_log_inode() against inode X, logs the inode and sets ->logged_trans to N; 4) Task A now sets ->logged_trans to N - 1; 5) At this point anyone calling inode_logged() gets 0 (inode not logged) since ->logged_trans is greater than 0 and less than N, but our inode was really logged. As a consequence operations like rename, unlink and link that happen afterwards in the current transaction end up not updating the log when they should. Fix this by ensuring inode_logged() only updates ->logged_trans in case the inode item is not found in the log tree if after tacking the inode's lock (spinlock struct btrfs_inode::lock) the ->logged_trans value is still zero, since the inode lock is what protects setting ->logged_trans at btrfs_log_inode(). Fixes: 0f8ce49 ("btrfs: avoid inode logging during rename and link when possible") Reviewed-by: Boris Burkov <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 7a319ef commit 25bf1e6

File tree

1 file changed

+30
-6
lines changed

1 file changed

+30
-6
lines changed

fs/btrfs/tree-log.c

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3483,6 +3483,31 @@ int btrfs_free_log_root_tree(struct btrfs_trans_handle *trans,
34833483
return 0;
34843484
}
34853485

3486+
static bool mark_inode_as_not_logged(const struct btrfs_trans_handle *trans,
3487+
struct btrfs_inode *inode)
3488+
{
3489+
bool ret = false;
3490+
3491+
/*
3492+
* Do this only if ->logged_trans is still 0 to prevent races with
3493+
* concurrent logging as we may see the inode not logged when
3494+
* inode_logged() is called but it gets logged after inode_logged() did
3495+
* not find it in the log tree and we end up setting ->logged_trans to a
3496+
* value less than trans->transid after the concurrent logging task has
3497+
* set it to trans->transid. As a consequence, subsequent rename, unlink
3498+
* and link operations may end up not logging new names and removing old
3499+
* names from the log.
3500+
*/
3501+
spin_lock(&inode->lock);
3502+
if (inode->logged_trans == 0)
3503+
inode->logged_trans = trans->transid - 1;
3504+
else if (inode->logged_trans == trans->transid)
3505+
ret = true;
3506+
spin_unlock(&inode->lock);
3507+
3508+
return ret;
3509+
}
3510+
34863511
/*
34873512
* Check if an inode was logged in the current transaction. This correctly deals
34883513
* with the case where the inode was logged but has a logged_trans of 0, which
@@ -3517,10 +3542,8 @@ static int inode_logged(const struct btrfs_trans_handle *trans,
35173542
* transaction's ID, to avoid the search below in a future call in case
35183543
* a log tree gets created after this.
35193544
*/
3520-
if (!test_bit(BTRFS_ROOT_HAS_LOG_TREE, &inode->root->state)) {
3521-
inode->logged_trans = trans->transid - 1;
3522-
return 0;
3523-
}
3545+
if (!test_bit(BTRFS_ROOT_HAS_LOG_TREE, &inode->root->state))
3546+
return mark_inode_as_not_logged(trans, inode);
35243547

35253548
/*
35263549
* We have a log tree and the inode's logged_trans is 0. We can't tell
@@ -3574,16 +3597,17 @@ static int inode_logged(const struct btrfs_trans_handle *trans,
35743597
* Set logged_trans to a value greater than 0 and less then the
35753598
* current transaction to avoid doing the search in future calls.
35763599
*/
3577-
inode->logged_trans = trans->transid - 1;
3578-
return 0;
3600+
return mark_inode_as_not_logged(trans, inode);
35793601
}
35803602

35813603
/*
35823604
* The inode was previously logged and then evicted, set logged_trans to
35833605
* the current transacion's ID, to avoid future tree searches as long as
35843606
* the inode is not evicted again.
35853607
*/
3608+
spin_lock(&inode->lock);
35863609
inode->logged_trans = trans->transid;
3610+
spin_unlock(&inode->lock);
35873611

35883612
/*
35893613
* If it's a directory, then we must set last_dir_index_offset to the

0 commit comments

Comments
 (0)