summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2019-09-09 08:10:59 -0400
committerJaegeuk Kim <jaegeuk@kernel.org>2019-09-16 11:38:20 -0400
commit743b620cb0516f6b6cbc45b48df00fe6d14d00ba (patch)
tree3d7a0507ee9008230a9308afbf83664c06985dcf
parent957fa47823dfe449c5a15a944e4e7a299a6601db (diff)
f2fs: avoid infinite GC loop due to stale atomic files
If committing atomic pages is failed when doing f2fs_do_sync_file(), we can get commited pages but atomic_file being still set like: - inmem: 0, atomic IO: 4 (Max. 10), volatile IO: 0 (Max. 0) If GC selects this block, we can get an infinite loop like this: f2fs_submit_page_bio: dev = (253,7), ino = 2, page_index = 0x2359a8, oldaddr = 0x2359a8, newaddr = 0x2359a8, rw = READ(), type = COLD_DATA f2fs_submit_read_bio: dev = (253,7)/(253,7), rw = READ(), DATA, sector = 18533696, size = 4096 f2fs_get_victim: dev = (253,7), type = No TYPE, policy = (Foreground GC, LFS-mode, Greedy), victim = 4355, cost = 1, ofs_unit = 1, pre_victim_secno = 4355, prefree = 0, free = 234 f2fs_iget: dev = (253,7), ino = 6247, pino = 5845, i_mode = 0x81b0, i_size = 319488, i_nlink = 1, i_blocks = 624, i_advise = 0x2c f2fs_submit_page_bio: dev = (253,7), ino = 2, page_index = 0x2359a8, oldaddr = 0x2359a8, newaddr = 0x2359a8, rw = READ(), type = COLD_DATA f2fs_submit_read_bio: dev = (253,7)/(253,7), rw = READ(), DATA, sector = 18533696, size = 4096 f2fs_get_victim: dev = (253,7), type = No TYPE, policy = (Foreground GC, LFS-mode, Greedy), victim = 4355, cost = 1, ofs_unit = 1, pre_victim_secno = 4355, prefree = 0, free = 234 f2fs_iget: dev = (253,7), ino = 6247, pino = 5845, i_mode = 0x81b0, i_size = 319488, i_nlink = 1, i_blocks = 624, i_advise = 0x2c In that moment, we can observe: [Before] Try to move 5084219 blocks (BG: 384508) - data blocks : 4962373 (274483) - node blocks : 121846 (110025) Skipped : atomic write 4534686 (10) [After] Try to move 5088973 blocks (BG: 384508) - data blocks : 4967127 (274483) - node blocks : 121846 (110025) Skipped : atomic write 4539440 (10) So, refactor atomic_write flow like this: 1. start_atomic_write - add inmem_list and set atomic_file 2. write() - register it in inmem_pages 3. commit_atomic_write - if no error, f2fs_drop_inmem_pages() - f2fs_commit_inmme_pages() failed : __revoked_inmem_pages() was done - f2fs_do_sync_file failed : abort_atomic_write later 4. abort_atomic_write - f2fs_drop_inmem_pages 5. f2fs_drop_inmem_pages - clear atomic_file - remove inmem_list Based on this change, when GC fails to move block in atomic_file, f2fs_drop_inmem_pages_all() can call f2fs_drop_inmem_pages(). Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/file.c15
-rw-r--r--fs/f2fs/segment.c29
2 files changed, 18 insertions, 26 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 10927a0b8df3..fab6e4cf8f06 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1829,6 +1829,8 @@ static int f2fs_ioc_getversion(struct file *filp, unsigned long arg)
1829static int f2fs_ioc_start_atomic_write(struct file *filp) 1829static int f2fs_ioc_start_atomic_write(struct file *filp)
1830{ 1830{
1831 struct inode *inode = file_inode(filp); 1831 struct inode *inode = file_inode(filp);
1832 struct f2fs_inode_info *fi = F2FS_I(inode);
1833 struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
1832 int ret; 1834 int ret;
1833 1835
1834 if (!inode_owner_or_capable(inode)) 1836 if (!inode_owner_or_capable(inode))
@@ -1871,6 +1873,12 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
1871 goto out; 1873 goto out;
1872 } 1874 }
1873 1875
1876 spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
1877 if (list_empty(&fi->inmem_ilist))
1878 list_add_tail(&fi->inmem_ilist, &sbi->inode_list[ATOMIC_FILE]);
1879 spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
1880
1881 /* add inode in inmem_list first and set atomic_file */
1874 set_inode_flag(inode, FI_ATOMIC_FILE); 1882 set_inode_flag(inode, FI_ATOMIC_FILE);
1875 clear_inode_flag(inode, FI_ATOMIC_REVOKE_REQUEST); 1883 clear_inode_flag(inode, FI_ATOMIC_REVOKE_REQUEST);
1876 up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); 1884 up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
@@ -1912,11 +1920,8 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)
1912 goto err_out; 1920 goto err_out;
1913 1921
1914 ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true); 1922 ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);
1915 if (!ret) { 1923 if (!ret)
1916 clear_inode_flag(inode, FI_ATOMIC_FILE); 1924 f2fs_drop_inmem_pages(inode);
1917 F2FS_I(inode)->i_gc_failures[GC_FAILURE_ATOMIC] = 0;
1918 stat_dec_atomic_write(inode);
1919 }
1920 } else { 1925 } else {
1921 ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 1, false); 1926 ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 1, false);
1922 } 1927 }
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 18584d4c078a..204524943bc6 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -185,8 +185,6 @@ bool f2fs_need_SSR(struct f2fs_sb_info *sbi)
185 185
186void f2fs_register_inmem_page(struct inode *inode, struct page *page) 186void f2fs_register_inmem_page(struct inode *inode, struct page *page)
187{ 187{
188 struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
189 struct f2fs_inode_info *fi = F2FS_I(inode);
190 struct inmem_pages *new; 188 struct inmem_pages *new;
191 189
192 f2fs_trace_pid(page); 190 f2fs_trace_pid(page);
@@ -200,15 +198,11 @@ void f2fs_register_inmem_page(struct inode *inode, struct page *page)
200 INIT_LIST_HEAD(&new->list); 198 INIT_LIST_HEAD(&new->list);
201 199
202 /* increase reference count with clean state */ 200 /* increase reference count with clean state */
203 mutex_lock(&fi->inmem_lock);
204 get_page(page); 201 get_page(page);
205 list_add_tail(&new->list, &fi->inmem_pages); 202 mutex_lock(&F2FS_I(inode)->inmem_lock);
206 spin_lock(&sbi->inode_lock[ATOMIC_FILE]); 203 list_add_tail(&new->list, &F2FS_I(inode)->inmem_pages);
207 if (list_empty(&fi->inmem_ilist))
208 list_add_tail(&fi->inmem_ilist, &sbi->inode_list[ATOMIC_FILE]);
209 spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
210 inc_page_count(F2FS_I_SB(inode), F2FS_INMEM_PAGES); 204 inc_page_count(F2FS_I_SB(inode), F2FS_INMEM_PAGES);
211 mutex_unlock(&fi->inmem_lock); 205 mutex_unlock(&F2FS_I(inode)->inmem_lock);
212 206
213 trace_f2fs_register_inmem_page(page, INMEM); 207 trace_f2fs_register_inmem_page(page, INMEM);
214} 208}
@@ -330,19 +324,17 @@ void f2fs_drop_inmem_pages(struct inode *inode)
330 mutex_lock(&fi->inmem_lock); 324 mutex_lock(&fi->inmem_lock);
331 __revoke_inmem_pages(inode, &fi->inmem_pages, 325 __revoke_inmem_pages(inode, &fi->inmem_pages,
332 true, false, true); 326 true, false, true);
333
334 if (list_empty(&fi->inmem_pages)) {
335 spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
336 if (!list_empty(&fi->inmem_ilist))
337 list_del_init(&fi->inmem_ilist);
338 spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
339 }
340 mutex_unlock(&fi->inmem_lock); 327 mutex_unlock(&fi->inmem_lock);
341 } 328 }
342 329
343 clear_inode_flag(inode, FI_ATOMIC_FILE); 330 clear_inode_flag(inode, FI_ATOMIC_FILE);
344 fi->i_gc_failures[GC_FAILURE_ATOMIC] = 0; 331 fi->i_gc_failures[GC_FAILURE_ATOMIC] = 0;
345 stat_dec_atomic_write(inode); 332 stat_dec_atomic_write(inode);
333
334 spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
335 if (!list_empty(&fi->inmem_ilist))
336 list_del_init(&fi->inmem_ilist);
337 spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
346} 338}
347 339
348void f2fs_drop_inmem_page(struct inode *inode, struct page *page) 340void f2fs_drop_inmem_page(struct inode *inode, struct page *page)
@@ -471,11 +463,6 @@ int f2fs_commit_inmem_pages(struct inode *inode)
471 463
472 mutex_lock(&fi->inmem_lock); 464 mutex_lock(&fi->inmem_lock);
473 err = __f2fs_commit_inmem_pages(inode); 465 err = __f2fs_commit_inmem_pages(inode);
474
475 spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
476 if (!list_empty(&fi->inmem_ilist))
477 list_del_init(&fi->inmem_ilist);
478 spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
479 mutex_unlock(&fi->inmem_lock); 466 mutex_unlock(&fi->inmem_lock);
480 467
481 clear_inode_flag(inode, FI_ATOMIC_COMMIT); 468 clear_inode_flag(inode, FI_ATOMIC_COMMIT);