Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-19 03:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

f2fs: try to freeze in gc and discard threads

Browse Source 
This allows to freeze gc and discard threads.

Cc: stable@vger.kernel.org
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Jaegeuk Kim 2017-05-17 10:36:58 -07:00
parent b7b7c4cf1c
commit 1d7be27082
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/f2fs/gc.c
View File

@ -32,13 +32,14 @@ static int gc_thread_func(void *data)
wait_ms = gc_th->min_sleep_time; wait_ms = gc_th->min_sleep_time;
set_freezable();
do { do {
wait_event_interruptible_timeout(*wq,
kthread_should_stop() || freezing(current),
msecs_to_jiffies(wait_ms));
if (try_to_freeze()) if (try_to_freeze())
continue; continue;
else
wait_event_interruptible_timeout(*wq,
kthread_should_stop(),
msecs_to_jiffies(wait_ms));
if (kthread_should_stop()) if (kthread_should_stop())
break; break;

25
fs/f2fs/segment.c
View File

@ -16,6 +16,7 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/freezer.h>
#include "f2fs.h" #include "f2fs.h"
#include "segment.h" #include "segment.h"
@ -1059,18 +1060,24 @@ static int issue_discard_thread(void *data)
struct f2fs_sb_info *sbi = data; struct f2fs_sb_info *sbi = data;
struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info; struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
wait_queue_head_t *q = &dcc->discard_wait_queue; wait_queue_head_t *q = &dcc->discard_wait_queue;
repeat:
if (kthread_should_stop())
return 0;
__issue_discard_cmd(sbi, true); set_freezable();
__wait_discard_cmd(sbi, true);
congestion_wait(BLK_RW_SYNC, HZ/50); do {
wait_event_interruptible(*q, kthread_should_stop() ||
freezing(current) ||
atomic_read(&dcc->discard_cmd_cnt));
if (try_to_freeze())
continue;
if (kthread_should_stop())
return 0;
wait_event_interruptible(*q, kthread_should_stop() || __issue_discard_cmd(sbi, true);
atomic_read(&dcc->discard_cmd_cnt)); __wait_discard_cmd(sbi, true);
goto repeat;
congestion_wait(BLK_RW_SYNC, HZ/50);
} while (!kthread_should_stop());
return 0;
} }
#ifdef CONFIG_BLK_DEV_ZONED #ifdef CONFIG_BLK_DEV_ZONED