diff options
author | Sahitya Tummala <stummala@codeaurora.org> | 2019-02-04 13:36:53 +0530 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-27 09:33:49 +0200 |
commit | 9b7e7899386f1da3ec30abed61ea720237ff3e49 (patch) | |
tree | c2a1d6395ccb2b96e52f4b5634e537d191e7a25f | |
parent | 6c96456d930248f2ad63dbd44ef3bfb0dfbda764 (diff) | |
download | linux-stable-9b7e7899386f1da3ec30abed61ea720237ff3e49.tar.gz linux-stable-9b7e7899386f1da3ec30abed61ea720237ff3e49.tar.bz2 linux-stable-9b7e7899386f1da3ec30abed61ea720237ff3e49.zip |
f2fs: do not use mutex lock in atomic context
[ Upstream commit 9083977dabf3833298ddcd40dee28687f1e6b483 ]
Fix below warning coming because of using mutex lock in atomic context.
BUG: sleeping function called from invalid context at kernel/locking/mutex.c:98
in_atomic(): 1, irqs_disabled(): 0, pid: 585, name: sh
Preemption disabled at: __radix_tree_preload+0x28/0x130
Call trace:
dump_backtrace+0x0/0x2b4
show_stack+0x20/0x28
dump_stack+0xa8/0xe0
___might_sleep+0x144/0x194
__might_sleep+0x58/0x8c
mutex_lock+0x2c/0x48
f2fs_trace_pid+0x88/0x14c
f2fs_set_node_page_dirty+0xd0/0x184
Do not use f2fs_radix_tree_insert() to avoid doing cond_resched() with
spin_lock() acquired.
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | fs/f2fs/trace.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/f2fs/trace.c b/fs/f2fs/trace.c index 145fb659ad44..8f327fa7ae47 100644 --- a/fs/f2fs/trace.c +++ b/fs/f2fs/trace.c @@ -60,6 +60,7 @@ void f2fs_trace_pid(struct page *page) page->private = pid; +retry: if (radix_tree_preload(GFP_NOFS)) return; @@ -70,7 +71,12 @@ void f2fs_trace_pid(struct page *page) if (p) radix_tree_delete(&pids, pid); - f2fs_radix_tree_insert(&pids, pid, current); + if (radix_tree_insert(&pids, pid, current)) { + spin_unlock(&pids_lock); + radix_tree_preload_end(); + cond_resched(); + goto retry; + } trace_printk("%3x:%3x %4x %-16s\n", MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev), |