40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Wed, 14 Dec 2016 14:44:18 +0100
|
|
Subject: [PATCH] btrfs: drop trace_btrfs_all_work_done() from
|
|
normal_work_helper()
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patches-4.9-rt1.tar.xz
|
|
|
|
For btrfs_scrubparity_helper() the ->func() is set to
|
|
scrub_parity_bio_endio_worker(). This functions invokes invokes
|
|
scrub_free_parity() which kfrees() the worked object. All is good as
|
|
long as trace events are not enabled because we boom with a backtrace
|
|
like this:
|
|
| Workqueue: btrfs-endio btrfs_endio_helper
|
|
| RIP: 0010:[<ffffffff812f81ae>] [<ffffffff812f81ae>] trace_event_raw_event_btrfs__work__done+0x4e/0xa0
|
|
| Call Trace:
|
|
| [<ffffffff8136497d>] btrfs_scrubparity_helper+0x59d/0x780
|
|
| [<ffffffff81364c49>] btrfs_endio_helper+0x9/0x10
|
|
| [<ffffffff8108af8e>] process_one_work+0x26e/0x7b0
|
|
| [<ffffffff8108b516>] worker_thread+0x46/0x560
|
|
| [<ffffffff81091c4e>] kthread+0xee/0x110
|
|
| [<ffffffff818e166a>] ret_from_fork+0x2a/0x40
|
|
|
|
So in order to avoid this, I remove the trace point.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
fs/btrfs/async-thread.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
--- a/fs/btrfs/async-thread.c
|
|
+++ b/fs/btrfs/async-thread.c
|
|
@@ -318,8 +318,6 @@ static void normal_work_helper(struct bt
|
|
set_bit(WORK_DONE_BIT, &work->flags);
|
|
run_ordered_work(wq);
|
|
}
|
|
- if (!need_order)
|
|
- trace_btrfs_all_work_done(work);
|
|
}
|
|
|
|
void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t uniq_func,
|