Skip to content

Commit cc870a4

Browse files
Sahitya Tummalagregkh
authored andcommitted
f2fs: do not use mutex lock in atomic context
[ Upstream commit 9083977 ] 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 <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 8bfb556 commit cc870a4

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

fs/f2fs/trace.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ void f2fs_trace_pid(struct page *page)
6161

6262
set_page_private(page, (unsigned long)pid);
6363

64+
retry:
6465
if (radix_tree_preload(GFP_NOFS))
6566
return;
6667

@@ -71,7 +72,12 @@ void f2fs_trace_pid(struct page *page)
7172
if (p)
7273
radix_tree_delete(&pids, pid);
7374

74-
f2fs_radix_tree_insert(&pids, pid, current);
75+
if (radix_tree_insert(&pids, pid, current)) {
76+
spin_unlock(&pids_lock);
77+
radix_tree_preload_end();
78+
cond_resched();
79+
goto retry;
80+
}
7581

7682
trace_printk("%3x:%3x %4x %-16s\n",
7783
MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev),

0 commit comments

Comments
 (0)