Skip to content

Commit 547ea4e

Browse files
committed
btrfs: fix data races when accessing the reserved amount of block reserves
At space_info.c we have several places where we access the ->reserved field of a block reserve without taking the block reserve's spinlock first, which makes KCSAN warn about a data race since that field is always updated while holding the spinlock. The reports from KCSAN are like the following: [ 117.193526] BUG: KCSAN: data-race in btrfs_block_rsv_release [btrfs] / need_preemptive_reclaim [btrfs] [ 117.195148] read to 0x000000017f587190 of 8 bytes by task 6303 on cpu 3: [ 117.195172] need_preemptive_reclaim+0x222/0x2f0 [btrfs] [ 117.195992] __reserve_bytes+0xbb0/0xdc8 [btrfs] [ 117.196807] btrfs_reserve_metadata_bytes+0x4c/0x120 [btrfs] [ 117.197620] btrfs_block_rsv_add+0x78/0xa8 [btrfs] [ 117.198434] btrfs_delayed_update_inode+0x154/0x368 [btrfs] [ 117.199300] btrfs_update_inode+0x108/0x1c8 [btrfs] [ 117.200122] btrfs_dirty_inode+0xb4/0x140 [btrfs] [ 117.200937] btrfs_update_time+0x8c/0xb0 [btrfs] [ 117.201754] touch_atime+0x16c/0x1e0 [ 117.201789] filemap_read+0x674/0x728 [ 117.201823] btrfs_file_read_iter+0xf8/0x410 [btrfs] [ 117.202653] vfs_read+0x2b6/0x498 [ 117.203454] ksys_read+0xa2/0x150 [ 117.203473] __s390x_sys_read+0x68/0x88 [ 117.203495] do_syscall+0x1c6/0x210 [ 117.203517] __do_syscall+0xc8/0xf0 [ 117.203539] system_call+0x70/0x98 [ 117.203579] write to 0x000000017f587190 of 8 bytes by task 11 on cpu 0: [ 117.203604] btrfs_block_rsv_release+0x2e8/0x578 [btrfs] [ 117.204432] btrfs_delayed_inode_release_metadata+0x7c/0x1d0 [btrfs] [ 117.205259] __btrfs_update_delayed_inode+0x37c/0x5e0 [btrfs] [ 117.206093] btrfs_async_run_delayed_root+0x356/0x498 [btrfs] [ 117.206917] btrfs_work_helper+0x160/0x7a0 [btrfs] [ 117.207738] process_one_work+0x3b6/0x838 [ 117.207768] worker_thread+0x75e/0xb10 [ 117.207797] kthread+0x21a/0x230 [ 117.207830] __ret_from_fork+0x6c/0xb8 [ 117.207861] ret_from_fork+0xa/0x30 So add a helper to get the reserved amount of a block reserve while holding the lock. The value may be not be up to date anymore when used by need_preemptive_reclaim() and btrfs_preempt_reclaim_metadata_space(), but that's ok since the worst it can do is cause more reclaim work do be done sooner rather than later. Reading the field while holding the lock instead of using the data_race() annotation is used in order to prevent load tearing. Reviewed-by: David Sterba <[email protected]> Signed-off-by: Filipe Manana <[email protected]>
1 parent 3e968ba commit 547ea4e

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

fs/btrfs/block-rsv.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,20 @@ static inline bool btrfs_block_rsv_full(const struct btrfs_block_rsv *rsv)
108108
return data_race(rsv->full);
109109
}
110110

111+
/*
112+
* Get the reserved mount of a block reserve in a context where getting a stale
113+
* value is acceptable, instead of accessing it directly and trigger data race
114+
* warning from KCSAN.
115+
*/
116+
static inline u64 btrfs_block_rsv_reserved(struct btrfs_block_rsv *rsv)
117+
{
118+
u64 ret;
119+
120+
spin_lock(&rsv->lock);
121+
ret = rsv->reserved;
122+
spin_unlock(&rsv->lock);
123+
124+
return ret;
125+
}
126+
111127
#endif /* BTRFS_BLOCK_RSV_H */

