Skip to content

Commit ba3db22

Browse files
fdmananaSasha Levin
authored andcommitted
btrfs: fix a race between renames and directory logging
commit 3ca864d upstream. We have a race between a rename and directory inode logging that if it happens and we crash/power fail before the rename completes, the next time the filesystem is mounted, the log replay code will end up deleting the file that was being renamed. This is best explained following a step by step analysis of an interleaving of steps that lead into this situation. Consider the initial conditions: 1) We are at transaction N; 2) We have directories A and B created in a past transaction (< N); 3) We have inode X corresponding to a file that has 2 hardlinks, one in directory A and the other in directory B, so we'll name them as "A/foo_link1" and "B/foo_link2". Both hard links were persisted in a past transaction (< N); 4) We have inode Y corresponding to a file that as a single hard link and is located in directory A, we'll name it as "A/bar". This file was also persisted in a past transaction (< N). The steps leading to a file loss are the following and for all of them we are under transaction N: 1) Link "A/foo_link1" is removed, so inode's X last_unlink_trans field is updated to N, through btrfs_unlink() -> btrfs_record_unlink_dir(); 2) Task A starts a rename for inode Y, with the goal of renaming from "A/bar" to "A/baz", so we enter btrfs_rename(); 3) Task A inserts the new BTRFS_INODE_REF_KEY for inode Y by calling btrfs_insert_inode_ref(); 4) Because the rename happens in the same directory, we don't set the last_unlink_trans field of directoty A's inode to the current transaction id, that is, we don't cal btrfs_record_unlink_dir(); 5) Task A then removes the entries from directory A (BTRFS_DIR_ITEM_KEY and BTRFS_DIR_INDEX_KEY items) when calling __btrfs_unlink_inode() (actually the dir index item is added as a delayed item, but the effect is the same); 6) Now before task A adds the new entry "A/baz" to directory A by calling btrfs_add_link(), another task, task B is logging inode X; 7) Task B starts a fsync of inode X and after logging inode X, at btrfs_log_inode_parent() it calls btrfs_log_all_parents(), since inode X has a last_unlink_trans value of N, set at in step 1; 8) At btrfs_log_all_parents() we search for all parent directories of inode X using the commit root, so we find directories A and B and log them. Bu when logging direct A, we don't have a dir index item for inode Y anymore, neither the old name "A/bar" nor for the new name "A/baz" since the rename has deleted the old name but has not yet inserted the new name - task A hasn't called yet btrfs_add_link() to do that. Note that logging directory A doesn't fallback to a transaction commit because its last_unlink_trans has a lower value than the current transaction's id (see step 4); 9) Task B finishes logging directories A and B and gets back to btrfs_sync_file() where it calls btrfs_sync_log() to persist the log tree; 10) Task B successfully persisted the log tree, btrfs_sync_log() completed with success, and a power failure happened. We have a log tree without any directory entry for inode Y, so the log replay code deletes the entry for inode Y, name "A/bar", from the subvolume tree since it doesn't exist in the log tree and the log tree is authorative for its index (we logged a BTRFS_DIR_LOG_INDEX_KEY item that covers the index range for the dentry that corresponds to "A/bar"). Since there's no other hard link for inode Y and the log replay code deletes the name "A/bar", the file is lost. The issue wouldn't happen if task B synced the log only after task A called btrfs_log_new_name(), which would update the log with the new name for inode Y ("A/bar"). Fix this by pinning the log root during renames before removing the old directory entry, and unpinning after btrfs_log_new_name() is called. Fixes: 259c4b9 ("btrfs: stop doing unnecessary log updates during a rename") CC: [email protected] # 5.18+ Reviewed-by: Boris Burkov <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Signed-off-by: David Sterba <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8b5c502 commit ba3db22

File tree

1 file changed

+64
-17
lines changed

1 file changed

+64
-17
lines changed

fs/btrfs/inode.c

Lines changed: 64 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7979,6 +7979,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,
79797979
int ret;
79807980
int ret2;
79817981
bool need_abort = false;
7982+
bool logs_pinned = false;
79827983
struct fscrypt_name old_fname, new_fname;
79837984
struct fscrypt_str *old_name, *new_name;
79847985

@@ -8102,6 +8103,31 @@ static int btrfs_rename_exchange(struct inode *old_dir,
81028103
inode_inc_iversion(new_inode);
81038104
simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);
81048105

