]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
f2fs: do not use mutex lock in atomic context
authorSahitya Tummala <stummala@codeaurora.org>
Mon, 4 Feb 2019 08:06:53 +0000 (13:36 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Apr 2019 20:31:27 +0000 (22:31 +0200)
[ 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>
fs/f2fs/trace.c

index bccbbf2616d2b2cd3e5c3380b809f545dc1802a9..8ac1851a21c0796dc7544f0b73151e91e9cf36e8 100644 (file)
@@ -61,6 +61,7 @@ void f2fs_trace_pid(struct page *page)
 
        set_page_private(page, (unsigned long)pid);
 
+retry:
        if (radix_tree_preload(GFP_NOFS))
                return;
 
@@ -71,7 +72,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),