fs/btrfs/space-info.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ btrfs_calc_reclaim_metadata_size(struct btrfs_fs_info *fs_info,
855855
static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info,
856856
struct btrfs_space_info *space_info)
857857
{
858-
u64 global_rsv_size = fs_info->global_block_rsv.reserved;
858+
const u64 global_rsv_size = btrfs_block_rsv_reserved(&fs_info->global_block_rsv);
859859
u64 ordered, delalloc;
860860
u64 thresh;
861861
u64 used;
@@ -955,8 +955,8 @@ static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info,
955955
ordered = percpu_counter_read_positive(&fs_info->ordered_bytes) >> 1;
956956
delalloc = percpu_counter_read_positive(&fs_info->delalloc_bytes);
957957
if (ordered >= delalloc)
958-
used += fs_info->delayed_refs_rsv.reserved +
959-
fs_info->delayed_block_rsv.reserved;
958+
used += btrfs_block_rsv_reserved(&fs_info->delayed_refs_rsv) +
959+
btrfs_block_rsv_reserved(&fs_info->delayed_block_rsv);
960960
else
961961
used += space_info->bytes_may_use - global_rsv_size;
962962

@@ -1172,7 +1172,7 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)
11721172
enum btrfs_flush_state flush;
11731173
u64 delalloc_size = 0;
11741174
u64 to_reclaim, block_rsv_size;
1175-
u64 global_rsv_size = global_rsv->reserved;
1175+
const u64 global_rsv_size = btrfs_block_rsv_reserved(global_rsv);
11761176

11771177
loops++;
11781178

@@ -1184,9 +1184,9 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)
11841184
* assume it's tied up in delalloc reservations.
11851185
*/
11861186
block_rsv_size = global_rsv_size +
1187-
delayed_block_rsv->reserved +
1188-
delayed_refs_rsv->reserved +
1189-
trans_rsv->reserved;
1187+
btrfs_block_rsv_reserved(delayed_block_rsv) +
1188+
btrfs_block_rsv_reserved(delayed_refs_rsv) +
1189+
btrfs_block_rsv_reserved(trans_rsv);
11901190
if (block_rsv_size < space_info->bytes_may_use)
11911191
delalloc_size = space_info->bytes_may_use - block_rsv_size;
11921192

@@ -1206,16 +1206,16 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)
12061206
to_reclaim = delalloc_size;
12071207
flush = FLUSH_DELALLOC;
12081208
} else if (space_info->bytes_pinned >
1209-
(delayed_block_rsv->reserved +
1210-
delayed_refs_rsv->reserved)) {
1209+
(btrfs_block_rsv_reserved(delayed_block_rsv) +
1210+
btrfs_block_rsv_reserved(delayed_refs_rsv))) {
12111211
to_reclaim = space_info->bytes_pinned;
12121212
flush = COMMIT_TRANS;
1213-
} else if (delayed_block_rsv->reserved >
1214-
delayed_refs_rsv->reserved) {
1215-
to_reclaim = delayed_block_rsv->reserved;
1213+
} else if (btrfs_block_rsv_reserved(delayed_block_rsv) >
1214+
btrfs_block_rsv_reserved(delayed_refs_rsv)) {
1215+
to_reclaim = btrfs_block_rsv_reserved(delayed_block_rsv);
12161216
flush = FLUSH_DELAYED_ITEMS_NR;
12171217
} else {
1218-
to_reclaim = delayed_refs_rsv->reserved;
1218+
to_reclaim = btrfs_block_rsv_reserved(delayed_refs_rsv);
12191219
flush = FLUSH_DELAYED_REFS_NR;
12201220
}
12211221

0 commit comments

Comments
 (0)