Skip to content

Commit

Permalink
f2fs: fix potential hangtask in f2fs_trace_pid
Browse files Browse the repository at this point in the history
As Jia-Ju Bai reported:

"According to fs/f2fs/trace.c, the kernel module may sleep under a spinlock.
The function call path is:
f2fs_trace_pid (acquire the spinlock)
   f2fs_radix_tree_insert
     cond_resched --> may sleep

I do not find a good way to fix it, so I only report.
This possible bug is found by my static analysis tool (DSAC) and my code
review."

Obviously, it's problemetic to schedule in critical region of spinlock,
which will cause uninterruptable sleep if there is no waker.

This patch changes to use mutex lock intead of spinlock to avoid this
condition.

Reported-by: Jia-Ju Bai <[email protected]>
Signed-off-by: Chao Yu <[email protected]>
Signed-off-by: Jaegeuk Kim <[email protected]>
  • Loading branch information
chaseyu authored and Jaegeuk Kim committed Jan 3, 2018
1 parent c376fc0 commit 4635b46
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions fs/f2fs/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "trace.h"

static RADIX_TREE(pids, GFP_ATOMIC);
static spinlock_t pids_lock;
static struct mutex pids_lock;
static struct last_io_info last_io;

static inline void __print_last_io(void)
Expand Down Expand Up @@ -64,7 +64,7 @@ void f2fs_trace_pid(struct page *page)
if (radix_tree_preload(GFP_NOFS))
return;

spin_lock(&pids_lock);
mutex_lock(&pids_lock);
p = radix_tree_lookup(&pids, pid);
if (p == current)
goto out;
Expand All @@ -77,7 +77,7 @@ void f2fs_trace_pid(struct page *page)
MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev),
pid, current->comm);
out:
spin_unlock(&pids_lock);
mutex_unlock(&pids_lock);
radix_tree_preload_end();
}

Expand Down Expand Up @@ -122,7 +122,7 @@ void f2fs_trace_ios(struct f2fs_io_info *fio, int flush)

void f2fs_build_trace_ios(void)
{
spin_lock_init(&pids_lock);
mutex_init(&pids_lock);
}

#define PIDVEC_SIZE 128
Expand Down Expand Up @@ -150,13 +150,13 @@ void f2fs_destroy_trace_ios(void)
pid_t next_pid = 0;
unsigned int found;

spin_lock(&pids_lock);
mutex_lock(&pids_lock);
while ((found = gang_lookup_pids(pid, next_pid, PIDVEC_SIZE))) {
unsigned idx;

next_pid = pid[found - 1] + 1;
for (idx = 0; idx < found; idx++)
radix_tree_delete(&pids, pid[idx]);
}
spin_unlock(&pids_lock);
mutex_unlock(&pids_lock);
}

0 comments on commit 4635b46

Please sign in to comment.