8106+
if (old_ino != BTRFS_FIRST_FREE_OBJECTID &&
8107+
new_ino != BTRFS_FIRST_FREE_OBJECTID) {
8108+
/*
8109+
* If we are renaming in the same directory (and it's not for
8110+
* root entries) pin the log early to prevent any concurrent
8111+
* task from logging the directory after we removed the old
8112+
* entries and before we add the new entries, otherwise that
8113+
* task can sync a log without any entry for the inodes we are
8114+
* renaming and therefore replaying that log, if a power failure
8115+
* happens after syncing the log, would result in deleting the
8116+
* inodes.
8117+
*
8118+
* If the rename affects two different directories, we want to
8119+
* make sure the that there's no log commit that contains
8120+
* updates for only one of the directories but not for the
8121+
* other.
8122+
*
8123+
* If we are renaming an entry for a root, we don't care about
8124+
* log updates since we called btrfs_set_log_full_commit().
8125+
*/
8126+
btrfs_pin_log_trans(root);
8127+
btrfs_pin_log_trans(dest);
8128+
logs_pinned = true;
8129+
}
8130+
81058131
if (old_dentry->d_parent != new_dentry->d_parent) {
81068132
btrfs_record_unlink_dir(trans, BTRFS_I(old_dir),
81078133
BTRFS_I(old_inode), true);
@@ -8173,30 +8199,23 @@ static int btrfs_rename_exchange(struct inode *old_dir,
81738199
BTRFS_I(new_inode)->dir_index = new_idx;
81748200

81758201
/*
8176-
* Now pin the logs of the roots. We do it to ensure that no other task
8177-
* can sync the logs while we are in progress with the rename, because
8178-
* that could result in an inconsistency in case any of the inodes that
8179-
* are part of this rename operation were logged before.
8202+
* Do the log updates for all inodes.
8203+
*
8204+
* If either entry is for a root we don't need to update the logs since
8205+
* we've called btrfs_set_log_full_commit() before.
81808206
*/
8181-
if (old_ino != BTRFS_FIRST_FREE_OBJECTID)
8182-
btrfs_pin_log_trans(root);
8183-
if (new_ino != BTRFS_FIRST_FREE_OBJECTID)
8184-
btrfs_pin_log_trans(dest);
8185-
8186-
/* Do the log updates for all inodes. */
8187-
if (old_ino != BTRFS_FIRST_FREE_OBJECTID)
8207+
if (logs_pinned) {
81888208
btrfs_log_new_name(trans, old_dentry, BTRFS_I(old_dir),
81898209
old_rename_ctx.index, new_dentry->d_parent);
8190-
if (new_ino != BTRFS_FIRST_FREE_OBJECTID)
81918210
btrfs_log_new_name(trans, new_dentry, BTRFS_I(new_dir),
81928211
new_rename_ctx.index, old_dentry->d_parent);
8212+
}
81938213

8194-
/* Now unpin the logs. */
8195-
if (old_ino != BTRFS_FIRST_FREE_OBJECTID)
8214+
out_fail:
8215+
if (logs_pinned) {
81968216
btrfs_end_log_trans(root);
8197-
if (new_ino != BTRFS_FIRST_FREE_OBJECTID)
81988217
btrfs_end_log_trans(dest);
8199-
out_fail:
8218+
}
82008219
ret2 = btrfs_end_transaction(trans);
82018220
ret = ret ? ret : ret2;
82028221
out_notrans:
@@ -8246,6 +8265,7 @@ static int btrfs_rename(struct mnt_idmap *idmap,
82468265
int ret2;
82478266
u64 old_ino = btrfs_ino(BTRFS_I(old_inode));
82488267
struct fscrypt_name old_fname, new_fname;
8268+
bool logs_pinned = false;
82498269

82508270
if (btrfs_ino(BTRFS_I(new_dir)) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)
82518271
return -EPERM;
@@ -8380,6 +8400,29 @@ static int btrfs_rename(struct mnt_idmap *idmap,
83808400
inode_inc_iversion(old_inode);
83818401
simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);
83828402

8403+
if (old_ino != BTRFS_FIRST_FREE_OBJECTID) {
8404+
/*
8405+
* If we are renaming in the same directory (and it's not a
8406+
* root entry) pin the log to prevent any concurrent task from
8407+
* logging the directory after we removed the old entry and
8408+
* before we add the new entry, otherwise that task can sync
8409+
* a log without any entry for the inode we are renaming and
8410+
* therefore replaying that log, if a power failure happens
8411+
* after syncing the log, would result in deleting the inode.
8412+
*
8413+
* If the rename affects two different directories, we want to
8414+
* make sure the that there's no log commit that contains
8415+
* updates for only one of the directories but not for the
8416+
* other.
8417+
*
8418+
* If we are renaming an entry for a root, we don't care about
8419+
* log updates since we called btrfs_set_log_full_commit().
8420+
*/
8421+
btrfs_pin_log_trans(root);
8422+
btrfs_pin_log_trans(dest);
8423+
logs_pinned = true;
8424+
}
8425+
83838426
if (old_dentry->d_parent != new_dentry->d_parent)
83848427
btrfs_record_unlink_dir(trans, BTRFS_I(old_dir),
83858428
BTRFS_I(old_inode), true);
@@ -8444,7 +8487,7 @@ static int btrfs_rename(struct mnt_idmap *idmap,
84448487
if (old_inode->i_nlink == 1)
84458488
BTRFS_I(old_inode)->dir_index = index;
84468489

8447-
if (old_ino != BTRFS_FIRST_FREE_OBJECTID)
8490+
if (logs_pinned)
84488491
btrfs_log_new_name(trans, old_dentry, BTRFS_I(old_dir),
84498492
rename_ctx.index, new_dentry->d_parent);
84508493

@@ -8460,6 +8503,10 @@ static int btrfs_rename(struct mnt_idmap *idmap,
84608503
}
84618504
}
84628505
out_fail:
8506+
if (logs_pinned) {
8507+
btrfs_end_log_trans(root);
8508+
btrfs_end_log_trans(dest);
8509+
}
84638510
ret2 = btrfs_end_transaction(trans);
84648511
ret = ret ? ret : ret2;
84658512
out_notrans:

0 commit comments

Comments
 (0)