f2fs: avoid congestion_wait when do_checkpoint for better performance
Subsystems (2)
Hi Gu,
Quoted 9 lines
Hi Yuan,
Quoted 4 lines · Yuan Zhong
Previously,
do_checkpoint()will callcongestion_wait()for waiting the pages (previous submitted node/meta/data pages) to be written back. Becausecongestion_wait()will set a regular period (e.g. HZ / 50 ) for waiting.
For this reason, there is a situation that after the pages have been written back,
but the checkpoint thread still wait forcongestion_waitto exit.How do you confirm this issue?
I traced the execution path.
In f2fs_end_io_write, dec_page_count(p->sbi, F2FS_WRITEBACK) will be called. And I found that, when pages of F2FS_WRITEBACK has been zero, but checkpoint thread still congestion_wait for pages of F2FS_WRITEBACK to be zero. So, I think this point could be improved.
And I wrote a simple test case and tested on Micro-SD card, the steps as following:
(a) create a fixed-size file (4KB)
(b) go on to sync the file
(c) go back to step #a (fixed numbers of cycling:1024)
The results indicated that the execution time is reduced greatly by using this patch.
Quoted 2 lines
I suspect that the block-core does not have a wake-up mechanism when the back device is uncongested.
Yes, you are right.
So I wake up the checkpoint thread by myself, when pages of F2FS_WRITEBACK to be zero. In f2fs_end_io_write, f2fs_writeback_wait is called.
you cloud find this code in my patch.
Quoted 9 lines
Quoted 4 lines
This is a problem here, especially, when sync a large number of small files or dirs. In order to avoid this, a
wait_listis introduced,
the checkpoint thread will be dropped into thewait_listif the pages have not been written back, and will be waked up by contrast.Please pay some attention to the mail form, this mail is out of format in my mail client.
Regards,
Gu
Regards,
Yuan
Quoted 83 lines
Quoted 83 lines
Signed-off-by Yuan Zhong <[email protected]>---
fs/f2fs/checkpoint.c | 3 +-- fs/f2fs/f2fs.h | 19 +++++++++++++++++++ fs/f2fs/segment.c | 1 + fs/f2fs/super.c | 1 + 4 files changed, 22 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +1
-2@@ -758,8 +758,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); +f2fs_writeback_wait (sbi);filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +19
-0@@ -18,6 +18,8 @@#include <linux/crc32.h> #include <linux/magic.h> #include <linux/kobject.h> +#include <linux/wait.h> +#include <linux/sched.h> /* * For mount options @@ -368,6 +370,7 @@ struct f2fs_sb_info {struct mutex fs_lock[NR_GLOBAL_LOCKS ];/* blocking FS operations */ struct mutex node_write;/* locking node writes */ struct mutex writepages;/* mutex for writepages() */ +wait_queue_head_t writeback_wqh;/* wait_queue for writeback */ unsigned char next_lock_num;/* round-robin global locks */ int por_doing;/* recovery is doing or not */ int on_build_free_nids;/* build_free_nids is doing */ @@ -961,6 +964,22 @@ static inline int f2fs_readonly(struct super_block *sb)return sb->s_flags &MS_RDONLY ; } +static inline void f2fs_writeback_wait (struct f2fs_sb_info *sbi) +{ +DEFINE_WAIT (wait); + +prepare_to_wait (&sbi->writeback_wqh, &wait,TASK_UNINTERRUPTIBLE ); +if (get_pages (sbi,F2FS_WRITEBACK )) +io_schedule (); +finish_wait (&sbi->writeback_wqh, &wait); +} + +static inline void f2fs_writeback_wake (struct f2fs_sb_info *sbi) +{ +if (!get_pages (sbi,F2FS_WRITEBACK )) +wake_up_all (&sbi->writeback_wqh); +} +/* * file.c */ fs/f2fs/segment.c +1
-0@@ -597,6 +597,7 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); +f2fs_writeback_wake (p->sbi);kfree (p);bio_put (bio); }fs/f2fs/super.c +0
-0
Quoted 8 lines
fs/f2fs/super.c static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · line 841
Quoted 8 lines
fs/f2fs/super.c +1
-0@@ -835,6 +835,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)mutex_init (&sbi->gc_mutex);mutex_init (&sbi->writepages);mutex_init (&sbi->cp_mutex); +init_waitqueue_head (&sbi->writeback_wqh);for (i =0 ; i <NR_GLOBAL_LOCKS ; i++)mutex_init (&sbi->fs_lock[i]);mutex_init (&sbi->node_write);
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
Hi Yuan,
Quoted 10 lines · Yuan Zhong
Hi Gu,
Quoted 7 lines
Hi Yuan,
Quoted 4 lines · Yuan Zhong
Previously,
do_checkpoint()will callcongestion_wait()for waiting the pages (previous submitted node/meta/data pages) to be written back. Becausecongestion_wait()will set a regular period (e.g. HZ / 50 ) for waiting.
For this reason, there is a situation that after the pages have been written back,
but the checkpoint thread still wait forcongestion_waitto exit.
Quoted 6 lines
Quoted 1 line
How do you confirm this issue?
I traced the execution path.
Inf2fs_end_io_write,dec_page_count(p->sbi, F2FS_WRITEBACK)will be called. And I found that, when pages ofF2FS_WRITEBACKhas been zero, but checkpoint thread stillcongestion_waitfor pages ofF2FS_WRITEBACKto be zero.
Yes, it maybe. Congestion_wait add the task to a global wait queue which related to all back devices, so if F2FS_WRITEBACK has been zero, but other io may be still going on. Anyway, using a private wait queue to hold is a better choose.:)
Quoted 6 lines
So, I think this point could be improved.
And I wrote a simple test case and tested on Micro-SD card, the steps as following:
(a) create a fixed-size file (4KB)
(b) go on to sync the file
(c) go back to step #a (fixed numbers of cycling:1024)
The results indicated that the execution time is reduced greatly by using this patch.
Yes, the change is an improvement if the issue is existent.
Quoted 10 lines
Quoted 4 lines
I suspect that the block-core does not have a wake-up mechanism when the back device is uncongested.
Yes, you are right.
So I wake up the checkpoint thread by myself, when pages ofF2FS_WRITEBACKto be zero. Inf2fs_end_io_write,f2fs_writeback_waitis called.
you cloud find this code in my patch.
Saw it.:)
But one problem is that the checkpoint routine always is singleton, so the wait queue just services only one body, it seems not very worthy. How about just schedule and wake up it directly? See the following one.
--- fs/f2fs/checkpoint.c | 11 +++++++++-- fs/f2fs/f2fs.h | 1 + fs/f2fs/segment.c | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-)
fs/f2fs/checkpoint.c +9 -2
@@ -757,8 +757,15 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); + sbi->cp_task = current; +while (get_pages (sbi,F2FS_WRITEBACK )) { +set_current_state (TASK_UNINTERRUPTIBLE ); +if (!get_pages (sbi,F2FS_WRITEBACK )) +break ; +io_schedule (); + } +__set_current_state (TASK_RUNNING ); + sbi->cp_task =NULL ;filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );
fs/f2fs/f2fs.h +1 -0
@@ -365,6 +365,7 @@ struct f2fs_sb_info {struct mutex writepages;/* mutex for writepages() */ int por_doing;/* recovery is doing or not */ int on_build_free_nids;/* build_free_nids is doing */ +struct task_struct *cp_task;/* checkpoint task */ /* for orphan inode management */ struct list_head orphan_inode_list;/* orphan inode list */
fs/f2fs/segment.c +4 -0
@@ -597,6 +597,10 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); + +if (!get_pages (p->sbi,F2FS_WRITEBACK ) && p->sbi->cp_task) +wake_up_process (p->sbi->cp_task); +kfree (p);bio_put (bio); }
Signature · 4 lines
1.7.7 Regards, Gu
Quoted 106 lines
Quoted 11 lines
Quoted 6 lines
This is a problem here, especially, when sync a large number of small files or dirs. In order to avoid this, a
wait_listis introduced,
the checkpoint thread will be dropped into thewait_listif the pages have not been written back, and will be waked up by contrast.Please pay some attention to the mail form, this mail is out of format in my mail client.
Regards,
GuRegards,
YuanQuoted 91 lines
Quoted 91 lines
Signed-off-by Yuan Zhong <[email protected]>---
fs/f2fs/checkpoint.c | 3 +-- fs/f2fs/f2fs.h | 19 +++++++++++++++++++ fs/f2fs/segment.c | 1 + fs/f2fs/super.c | 1 + 4 files changed, 22 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +1
-2@@ -758,8 +758,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); +f2fs_writeback_wait (sbi);filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +19
-0@@ -18,6 +18,8 @@#include <linux/crc32.h> #include <linux/magic.h> #include <linux/kobject.h> +#include <linux/wait.h> +#include <linux/sched.h> /* * For mount options @@ -368,6 +370,7 @@ struct f2fs_sb_info {struct mutex fs_lock[NR_GLOBAL_LOCKS ];/* blocking FS operations */ struct mutex node_write;/* locking node writes */ struct mutex writepages;/* mutex for writepages() */ +wait_queue_head_t writeback_wqh;/* wait_queue for writeback */ unsigned char next_lock_num;/* round-robin global locks */ int por_doing;/* recovery is doing or not */ int on_build_free_nids;/* build_free_nids is doing */ @@ -961,6 +964,22 @@ static inline int f2fs_readonly(struct super_block *sb)return sb->s_flags &MS_RDONLY ; } +static inline void f2fs_writeback_wait (struct f2fs_sb_info *sbi) +{ +DEFINE_WAIT (wait); + +prepare_to_wait (&sbi->writeback_wqh, &wait,TASK_UNINTERRUPTIBLE ); +if (get_pages (sbi,F2FS_WRITEBACK )) +io_schedule (); +finish_wait (&sbi->writeback_wqh, &wait); +} + +static inline void f2fs_writeback_wake (struct f2fs_sb_info *sbi) +{ +if (!get_pages (sbi,F2FS_WRITEBACK )) +wake_up_all (&sbi->writeback_wqh); +} +/* * file.c */ fs/f2fs/segment.c +1
-0@@ -597,6 +597,7 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); +f2fs_writeback_wake (p->sbi);kfree (p);bio_put (bio); }fs/f2fs/super.c +1
-0@@ -835,6 +835,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)mutex_init (&sbi->gc_mutex);mutex_init (&sbi->writepages);mutex_init (&sbi->cp_mutex); +init_waitqueue_head (&sbi->writeback_wqh);for (i =0 ; i <NR_GLOBAL_LOCKS ; i++)mutex_init (&sbi->fs_lock[i]); mutex_init(&sbi->node_write);N‹§²æìr¸›yúèšØb²X¬¶Ç§vØ^–)Þº{.nÇ+‰·¥Š{±‘êçzX§¶›¡Ü¨}©ž²Æ zÚ&j:+v‰¨¾«‘êçzZ+€Ê+zf£¢·hšˆ§~††Ûiÿûàz¹®w¥¢¸?™¨èÚ&¢)ߢf”ù^jÇ«y§m…á@A«a¶Úÿ0¶ìh®å’i
Hi Gu,
I have a comment below.
Quoted 9 lines
Date: Wed, 9 Oct 2013 12:04:09 +0800
From: [email protected]
To: [email protected]
CC: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH v2] f2fs: avoidcongestion_waitwhendo_checkpointfor better performanceHi Yuan,
On 10/08/2013 07:30 PM, Yuan Zhong wrote:
...
Quoted 47 lines
Signed-off-by Gu Zheng <[email protected]>--- fs/f2fs/checkpoint.c | 11 +++++++++-- fs/f2fs/f2fs.h | 1 + fs/f2fs/segment.c | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +9
-2@@ -757,8 +757,15 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); + sbi->cp_task = current; +while (get_pages (sbi,F2FS_WRITEBACK )) { +set_current_state (TASK_UNINTERRUPTIBLE ); +if (!get_pages (sbi,F2FS_WRITEBACK )) +break ; +io_schedule (); + } +__set_current_state (TASK_RUNNING ); + sbi->cp_task =NULL ;filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +1
-0@@ -365,6 +365,7 @@ struct f2fs_sb_info {struct mutex writepages;/* mutex for writepages() */ int por_doing;/* recovery is doing or not */ int on_build_free_nids;/* build_free_nids is doing */ +struct task_struct *cp_task;/* checkpoint task */ /* for orphan inode management */ struct list_head orphan_inode_list;/* orphan inode list */ fs/f2fs/segment.c +0
-0
fs/f2fs/segment.c static void f2fs_end_io_write(struct bio *bio, int err) · line 602
Quoted 6 lines
fs/f2fs/segment.c +3
-0@@ -597,6 +597,10 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); + +if (!get_pages (p->sbi,F2FS_WRITEBACK ) && p->sbi->cp_task) +wake_up_process (p->sbi->cp_task);
There is a risk of dereferencing a NULL pointer because here simply comparing thecp_task against NULL is not enough to avoid race in multi-thread environment.Another thread could have assigned it to NULL in the window between the comparisonand waking up. Regards,Jin
Quoted 122 lines
fs/f2fs/segment.c +1
-0+kfree (p);bio_put (bio); }Signature · 4 lines
1.7.7 Regards, GuQuoted 98 lines
Quoted 11 lines
Quoted 6 lines
This is a problem here, especially, when sync a large number of small files or dirs. In order to avoid this, a
wait_listis introduced,
the checkpoint thread will be dropped into thewait_listif the pages have not been written back, and will be waked up by contrast.Please pay some attention to the mail form, this mail is out of format in my mail client.
Regards,
GuRegards,
YuanQuoted 83 lines
Quoted 83 lines
Signed-off-by Yuan Zhong <[email protected]>---
fs/f2fs/checkpoint.c | 3 +-- fs/f2fs/f2fs.h | 19 +++++++++++++++++++ fs/f2fs/segment.c | 1 + fs/f2fs/super.c | 1 + 4 files changed, 22 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +1
-2@@ -758,8 +758,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); +f2fs_writeback_wait (sbi);filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +19
-0@@ -18,6 +18,8 @@#include <linux/crc32.h> #include <linux/magic.h> #include <linux/kobject.h> +#include <linux/wait.h> +#include <linux/sched.h> /* * For mount options @@ -368,6 +370,7 @@ struct f2fs_sb_info {struct mutex fs_lock[NR_GLOBAL_LOCKS ];/* blocking FS operations */ struct mutex node_write;/* locking node writes */ struct mutex writepages;/* mutex for writepages() */ +wait_queue_head_t writeback_wqh;/* wait_queue for writeback */ unsigned char next_lock_num;/* round-robin global locks */ int por_doing;/* recovery is doing or not */ int on_build_free_nids;/* build_free_nids is doing */ @@ -961,6 +964,22 @@ static inline int f2fs_readonly(struct super_block *sb)return sb->s_flags &MS_RDONLY ; } +static inline void f2fs_writeback_wait (struct f2fs_sb_info *sbi) +{ +DEFINE_WAIT (wait); + +prepare_to_wait (&sbi->writeback_wqh, &wait,TASK_UNINTERRUPTIBLE ); +if (get_pages (sbi,F2FS_WRITEBACK )) +io_schedule (); +finish_wait (&sbi->writeback_wqh, &wait); +} + +static inline void f2fs_writeback_wake (struct f2fs_sb_info *sbi) +{ +if (!get_pages (sbi,F2FS_WRITEBACK )) +wake_up_all (&sbi->writeback_wqh); +} +/* * file.c */ fs/f2fs/segment.c +1
-0@@ -597,6 +597,7 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); +f2fs_writeback_wake (p->sbi);kfree (p);bio_put (bio); }fs/f2fs/super.c +0
-0Quoted 8 lines
Quoted 8 lines
fs/f2fs/super.c static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · line 841
Quoted 8 lines
fs/f2fs/super.c +1
-0@@ -835,6 +835,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)mutex_init (&sbi->gc_mutex);mutex_init (&sbi->writepages);mutex_init (&sbi->cp_mutex); +init_waitqueue_head (&sbi->writeback_wqh);for (i =0 ; i <NR_GLOBAL_LOCKS ; i++)mutex_init (&sbi->fs_lock[i]); mutex_init(&sbi->node_write);N‹§²æìr¸›yúèšØb²X¬¶Ç§vØ^–)Þº{.nÇ+‰·¥Š{±‘êçzX§¶›¡Ü¨}©ž²Æ zÚ&j:+v‰¨¾«‘êçzZ+€Ê+zf£¢·hšˆ§~††Ûiÿûàz¹®w¥¢¸?™¨èÚ&¢)ߢf”ù^jÇ«y§m…á@A«a¶Úÿ0¶ìh®å’i--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Hi Jin,
Quoted 62 lines · Jin Xu
Hi Gu,
I have a comment below.
Quoted 9 lines
Date: Wed, 9 Oct 2013 12:04:09 +0800
From: [email protected]
To: [email protected]
CC: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH v2] f2fs: avoidcongestion_waitwhendo_checkpointfor better performanceHi Yuan,
On 10/08/2013 07:30 PM, Yuan Zhong wrote:...
Quoted 48 lines
Signed-off-by Gu Zheng <[email protected]>---
fs/f2fs/checkpoint.c| 11 +++++++++--fs/f2fs/f2fs.h| 1 +fs/f2fs/segment.c| 4 ++++3 files changed, 14 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +9
-2@@ -757,8 +757,15 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); + sbi->cp_task = current; +while (get_pages (sbi,F2FS_WRITEBACK )) { +set_current_state (TASK_UNINTERRUPTIBLE ); +if (!get_pages (sbi,F2FS_WRITEBACK )) +break ; +io_schedule (); + } +__set_current_state (TASK_RUNNING ); + sbi->cp_task =NULL ;filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +0
-0@@ -365,6 +365,7 @@ struct f2fs_sb_info {struct mutex writepages; /* mutex for
writepages()*/ intpor_doing; /* recovery is doing or not */ inton_build_free_nids; /*build_free_nidsis doing */
+ structtask_struct*cp_task; /* checkpoint task *//* for orphan inode management */
structlist_headorphan_inode_list; /* orphan inode list */fs/f2fs/segment.c +0
-0@@ -597,6 +597,10 @@ static void f2fs_end_io_write(struct bio *bio, int err)
Quoted 10 lines
fs/f2fs/segment.c static void f2fs_end_io_write(struct bio *bio, int err) · line 602
Quoted 5 lines
fs/f2fs/segment.c +3
-0if (p->is_sync)complete (p->wait); + +if (!get_pages (p->sbi,F2FS_WRITEBACK ) && p->sbi->cp_task) +wake_up_process (p->sbi->cp_task);There is a risk of dereferencing a NULL pointer because here simply comparing the
cp_taskagainst NULL is not enough to avoid race in multi-thread environment. Another thread could have assigned it to NULL in the window between the comparison and waking up.
Can not be that, checkpoint routine is always singleton and protected by cp_mutex and cp_rwsem.
Thanks,
Gu
Quoted 125 lines
Regards,
JinQuoted 122 lines
fs/f2fs/segment.c +1
-1+kfree (p);bio_put (bio); } --1.7.7
Regards,
GuQuoted 98 lines
Quoted 11 lines
Quoted 6 lines
This is a problem here, especially, when sync a large number of small files or dirs. In order to avoid this, a
wait_listis introduced,
the checkpoint thread will be dropped into thewait_listif the pages have not been written back, and will be waked up by contrast.Please pay some attention to the mail form, this mail is out of format in my mail client.
Regards,
GuRegards,
YuanQuoted 83 lines
Quoted 83 lines
Signed-off-by Yuan Zhong <[email protected]>---
fs/f2fs/checkpoint.c| 3 +--fs/f2fs/f2fs.h| 19 +++++++++++++++++++fs/f2fs/segment.c| 1 +fs/f2fs/super.c| 1 +4 files changed, 22 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +1
-2@@ -758,8 +758,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); +f2fs_writeback_wait (sbi);filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +2
-0@@ -18,6 +18,8 @@#include <linux/crc32.h> #include <linux/magic.h> #include <linux/kobject.h> +#include <linux/wait.h> +#include <linux/sched.h> /* * For mount options @@ -368,6 +370,7 @@ struct f2fs_sb_info {struct mutex fs_lock[NR_GLOBAL_LOCKS]; /* blocking FS operations */ struct mutex
node_write; /* locking node writes */ struct mutex writepages; /* mutex forwritepages()*/
+wait_queue_head_twriteback_wqh; /*wait_queuefor writeback */ unsigned charnext_lock_num; /* round-robin global locks */ intpor_doing; /* recovery is doing or not */
inton_build_free_nids; /*build_free_nidsis doing */fs/f2fs/f2fs.h +16
-0@@ -961,6 +964,22 @@ static inline int f2fs_readonly(struct super_block *sb)return sb->s_flags &MS_RDONLY ; } +static inline void f2fs_writeback_wait (struct f2fs_sb_info *sbi) +{ +DEFINE_WAIT (wait); + +prepare_to_wait (&sbi->writeback_wqh, &wait,TASK_UNINTERRUPTIBLE ); +if (get_pages (sbi,F2FS_WRITEBACK )) +io_schedule (); +finish_wait (&sbi->writeback_wqh, &wait); +} + +static inline void f2fs_writeback_wake (struct f2fs_sb_info *sbi) +{ +if (!get_pages (sbi,F2FS_WRITEBACK )) +wake_up_all (&sbi->writeback_wqh); +} +/* * file.c */ fs/f2fs/segment.c +1
-0@@ -597,6 +597,7 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); +f2fs_writeback_wake (p->sbi);kfree (p);bio_put (bio); }fs/f2fs/super.c +0
-0Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/f2fs/super.c +1
-0@@ -835,6 +835,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)mutex_init (&sbi->gc_mutex);mutex_init (&sbi->writepages);mutex_init (&sbi->cp_mutex); +init_waitqueue_head (&sbi->writeback_wqh);for (i =0 ; i <NR_GLOBAL_LOCKS ; i++)mutex_init (&sbi->fs_lock[i]);mutex_init(&sbi->node_write);N‹§²æìr¸›yúèšØb²X¬¶Ç§vØ^–)Þº{.nÇ+‰·¥Š{±‘êçzX§¶›¡Ü¨}©ž²Æ zÚ&j:+v‰¨¾«‘êçzZ+€Ê+zf£¢·hšˆ§~††Ûiÿûàz¹®w¥¢¸?™¨èÚ&¢)ߢf”ù^jÇ«y§m…á@A«a¶Úÿ0¶ìh®å’i
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
Quoted 83 lines
Date: Thu, 10 Oct 2013 16:11:53 +0800
From: [email protected]
To: [email protected]
CC: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH v2] f2fs: avoidcongestion_waitwhendo_checkpointfor better performanceHi Jin,
Quoted 62 lines · Jin Xu
Hi Gu,
I have a comment below.
Quoted 9 lines
Date: Wed, 9 Oct 2013 12:04:09 +0800
From: [email protected]
To: [email protected]
CC: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH v2] f2fs: avoidcongestion_waitwhendo_checkpointfor better performanceHi Yuan,
On 10/08/2013 07:30 PM, Yuan Zhong wrote:...
Quoted 48 lines
Signed-off-by Gu Zheng <[email protected]>---
fs/f2fs/checkpoint.c| 11 +++++++++--fs/f2fs/f2fs.h| 1 +fs/f2fs/segment.c| 4 ++++3 files changed, 14 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +9
-2@@ -757,8 +757,15 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); + sbi->cp_task = current; +while (get_pages (sbi,F2FS_WRITEBACK )) { +set_current_state (TASK_UNINTERRUPTIBLE ); +if (!get_pages (sbi,F2FS_WRITEBACK )) +break ; +io_schedule (); + } +__set_current_state (TASK_RUNNING ); + sbi->cp_task =NULL ;filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +0
-0@@ -365,6 +365,7 @@ struct f2fs_sb_info {struct mutex writepages; /* mutex for
writepages()*/ intpor_doing; /* recovery is doing or not */ inton_build_free_nids; /*build_free_nidsis doing */
+ structtask_struct*cp_task; /* checkpoint task *//* for orphan inode management */
structlist_headorphan_inode_list; /* orphan inode list */fs/f2fs/segment.c +0
-0@@ -597,6 +597,10 @@ static void f2fs_end_io_write(struct bio *bio, int err)Quoted 10 lines
fs/f2fs/segment.c static void f2fs_end_io_write(struct bio *bio, int err) · line 602
Quoted 5 lines
fs/f2fs/segment.c +3
-0if (p->is_sync)complete (p->wait); + +if (!get_pages (p->sbi,F2FS_WRITEBACK ) && p->sbi->cp_task) +wake_up_process (p->sbi->cp_task);There is a risk of dereferencing a NULL pointer because here simply comparing the
cp_taskagainst NULL is not enough to avoid race in multi-thread environment. Another thread could have assigned it to NULL in the window between the comparison and waking up.
Quoted 2 lines
Can not be that, checkpoint routine is always singleton and protected by
cp_mutexandcp_rwsem.
The race could happen like this for example:On a SMP environment, thread 1 wakes up the checkpoint thread, thenthread 2 comes to the f2fs_end_io_write, compared the cp_task as not NULL,but at the same time, the checkpoint thread just assigned the cp_task to NULL.When thread 2 gets to the wake_up_process, dereferencing to NULL pointerhappens. Jin
Quoted 130 lines
Thanks,
GuQuoted 125 lines
Regards,
JinQuoted 122 lines
fs/f2fs/segment.c +1
-1+kfree (p);bio_put (bio); } --1.7.7
Regards,
GuQuoted 98 lines
Quoted 11 lines
Quoted 6 lines
This is a problem here, especially, when sync a large number of small files or dirs. In order to avoid this, a
wait_listis introduced,
the checkpoint thread will be dropped into thewait_listif the pages have not been written back, and will be waked up by contrast.Please pay some attention to the mail form, this mail is out of format in my mail client.
Regards,
GuRegards,
YuanQuoted 83 lines
Quoted 83 lines
Signed-off-by Yuan Zhong <[email protected]>---
fs/f2fs/checkpoint.c| 3 +--fs/f2fs/f2fs.h| 19 +++++++++++++++++++fs/f2fs/segment.c| 1 +fs/f2fs/super.c| 1 +4 files changed, 22 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +1
-2@@ -758,8 +758,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); +f2fs_writeback_wait (sbi);filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +2
-0@@ -18,6 +18,8 @@#include <linux/crc32.h> #include <linux/magic.h> #include <linux/kobject.h> +#include <linux/wait.h> +#include <linux/sched.h> /* * For mount options @@ -368,6 +370,7 @@ struct f2fs_sb_info {struct mutex fs_lock[NR_GLOBAL_LOCKS]; /* blocking FS operations */ struct mutex
node_write; /* locking node writes */ struct mutex writepages; /* mutex forwritepages()*/
+wait_queue_head_twriteback_wqh; /*wait_queuefor writeback */ unsigned charnext_lock_num; /* round-robin global locks */ intpor_doing; /* recovery is doing or not */
inton_build_free_nids; /*build_free_nidsis doing */fs/f2fs/f2fs.h +16
-0@@ -961,6 +964,22 @@ static inline int f2fs_readonly(struct super_block *sb)return sb->s_flags &MS_RDONLY ; } +static inline void f2fs_writeback_wait (struct f2fs_sb_info *sbi) +{ +DEFINE_WAIT (wait); + +prepare_to_wait (&sbi->writeback_wqh, &wait,TASK_UNINTERRUPTIBLE ); +if (get_pages (sbi,F2FS_WRITEBACK )) +io_schedule (); +finish_wait (&sbi->writeback_wqh, &wait); +} + +static inline void f2fs_writeback_wake (struct f2fs_sb_info *sbi) +{ +if (!get_pages (sbi,F2FS_WRITEBACK )) +wake_up_all (&sbi->writeback_wqh); +} +/* * file.c */ fs/f2fs/segment.c +1
-0@@ -597,6 +597,7 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); +f2fs_writeback_wake (p->sbi);kfree (p);bio_put (bio); }fs/f2fs/super.c +0
-0Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/f2fs/super.c +1
-0@@ -835,6 +835,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)mutex_init (&sbi->gc_mutex);mutex_init (&sbi->writepages);mutex_init (&sbi->cp_mutex); +init_waitqueue_head (&sbi->writeback_wqh);for (i =0 ; i <NR_GLOBAL_LOCKS ; i++)mutex_init (&sbi->fs_lock[i]);mutex_init(&sbi->node_write);N‹§²æìr¸›yúèšØb²X¬¶Ç§vØ^–)Þº{.nÇ+‰·¥Š{±‘êçzX§¶›¡Ü¨}©ž²Æ zÚ&j:+v‰¨¾«‘êçzZ+€Ê+zf£¢·hšˆ§~††Ûiÿûàz¹®w¥¢¸?™¨èÚ&¢)ߢf”ù^jÇ«y§m…á@A«a¶Úÿ0¶ìh®å’i
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Hi Jin,
Quoted 86 lines · Jin Xu
Quoted 83 lines
Date: Thu, 10 Oct 2013 16:11:53 +0800
From: [email protected]
To: [email protected]
CC: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH v2] f2fs: avoidcongestion_waitwhendo_checkpointfor better performanceHi Jin,
Quoted 62 lines · Jin Xu
Hi Gu,
I have a comment below.
Quoted 9 lines
Date: Wed, 9 Oct 2013 12:04:09 +0800
From: [email protected]
To: [email protected]
CC: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH v2] f2fs: avoidcongestion_waitwhendo_checkpointfor better performanceHi Yuan,
On 10/08/2013 07:30 PM, Yuan Zhong wrote:...
Quoted 48 lines
Signed-off-by Gu Zheng <[email protected]>---
fs/f2fs/checkpoint.c| 11 +++++++++--fs/f2fs/f2fs.h| 1 +fs/f2fs/segment.c| 4 ++++3 files changed, 14 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +9
-2@@ -757,8 +757,15 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); + sbi->cp_task = current; +while (get_pages (sbi,F2FS_WRITEBACK )) { +set_current_state (TASK_UNINTERRUPTIBLE ); +if (!get_pages (sbi,F2FS_WRITEBACK )) +break ; +io_schedule (); + } +__set_current_state (TASK_RUNNING ); + sbi->cp_task =NULL ;filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +0
-0@@ -365,6 +365,7 @@ struct f2fs_sb_info {struct mutex writepages; /* mutex for
writepages()*/ intpor_doing; /* recovery is doing or not */ inton_build_free_nids; /*build_free_nidsis doing */
+ structtask_struct*cp_task; /* checkpoint task *//* for orphan inode management */
structlist_headorphan_inode_list; /* orphan inode list */fs/f2fs/segment.c +0
-0@@ -597,6 +597,10 @@ static void f2fs_end_io_write(struct bio *bio, int err)Quoted 10 lines
fs/f2fs/segment.c static void f2fs_end_io_write(struct bio *bio, int err) · line 602
Quoted 5 lines
fs/f2fs/segment.c +3
-0if (p->is_sync)complete (p->wait); + +if (!get_pages (p->sbi,F2FS_WRITEBACK ) && p->sbi->cp_task) +wake_up_process (p->sbi->cp_task);There is a risk of dereferencing a NULL pointer because here simply comparing the
cp_taskagainst NULL is not enough to avoid race in multi-thread environment. Another thread could have assigned it to NULL in the window between the comparison and waking up.Quoted 2 lines
Can not be that, checkpoint routine is always singleton and protected by
cp_mutexandcp_rwsem.
Quoted 6 lines
The race could happen like this for example:
On a SMP environment, thread 1 wakes up the checkpoint thread, then thread 2 comes to thef2fs_end_io_write, compared thecp_taskas not NULL, but at the same time, the checkpoint thread just assigned thecp_taskto NULL. When thread 2 gets to thewake_up_process, dereferencing to NULL pointer happens.
The case means that two or more IO are going on. If thread 1 wake up checkpoint, it'll check get_pages(p->sbi, F2FS_WRITEBACK) before going down to assign the cp_task to NULL, so when thread 2 gets to the wake_up_process the cp_task is still valid.
The "while (get_pages(sbi, F2FS_WRITEBACK))" loop is used to avoid this issue.
Thanks,
Gu
Quoted 137 lines
Jin
Quoted 134 lines
Thanks,
GuQuoted 125 lines
Regards,
JinQuoted 122 lines
fs/f2fs/segment.c +1
-1+kfree (p);bio_put (bio); } --1.7.7
Regards,
GuQuoted 98 lines
Quoted 11 lines
Quoted 6 lines
This is a problem here, especially, when sync a large number of small files or dirs. In order to avoid this, a
wait_listis introduced,
the checkpoint thread will be dropped into thewait_listif the pages have not been written back, and will be waked up by contrast.Please pay some attention to the mail form, this mail is out of format in my mail client.
Regards,
GuRegards,
YuanQuoted 83 lines
Quoted 83 lines
Signed-off-by Yuan Zhong <[email protected]>---
fs/f2fs/checkpoint.c| 3 +--fs/f2fs/f2fs.h| 19 +++++++++++++++++++fs/f2fs/segment.c| 1 +fs/f2fs/super.c| 1 +4 files changed, 22 insertions(+), 2 deletions(-)fs/f2fs/checkpoint.c +1
-2@@ -758,8 +758,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ -while (get_pages (sbi,F2FS_WRITEBACK )) -congestion_wait (BLK_RW_ASYNC ,HZ /50 ); +f2fs_writeback_wait (sbi);filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );fs/f2fs/f2fs.h +2
-0@@ -18,6 +18,8 @@#include <linux/crc32.h> #include <linux/magic.h> #include <linux/kobject.h> +#include <linux/wait.h> +#include <linux/sched.h> /* * For mount options @@ -368,6 +370,7 @@ struct f2fs_sb_info {struct mutex fs_lock[NR_GLOBAL_LOCKS]; /* blocking FS operations */ struct mutex
node_write; /* locking node writes */ struct mutex writepages; /* mutex forwritepages()*/
+wait_queue_head_twriteback_wqh; /*wait_queuefor writeback */ unsigned charnext_lock_num; /* round-robin global locks */ intpor_doing; /* recovery is doing or not */
inton_build_free_nids; /*build_free_nidsis doing */fs/f2fs/f2fs.h +16
-0@@ -961,6 +964,22 @@ static inline int f2fs_readonly(struct super_block *sb)return sb->s_flags &MS_RDONLY ; } +static inline void f2fs_writeback_wait (struct f2fs_sb_info *sbi) +{ +DEFINE_WAIT (wait); + +prepare_to_wait (&sbi->writeback_wqh, &wait,TASK_UNINTERRUPTIBLE ); +if (get_pages (sbi,F2FS_WRITEBACK )) +io_schedule (); +finish_wait (&sbi->writeback_wqh, &wait); +} + +static inline void f2fs_writeback_wake (struct f2fs_sb_info *sbi) +{ +if (!get_pages (sbi,F2FS_WRITEBACK )) +wake_up_all (&sbi->writeback_wqh); +} +/* * file.c */ fs/f2fs/segment.c +1
-0@@ -597,6 +597,7 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); +f2fs_writeback_wake (p->sbi);kfree (p);bio_put (bio); }fs/f2fs/super.c +0
-0Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/f2fs/super.c +1
-0@@ -835,6 +835,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)mutex_init (&sbi->gc_mutex);mutex_init (&sbi->writepages);mutex_init (&sbi->cp_mutex); +init_waitqueue_head (&sbi->writeback_wqh);for (i =0 ; i <NR_GLOBAL_LOCKS ; i++)mutex_init (&sbi->fs_lock[i]);mutex_init(&sbi->node_write);N‹§²æìr¸›yúèšØb²X¬¶Ç§vØ^–)Þº{.nÇ+‰·¥Š{±‘êçzX§¶›¡Ü¨}©ž²Æ zÚ&j:+v‰¨¾«‘êçzZ+€Ê+zf£¢·hšˆ§~††Ûiÿûàz¹®w¥¢¸?™¨èÚ&¢)ߢf”ù^jÇ«y§m…á@A«a¶Úÿ0¶ìh®å’i
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html