Skip to content

Commit 9c234ff

Browse files
Jaegeuk KimHashcode
authored andcommitted
f2fs: avoid balanc_fs during evict_inode
1. Background Previously, if f2fs tries to move data blocks of an *evicting* inode during the cleaning process, it stops the process incompletely and then restarts the whole process, since it needs a locked inode to grab victim data pages in its address space. In order to get a locked inode, iget_locked() by f2fs_iget() is normally used, but, it waits if the inode is on freeing. So, here is a deadlock scenario. 1. f2fs_evict_inode() <- inode "A" 2. f2fs_balance_fs() 3. f2fs_gc() 4. gc_data_segment() 5. f2fs_iget() <- inode "A" too! If step #1 and #5 treat a same inode "A", step #5 would fall into deadlock since the inode "A" is on freeing. In order to resolve this, f2fs_iget_nowait() which skips __wait_on_freeing_inode() was introduced in step #5, and stops f2fs_gc() to complete f2fs_evict_inode(). 1. f2fs_evict_inode() <- inode "A" 2. f2fs_balance_fs() 3. f2fs_gc() 4. gc_data_segment() 5. f2fs_iget_nowait() <- inode "A", then stop f2fs_gc() w/ -ENOENT 2. Problem and Solution In the above scenario, however, f2fs cannot finish f2fs_evict_inode() only if: o there are not enough free sections, and o f2fs_gc() tries to move data blocks of the *evicting* inode repeatedly. So, the final solution is to use f2fs_iget() and remove f2fs_balance_fs() in f2fs_evict_inode(). The f2fs_evict_inode() actually truncates all the data and node blocks, which means that it doesn't produce any dirty node pages accordingly. So, we don't need to do f2fs_balance_fs() in practical. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
1 parent cfbbe5c commit 9c234ff

File tree

5 files changed

+3
-38
lines changed

5 files changed

+3
-38
lines changed

fs/f2fs/f2fs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,6 @@ long f2fs_ioctl(struct file *, unsigned int, unsigned long);
847847
* inode.c
848848
*/
849849
void f2fs_set_inode_flags(struct inode *);
850-
struct inode *f2fs_iget_nowait(struct super_block *, unsigned long);
851850
struct inode *f2fs_iget(struct super_block *, unsigned long);
852851
void update_inode(struct inode *, struct page *);
853852
int f2fs_write_inode(struct inode *, struct writeback_control *);

fs/f2fs/file.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,6 @@ void f2fs_truncate(struct inode *inode)
300300
inode->i_mtime = inode->i_ctime = CURRENT_TIME;
301301
mark_inode_dirty(inode);
302302
}
303-
304-
f2fs_balance_fs(F2FS_SB(inode->i_sb));
305303
}
306304

307305
static int f2fs_getattr(struct vfsmount *mnt,
@@ -358,6 +356,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
358356
attr->ia_size != i_size_read(inode)) {
359357
truncate_setsize(inode, attr->ia_size);
360358
f2fs_truncate(inode);
359+
f2fs_balance_fs(F2FS_SB(inode->i_sb));
361360
}
362361

363362
__setattr_copy(inode, attr);

fs/f2fs/gc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
579579
ofs_in_node = le16_to_cpu(entry->ofs_in_node);
580580

581581
if (phase == 2) {
582-
inode = f2fs_iget_nowait(sb, dni.ino);
582+
inode = f2fs_iget(sb, dni.ino);
583583
if (IS_ERR(inode))
584584
continue;
585585

fs/f2fs/inode.c

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
#include "f2fs.h"
1717
#include "node.h"
1818

19-
struct f2fs_iget_args {
20-
u64 ino;
21-
int on_free;
22-
};
23-
2419
void f2fs_set_inode_flags(struct inode *inode)
2520
{
2621
unsigned int flags = F2FS_I(inode)->i_flags;
@@ -40,34 +35,6 @@ void f2fs_set_inode_flags(struct inode *inode)
4035
inode->i_flags |= S_DIRSYNC;
4136
}
4237

43-
static int f2fs_iget_test(struct inode *inode, void *data)
44-
{
45-
struct f2fs_iget_args *args = data;
46-
47-
if (inode->i_ino != args->ino)
48-
return 0;
49-
if (inode->i_state & (I_FREEING | I_WILL_FREE)) {
50-
args->on_free = 1;
51-
return 0;
52-
}
53-
return 1;
54-
}
55-
56-
struct inode *f2fs_iget_nowait(struct super_block *sb, unsigned long ino)
57-
{
58-
struct f2fs_iget_args args = {
59-
.ino = ino,
60-
.on_free = 0
61-
};
62-
struct inode *inode = ilookup5(sb, ino, f2fs_iget_test, &args);
63-
64-
if (inode)
65-
return inode;
66-
if (!args.on_free)
67-
return f2fs_iget(sb, ino);
68-
return ERR_PTR(-ENOENT);
69-
}
70-
7138
static int do_read_inode(struct inode *inode)
7239
{
7340
struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);

fs/f2fs/recovery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static void check_index_in_prev_nodes(struct f2fs_sb_info *sbi,
224224
f2fs_put_page(node_page, 1);
225225

226226
/* Deallocate previous index in the node page */
227-
inode = f2fs_iget_nowait(sbi->sb, ino);
227+
inode = f2fs_iget(sbi->sb, ino);
228228
if (IS_ERR(inode))
229229
return;
230230

0 commit comments

Comments
 (0)