Skip to content

Commit 677017d

Browse files
Sahitya TummalaJaegeuk Kim
authored andcommitted
f2fs: Fix deadlock in f2fs_gc() context during atomic files handling
The FS got stuck in the below stack when the storage is almost full/dirty condition (when FG_GC is being done). schedule_timeout io_schedule_timeout congestion_wait f2fs_drop_inmem_pages_all f2fs_gc f2fs_balance_fs __write_node_page f2fs_fsync_node_pages f2fs_do_sync_file f2fs_ioctl The root cause for this issue is there is a potential infinite loop in f2fs_drop_inmem_pages_all() for the case where gc_failure is true and when there an inode whose i_gc_failures[GC_FAILURE_ATOMIC] is not set. Fix this by keeping track of the total atomic files currently opened and using that to exit from this condition. Fix-suggested-by: Chao Yu <[email protected]> Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Sahitya Tummala <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent c45d600 commit 677017d

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

fs/f2fs/f2fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,6 +1297,7 @@ struct f2fs_sb_info {
12971297
unsigned int gc_mode; /* current GC state */
12981298
unsigned int next_victim_seg[2]; /* next segment in victim section */
12991299
/* for skip statistic */
1300+
unsigned int atomic_files; /* # of opened atomic file */
13001301
unsigned long long skipped_atomic_files[2]; /* FG_GC and BG_GC */
13011302
unsigned long long skipped_gc_rwsem; /* FG_GC only */
13021303

fs/f2fs/file.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,6 +1922,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
19221922
spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
19231923
if (list_empty(&fi->inmem_ilist))
19241924
list_add_tail(&fi->inmem_ilist, &sbi->inode_list[ATOMIC_FILE]);
1925+
sbi->atomic_files++;
19251926
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
19261927

19271928
/* add inode in inmem_list first and set atomic_file */

fs/f2fs/segment.c

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ void f2fs_drop_inmem_pages_all(struct f2fs_sb_info *sbi, bool gc_failure)
288288
struct list_head *head = &sbi->inode_list[ATOMIC_FILE];
289289
struct inode *inode;
290290
struct f2fs_inode_info *fi;
291+
unsigned int count = sbi->atomic_files;
292+
unsigned int looped = 0;
291293
next:
292294
spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
293295
if (list_empty(head)) {
@@ -296,22 +298,26 @@ void f2fs_drop_inmem_pages_all(struct f2fs_sb_info *sbi, bool gc_failure)
296298
}
297299
fi = list_first_entry(head, struct f2fs_inode_info, inmem_ilist);
298300
inode = igrab(&fi->vfs_inode);
301+
if (inode)
302+
list_move_tail(&fi->inmem_ilist, head);
299303
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
300304

301305
if (inode) {
302306
if (gc_failure) {
303-
if (fi->i_gc_failures[GC_FAILURE_ATOMIC])
304-
goto drop;
305-
goto skip;
307+
if (!fi->i_gc_failures[GC_FAILURE_ATOMIC])
308+
goto skip;
306309
}
307-
drop:
308310
set_inode_flag(inode, FI_ATOMIC_REVOKE_REQUEST);
309311
f2fs_drop_inmem_pages(inode);
312+
skip:
310313
iput(inode);
311314
}
312-
skip:
313315
congestion_wait(BLK_RW_ASYNC, HZ/50);
314316
cond_resched();
317+
if (gc_failure) {
318+
if (++looped >= count)
319+
return;
320+
}
315321
goto next;
316322
}
317323

@@ -327,13 +333,16 @@ void f2fs_drop_inmem_pages(struct inode *inode)
327333
mutex_unlock(&fi->inmem_lock);
328334
}
329335

330-
clear_inode_flag(inode, FI_ATOMIC_FILE);
331336
fi->i_gc_failures[GC_FAILURE_ATOMIC] = 0;
332337
stat_dec_atomic_write(inode);
333338

334339
spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
335340
if (!list_empty(&fi->inmem_ilist))
336341
list_del_init(&fi->inmem_ilist);
342+
if (f2fs_is_atomic_file(inode)) {
343+
clear_inode_flag(inode, FI_ATOMIC_FILE);
344+
sbi->atomic_files--;
345+
}
337346
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
338347
}
339348

0 commit comments

Comments
 (0)