Skip to contentSkip to conversation

f2fs:Fix concurrent access issue in the function recover_dentry

PATCH RESEND Superseded Nicholas Krause 2 participants 2 messages Sep 23, 2015 F2FS file system

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 f2fs:Fix concurrent access issue in the function recover_dentry

This fixes a concurrent access in the function recover_dentry by locking the superblock representation in memory with f2fs_lock_op before calling the function __f2fs_add_link and unlocking the superblock afterwards with f2fs_unlock_op in order to avoid concurrent access here as neither recover_dentry nor its callers

---
 fs/f2fs/recovery.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
fs/f2fs/recovery.c +8 -1
index faec2ca..6bb03f8 100644
@@ -70,6 +70,7 @@ static struct fsync_inode_entry *get_fsync_inode(struct list_head *head,
 static int recover_dentry(struct inode *inode, struct page *ipage)
 {
 	struct f2fs_inode *raw_inode = F2FS_INODE(ipage);
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 	nid_t pino = le32_to_cpu(raw_inode->i_pino);
 	struct f2fs_dir_entry *de;
 	struct qstr name;
@@ -119,9 +120,15 @@ retry:
 		iput(einode);
 		goto retry;
 	}
+
+
+	f2fs_lock_op(sbi);
 	err = __f2fs_add_link(dir, &name, inode, inode->i_ino, inode->i_mode);
-	if (err)
+	if (err) {
+		f2fs_unlock_op(sbi);
 		goto out_err;
+	}
+	f2fs_unlock_op(sbi);
 
 	if (is_inode_flag_set(F2FS_I(dir), FI_DELAY_IPUT)) {
 		iput(dir);
Signature · 9 lines
2.1.4


------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
maintainer
#1 lore raw
Quoted 5 lines · Nicholas Krause

This fixes a concurrent access in the function recover_dentry by locking the superblock representation in memory with f2fs_lock_op before calling the function __f2fs_add_link and unlocking the superblock afterwards with f2fs_unlock_op in order to avoid concurrent access here as neither recover_dentry nor its callers

It doesn't need to do this.
IIRC, this was explained twice by Chao.
Please, do not ignore any opinions.

Thanks,

Quoted 37 lines
---
 fs/f2fs/recovery.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
fs/f2fs/recovery.c +8 -1
index faec2ca..6bb03f8 100644
@@ -70,6 +70,7 @@ static struct fsync_inode_entry *get_fsync_inode(struct list_head *head,
 static int recover_dentry(struct inode *inode, struct page *ipage)
 {
 	struct f2fs_inode *raw_inode = F2FS_INODE(ipage);
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 	nid_t pino = le32_to_cpu(raw_inode->i_pino);
 	struct f2fs_dir_entry *de;
 	struct qstr name;
@@ -119,9 +120,15 @@ retry:
 		iput(einode);
 		goto retry;
 	}
+
+
+	f2fs_lock_op(sbi);
 	err = __f2fs_add_link(dir, &name, inode, inode->i_ino, inode->i_mode);
-	if (err)
+	if (err) {
+		f2fs_unlock_op(sbi);
 		goto out_err;
+	}
+	f2fs_unlock_op(sbi);
 
 	if (is_inode_flag_set(F2FS_I(dir), FI_DELAY_IPUT)) {
 		iput(dir);
Signature · 1 line
2.1.4