* [PATCH] f2fs: speed up gc_urgent mode with SSR and more discard commands
@ 2017-09-09 18:17 Jaegeuk Kim
2017-09-09 19:19 ` Jaegeuk Kim
0 siblings, 1 reply; 2+ messages in thread
From: Jaegeuk Kim @ 2017-09-09 18:17 UTC (permalink / raw)
To: linux-kernel, linux-fsdevel, linux-f2fs-devel; +Cc: Jaegeuk Kim
From: Jaegeuk Kim <jaegeuk@google.com>
This patch activates SSR and issuing more discard commands in gc_urgent mode.
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
fs/f2fs/f2fs.h | 1 +
fs/f2fs/segment.c | 19 ++++++++++++++++++-
fs/f2fs/segment.h | 13 -------------
3 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 7a467fcd4bcd..3fbf55e41694 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2517,6 +2517,7 @@ void destroy_node_manager_caches(void);
/*
* segment.c
*/
+bool need_SSR(struct f2fs_sb_info *sbi);
void register_inmem_page(struct inode *inode, struct page *page);
void drop_inmem_pages(struct inode *inode);
void drop_inmem_page(struct inode *inode, struct page *page);
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 9e708e525ba8..d6e0c160a268 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -168,6 +168,21 @@ static unsigned long __find_rev_next_zero_bit(const unsigned long *addr,
return result - size + __reverse_ffz(tmp);
}
+bool need_SSR(struct f2fs_sb_info *sbi)
+{
+ int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
+ int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
+ int imeta_secs = get_blocktype_secs(sbi, F2FS_DIRTY_IMETA);
+
+ if (test_opt(sbi, LFS))
+ return false;
+ if (sbi->gc_thread && sbi->gc_thread->gc_urgent)
+ return true;
+
+ return free_sections(sbi) <= (node_secs + 2 * dent_secs + imeta_secs +
+ 2 * reserved_sections(sbi));
+}
+
void register_inmem_page(struct inode *inode, struct page *page)
{
struct f2fs_inode_info *fi = F2FS_I(inode);
@@ -1203,6 +1218,7 @@ static int issue_discard_thread(void *data)
wait_queue_head_t *q = &dcc->discard_wait_queue;
unsigned int wait_ms = DEF_MIN_DISCARD_ISSUE_TIME;
int issued;
+ bool urgent = false;
set_freezable();
@@ -1218,13 +1234,14 @@ static int issue_discard_thread(void *data)
if (dcc->discard_wake) {
dcc->discard_wake = 0;
+ urgent = sbi->gc_thread && sbi->gc_thread->gc_urgent;
if (sbi->gc_thread && sbi->gc_thread->gc_urgent)
mark_discard_range_all(sbi);
}
sb_start_intwrite(sbi->sb);
- issued = __issue_discard_cmd(sbi, true);
+ issued = __issue_discard_cmd(sbi, !urgent);
if (issued) {
__wait_discard_cmd(sbi, true);
wait_ms = DEF_MIN_DISCARD_ISSUE_TIME;
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 613b2fa7b1c1..e0a6cc23ace3 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -497,19 +497,6 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi)
return GET_SEC_FROM_SEG(sbi, (unsigned int)reserved_segments(sbi));
}
-static inline bool need_SSR(struct f2fs_sb_info *sbi)
-{
- int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
- int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
- int imeta_secs = get_blocktype_secs(sbi, F2FS_DIRTY_IMETA);
-
- if (test_opt(sbi, LFS))
- return false;
-
- return free_sections(sbi) <= (node_secs + 2 * dent_secs + imeta_secs +
- 2 * reserved_sections(sbi));
-}
-
static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,
int freed, int needed)
{
--
2.14.0.rc1.383.gd1ce394fe2-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] f2fs: speed up gc_urgent mode with SSR and more discard commands
2017-09-09 18:17 [PATCH] f2fs: speed up gc_urgent mode with SSR and more discard commands Jaegeuk Kim
@ 2017-09-09 19:19 ` Jaegeuk Kim
0 siblings, 0 replies; 2+ messages in thread
From: Jaegeuk Kim @ 2017-09-09 19:19 UTC (permalink / raw)
To: linux-kernel, linux-fsdevel, linux-f2fs-devel; +Cc: Jaegeuk Kim
It turns out it doesn't need to change discarding policy below.
I submitted another patch to modify SSR mode only.
Thanks,
On 09/09, Jaegeuk Kim wrote:
> From: Jaegeuk Kim <jaegeuk@google.com>
>
> This patch activates SSR and issuing more discard commands in gc_urgent mode.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
> ---
> fs/f2fs/f2fs.h | 1 +
> fs/f2fs/segment.c | 19 ++++++++++++++++++-
> fs/f2fs/segment.h | 13 -------------
> 3 files changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 7a467fcd4bcd..3fbf55e41694 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -2517,6 +2517,7 @@ void destroy_node_manager_caches(void);
> /*
> * segment.c
> */
> +bool need_SSR(struct f2fs_sb_info *sbi);
> void register_inmem_page(struct inode *inode, struct page *page);
> void drop_inmem_pages(struct inode *inode);
> void drop_inmem_page(struct inode *inode, struct page *page);
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 9e708e525ba8..d6e0c160a268 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -168,6 +168,21 @@ static unsigned long __find_rev_next_zero_bit(const unsigned long *addr,
> return result - size + __reverse_ffz(tmp);
> }
>
> +bool need_SSR(struct f2fs_sb_info *sbi)
> +{
> + int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
> + int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
> + int imeta_secs = get_blocktype_secs(sbi, F2FS_DIRTY_IMETA);
> +
> + if (test_opt(sbi, LFS))
> + return false;
> + if (sbi->gc_thread && sbi->gc_thread->gc_urgent)
> + return true;
> +
> + return free_sections(sbi) <= (node_secs + 2 * dent_secs + imeta_secs +
> + 2 * reserved_sections(sbi));
> +}
> +
> void register_inmem_page(struct inode *inode, struct page *page)
> {
> struct f2fs_inode_info *fi = F2FS_I(inode);
> @@ -1203,6 +1218,7 @@ static int issue_discard_thread(void *data)
> wait_queue_head_t *q = &dcc->discard_wait_queue;
> unsigned int wait_ms = DEF_MIN_DISCARD_ISSUE_TIME;
> int issued;
> + bool urgent = false;
>
> set_freezable();
>
> @@ -1218,13 +1234,14 @@ static int issue_discard_thread(void *data)
>
> if (dcc->discard_wake) {
> dcc->discard_wake = 0;
> + urgent = sbi->gc_thread && sbi->gc_thread->gc_urgent;
> if (sbi->gc_thread && sbi->gc_thread->gc_urgent)
> mark_discard_range_all(sbi);
> }
>
> sb_start_intwrite(sbi->sb);
>
> - issued = __issue_discard_cmd(sbi, true);
> + issued = __issue_discard_cmd(sbi, !urgent);
> if (issued) {
> __wait_discard_cmd(sbi, true);
> wait_ms = DEF_MIN_DISCARD_ISSUE_TIME;
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index 613b2fa7b1c1..e0a6cc23ace3 100644
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -497,19 +497,6 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi)
> return GET_SEC_FROM_SEG(sbi, (unsigned int)reserved_segments(sbi));
> }
>
> -static inline bool need_SSR(struct f2fs_sb_info *sbi)
> -{
> - int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
> - int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
> - int imeta_secs = get_blocktype_secs(sbi, F2FS_DIRTY_IMETA);
> -
> - if (test_opt(sbi, LFS))
> - return false;
> -
> - return free_sections(sbi) <= (node_secs + 2 * dent_secs + imeta_secs +
> - 2 * reserved_sections(sbi));
> -}
> -
> static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,
> int freed, int needed)
> {
> --
> 2.14.0.rc1.383.gd1ce394fe2-goog
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-09 19:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-09 18:17 [PATCH] f2fs: speed up gc_urgent mode with SSR and more discard commands Jaegeuk Kim
2017-09-09 19:19 ` Jaegeuk Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).