Btrfs: flush all dirty inodes if writeback can not start
PATCH RESEND 1/3 Btrfs: flush all dirty inodes if writeback can not start
From: Miao Xie <[email protected]>
We may try to flush some dirty pages when there is no enough space to reserve. But it is possible that this operation fails, in order to get enough space to reserve successfully, we will sync all the delalloc file. This operation is safe, we needn't worry about the case that the filesystem goes from r/w to r/o. because the filesystem should guarantee all the dirty pages have been written into the disk after it becomes readonly, so the sync operation will do nothing if the filesystem is already readonly. Though it may waste lots of time, as a corner case, we needn't care.
--- fs/btrfs/extent-tree.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)
fs/btrfs/extent-tree.c +31 -9
@@ -3689,12 +3689,15 @@ static int can_overcommit(struct btrfs_root *root,return 0 ; } -static int writeback_inodes_sb_nr_if_idle_safe (struct super_block *sb, -unsigned long nr_pages, -enum wb_reason reason) +static inline int writeback_inodes_sb_nr_if_idle_safe (struct super_block *sb, +unsigned long nr_pages, +enum wb_reason reason) { -if (!writeback_in_progress (sb->s_bdi) && -down_read_trylock (&sb->s_umount)) { +/* the flusher is dealing with the dirty inodes now. */ +if (writeback_in_progress (sb->s_bdi)) +return 1 ; + +if (down_read_trylock (&sb->s_umount)) {writeback_inodes_sb_nr (sb, nr_pages, reason);up_read (&sb->s_umount);return 1 ;
@@ -3703,6 +3706,28 @@ static int writeback_inodes_sb_nr_if_idle_safe(struct super_block *sb,return 0 ; } +void btrfs_writeback_inodes_sb_nr (struct btrfs_root *root, +unsigned long nr_pages) +{ +struct super_block *sb = root->fs_info->sb; +int started; + +/* If we can not start writeback, just sync all the delalloc file. */ + started =writeback_inodes_sb_nr_if_idle_safe (sb, nr_pages, +WB_REASON_FS_FREE_SPACE ); +if (!started) { +/* +* We needn't worry the filesystem going from r/w to r/o though +* we don't acquire ->s_umount mutex, because the filesystem +* should guarantee the delalloc inodes list be empty after +* the filesystem is readonly(all dirty pages are written to +* the disk). +*/ +btrfs_start_delalloc_inodes (root,0 ); +btrfs_wait_ordered_extents (root,0 ); + } +} +/* * shrink metadata reservation for delalloc */
@@ -3735,10 +3760,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,while (delalloc_bytes && loops <3 ) { max_reclaim =min (delalloc_bytes, to_reclaim); nr_pages = max_reclaim >>PAGE_CACHE_SHIFT ; -writeback_inodes_sb_nr_if_idle_safe (root->fs_info->sb, - nr_pages, -WB_REASON_FS_FREE_SPACE ); - +btrfs_writeback_inodes_sb_nr (root, nr_pages);/* * We need to wait for the async pages to actually start before * we do anything.
Signature · 1 line
1.7.11.7
PATCH v2 1/1 Btrfs: flush all dirty inodes if writeback can not start
We may try to flush some dirty pages when there is no enough space to reserve. But it is possible that this operation fails, in order to get enough space to reserve successfully, we will sync all the delalloc file. This operation is safe, we needn't worry about the case that the filesystem goes from r/w to r/o. because the filesystem should guarantee all the dirty pages have been written into the disk after it becomes readonly, so the sync operation will do nothing if the filesystem is already readonly. Though it may waste lots of time, as a corner case, we needn't care.
---
Changelog v1 -> v2:
- make the function static
--- fs/btrfs/extent-tree.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)
fs/btrfs/extent-tree.c +31 -9
@@ -3695,12 +3695,15 @@ static int can_overcommit(struct btrfs_root *root,return 0 ; } -static int writeback_inodes_sb_nr_if_idle_safe (struct super_block *sb, -unsigned long nr_pages, -enum wb_reason reason) +static inline int writeback_inodes_sb_nr_if_idle_safe (struct super_block *sb, +unsigned long nr_pages, +enum wb_reason reason) { -if (!writeback_in_progress (sb->s_bdi) && -down_read_trylock (&sb->s_umount)) { +/* the flusher is dealing with the dirty inodes now. */ +if (writeback_in_progress (sb->s_bdi)) +return 1 ; + +if (down_read_trylock (&sb->s_umount)) {writeback_inodes_sb_nr (sb, nr_pages, reason);up_read (&sb->s_umount);return 1 ;
@@ -3709,6 +3712,28 @@ static int writeback_inodes_sb_nr_if_idle_safe(struct super_block *sb,return 0 ; } +static void btrfs_writeback_inodes_sb_nr (struct btrfs_root *root, +unsigned long nr_pages) +{ +struct super_block *sb = root->fs_info->sb; +int started; + +/* If we can not start writeback, just sync all the delalloc file. */ + started =writeback_inodes_sb_nr_if_idle_safe (sb, nr_pages, +WB_REASON_FS_FREE_SPACE ); +if (!started) { +/* +* We needn't worry the filesystem going from r/w to r/o though +* we don't acquire ->s_umount mutex, because the filesystem +* should guarantee the delalloc inodes list be empty after +* the filesystem is readonly(all dirty pages are written to +* the disk). +*/ +btrfs_start_delalloc_inodes (root,0 ); +btrfs_wait_ordered_extents (root,0 ); + } +} +/* * shrink metadata reservation for delalloc */
@@ -3741,10 +3766,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,while (delalloc_bytes && loops <3 ) { max_reclaim =min (delalloc_bytes, to_reclaim); nr_pages = max_reclaim >>PAGE_CACHE_SHIFT ; -writeback_inodes_sb_nr_if_idle_safe (root->fs_info->sb, - nr_pages, -WB_REASON_FS_FREE_SPACE ); - +btrfs_writeback_inodes_sb_nr (root, nr_pages);/* * We need to wait for the async pages to actually start before * we do anything.
Signature · 1 line
1.7.11.7
Quoted 55 lines · Miao Xie
We may try to flush some dirty pages when there is no enough space to reserve. But it is possible that this operation fails, in order to get enough space to reserve successfully, we will sync all the delalloc file. This operation is safe, we needn't worry about the case that the filesystem goes from r/w to r/o. because the filesystem should guarantee all the dirty pages have been written into the disk after it becomes readonly, so the sync operation will do nothing if the filesystem is already readonly. Though it may waste lots of time, as a corner case, we needn't care.
Signed-off-by Miao Xie <[email protected]>---
Changelog v1 -> v2:
- make the function static--- fs/btrfs/extent-tree.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)fs/btrfs/extent-tree.c +17
-5@@ -3695,12 +3695,15 @@ static int can_overcommit(struct btrfs_root *root,return 0 ; } -static int writeback_inodes_sb_nr_if_idle_safe (struct super_block *sb, -unsigned long nr_pages, -enum wb_reason reason) +static inline int writeback_inodes_sb_nr_if_idle_safe (struct super_block *sb, +unsigned long nr_pages, +enum wb_reason reason) { -if (!writeback_in_progress (sb->s_bdi) && -down_read_trylock (&sb->s_umount)) { +/* the flusher is dealing with the dirty inodes now. */ +if (writeback_in_progress (sb->s_bdi)) +return 1 ; + +if (down_read_trylock (&sb->s_umount)) {writeback_inodes_sb_nr (sb, nr_pages, reason);up_read (&sb->s_umount);return 1 ;@@ -3709,6 +3712,28 @@ static int writeback_inodes_sb_nr_if_idle_safe(struct super_block *sb,return 0 ; } +static void btrfs_writeback_inodes_sb_nr (struct btrfs_root *root, +unsigned long nr_pages) +{ +struct super_block *sb = root->fs_info->sb; +int started; + +/* If we can not start writeback, just sync all the delalloc file. */ + started =writeback_inodes_sb_nr_if_idle_safe (sb, nr_pages, +WB_REASON_FS_FREE_SPACE );
fs/btrfs/extent-tree.c static int writeback_inodes_sb_nr_if_idle_safe(struct super_block *sb, · line 3733
Quoted 10 lines
fs/btrfs/extent-tree.c +10
-0+if (!started) { +/* +* We needn't worry the filesystem going from r/w to r/o though +* we don't acquire ->s_umount mutex, because the filesystem +* should guarantee the delalloc inodes list be empty after +* the filesystem is readonly(all dirty pages are written to +* the disk). +*/ +btrfs_start_delalloc_inodes (root,0 ); +btrfs_wait_ordered_extents (root,0 );
We can't just call wait_ordered_extents, we may have an open trans handle which could make us deadlock if a transaction commit starts. Thanks,
Josef
PATCH v3 1/1 Btrfs: flush all dirty inodes if writeback can not start
We may try to flush some dirty pages when there is no enough space to reserve. But it is possible that this operation fails, in order to get enough space to reserve successfully, we will sync all the delalloc file. This operation is safe, we needn't worry about the case that the filesystem goes from r/w to r/o. because the filesystem should guarantee all the dirty pages have been written into the disk after it becomes readonly, so the sync operation will do nothing if the filesystem is already readonly. Though it may waste lots of time, as a corner case, we needn't care.
---
Changelog v2 -> v3:
- remove unnecessary btrfs_wait_ordered_extents()
Changelog v1 -> v2:
- make the function static
--- fs/btrfs/extent-tree.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-)
fs/btrfs/extent-tree.c +32 -13
@@ -3695,12 +3695,15 @@ static int can_overcommit(struct btrfs_root *root,return 0 ; } -static int writeback_inodes_sb_nr_if_idle_safe (struct super_block *sb, -unsigned long nr_pages, -enum wb_reason reason) +static inline int writeback_inodes_sb_nr_if_idle_safe (struct super_block *sb, +unsigned long nr_pages, +enum wb_reason reason) { -if (!writeback_in_progress (sb->s_bdi) && -down_read_trylock (&sb->s_umount)) { +/* the flusher is dealing with the dirty inodes now. */ +if (writeback_in_progress (sb->s_bdi)) +return 1 ; + +if (down_read_trylock (&sb->s_umount)) {writeback_inodes_sb_nr (sb, nr_pages, reason);up_read (&sb->s_umount);return 1 ;
@@ -3709,6 +3712,27 @@ static int writeback_inodes_sb_nr_if_idle_safe(struct super_block *sb,return 0 ; } +static void btrfs_writeback_inodes_sb_nr (struct btrfs_root *root, +unsigned long nr_pages) +{ +struct super_block *sb = root->fs_info->sb; +int started; + +/* If we can not start writeback, just sync all the delalloc file. */ + started =writeback_inodes_sb_nr_if_idle_safe (sb, nr_pages, +WB_REASON_FS_FREE_SPACE ); +if (!started) { +/* +* We needn't worry the filesystem going from r/w to r/o though +* we don't acquire ->s_umount mutex, because the filesystem +* should guarantee the delalloc inodes list be empty after +* the filesystem is readonly(all dirty pages are written to +* the disk). +*/ +btrfs_start_delalloc_inodes (root,0 ); + } +} +/* * shrink metadata reservation for delalloc */
@@ -3738,13 +3762,12 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,return ; } + flush = trans ?BTRFS_RESERVE_NO_FLUSH :BTRFS_RESERVE_FLUSH_ALL ; +while (delalloc_bytes && loops <3 ) { max_reclaim =min (delalloc_bytes, to_reclaim); nr_pages = max_reclaim >>PAGE_CACHE_SHIFT ; -writeback_inodes_sb_nr_if_idle_safe (root->fs_info->sb, - nr_pages, -WB_REASON_FS_FREE_SPACE ); - +btrfs_writeback_inodes_sb_nr (root, nr_pages);/* * We need to wait for the async pages to actually start before * we do anything.
@@ -3752,10 +3775,6 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,wait_event (root->fs_info->async_submit_wait, !atomic_read (&root->fs_info->async_delalloc_pages)); -if (!trans) - flush =BTRFS_RESERVE_FLUSH_ALL ; -else - flush =BTRFS_RESERVE_NO_FLUSH ;spin_lock (&space_info->lock);if (can_overcommit (root, space_info, orig, flush)) {spin_unlock (&space_info->lock);
Signature · 1 line
1.7.11.7