Skip to content

Commit 45da9c1

Browse files
lorddoskiaskdave
authored andcommitted
btrfs: fix memory ordering between normal and ordered work functions
Ordered work functions aren't guaranteed to be handled by the same thread which executed the normal work functions. The only way execution between normal/ordered functions is synchronized is via the WORK_DONE_BIT, unfortunately the used bitops don't guarantee any ordering whatsoever. This manifested as seemingly inexplicable crashes on ARM64, where async_chunk::inode is seen as non-null in async_cow_submit which causes submit_compressed_extents to be called and crash occurs because async_chunk::inode suddenly became NULL. The call trace was similar to: pc : submit_compressed_extents+0x38/0x3d0 lr : async_cow_submit+0x50/0xd0 sp : ffff800015d4bc20 <registers omitted for brevity> Call trace: submit_compressed_extents+0x38/0x3d0 async_cow_submit+0x50/0xd0 run_ordered_work+0xc8/0x280 btrfs_work_helper+0x98/0x250 process_one_work+0x1f0/0x4ac worker_thread+0x188/0x504 kthread+0x110/0x114 ret_from_fork+0x10/0x18 Fix this by adding respective barrier calls which ensure that all accesses preceding setting of WORK_DONE_BIT are strictly ordered before setting the flag. At the same time add a read barrier after reading of WORK_DONE_BIT in run_ordered_work which ensures all subsequent loads would be strictly ordered after reading the bit. This in turn ensures are all accesses before WORK_DONE_BIT are going to be strictly ordered before any access that can occur in ordered_func. Reported-by: Chris Murphy <[email protected]> Fixes: 08a9ff3 ("btrfs: Added btrfs_workqueue_struct implemented ordered execution based on kernel workqueue") CC: [email protected] # 4.4+ Link: https://bugzilla.redhat.com/show_bug.cgi?id=2011928 Reviewed-by: Josef Bacik <[email protected]> Tested-by: Chris Murphy <[email protected]> Signed-off-by: Nikolay Borisov <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 6f019c0 commit 45da9c1

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

fs/btrfs/async-thread.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,13 @@ static void run_ordered_work(struct __btrfs_workqueue *wq,
234234
ordered_list);
235235
if (!test_bit(WORK_DONE_BIT, &work->flags))
236236
break;
237+
/*
238+
* Orders all subsequent loads after reading WORK_DONE_BIT,
239+
* paired with the smp_mb__before_atomic in btrfs_work_helper
240+
* this guarantees that the ordered function will see all
241+
* updates from ordinary work function.
242+
*/
243+
smp_rmb();
237244

238245
/*
239246
* we are going to call the ordered done function, but
@@ -317,6 +324,13 @@ static void btrfs_work_helper(struct work_struct *normal_work)
317324
thresh_exec_hook(wq);
318325
work->func(work);
319326
if (need_order) {
327+
/*
328+
* Ensures all memory accesses done in the work function are
329+
* ordered before setting the WORK_DONE_BIT. Ensuring the thread
330+
* which is going to executed the ordered work sees them.
331+
* Pairs with the smp_rmb in run_ordered_work.
332+
*/
333+
smp_mb__before_atomic();
320334
set_bit(WORK_DONE_BIT, &work->flags);
321335
run_ordered_work(wq, work);
322336
} else {

0 commit comments

Comments
 (0)