f2fs: release cp and dnode lock before IPU

We don't need to rewrite the page under cp_rwsem and dnode locks.

Signed-off-by: Hou Pengyang <houpengyang@huawei.com>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

4 files changed, 27 insertions, 16 deletions

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 2f2de18d24fe..1254986dd6eb 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1368,12 +1368,17 @@ int do_write_data_page(struct f2fs_io_info *fio)
 
                 if (valid_ipu_blkaddr(fio)) {
                         ipu_force = true;
+                        fio->need_lock = false;
                         goto got_it;
                 }
         }
+
+        if (fio->need_lock)
+                f2fs_lock_op(fio->sbi);
+
         err = get_dnode_of_data(&dn, page->index, LOOKUP_NODE);
         if (err)
-                return err;
+                goto out;
 
         fio->old_blkaddr = dn.data_blkaddr;
 
@@ -1394,22 +1399,26 @@ got_it:
          * it had better in-place writes for updated data.
          */
         if (ipu_force || (valid_ipu_blkaddr(fio) && need_inplace_update(fio))) {
-                f2fs_bug_on(fio->sbi, !fio->cp_rwsem_locked);
-                f2fs_unlock_op(fio->sbi);
-                fio->cp_rwsem_locked = false;
-
+                f2fs_put_dnode(&dn);
+                if (fio->need_lock)
+                        f2fs_unlock_op(fio->sbi);
                 err = rewrite_data_page(fio);
                 trace_f2fs_do_write_data_page(fio->page, IPU);
                 set_inode_flag(inode, FI_UPDATE_WRITE);
-        } else {
-                write_data_page(&dn, fio);
-                trace_f2fs_do_write_data_page(page, OPU);
-                set_inode_flag(inode, FI_APPEND_WRITE);
-                if (page->index == 0)
-                        set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
+                return err;
         }
+
+        /* LFS mode write path */
+        write_data_page(&dn, fio);
+        trace_f2fs_do_write_data_page(page, OPU);
+        set_inode_flag(inode, FI_APPEND_WRITE);
+        if (page->index == 0)
+                set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
 out_writepage:
         f2fs_put_dnode(&dn);
+out:
+        if (fio->need_lock)
+                f2fs_unlock_op(fio->sbi);
         return err;
 }
 
@@ -1434,7 +1443,7 @@ static int __write_data_page(struct page *page, bool *submitted,
                 .page = page,
                 .encrypted_page = NULL,
                 .submitted = false,
-                .cp_rwsem_locked = true,
+                .need_lock = true,
         };
 
         trace_f2fs_writepage(page, DATA);
@@ -1470,6 +1479,7 @@ write:
 
         /* Dentry blocks are controlled by checkpoint */
         if (S_ISDIR(inode->i_mode)) {
+                fio.need_lock = false;
                 err = do_write_data_page(&fio);
                 goto done;
         }
@@ -1487,13 +1497,12 @@ write:
                 if (!err)
                         goto out;
         }
-        f2fs_lock_op(sbi);
+
         if (err == -EAGAIN)
                 err = do_write_data_page(&fio);
         if (F2FS_I(inode)->last_disk_size < psize)
                 F2FS_I(inode)->last_disk_size = psize;
-        if (fio.cp_rwsem_locked)
-                f2fs_unlock_op(sbi);
+
 done:
         if (err && err != -ENOENT)
                 goto redirty_out;
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6f671c719570..713f072e5fbc 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -803,7 +803,7 @@ struct f2fs_io_info {
         struct page *page;      /* page to be written */
         struct page *encrypted_page;    /* encrypted page */
         bool submitted;         /* indicate IO submission */
-        bool cp_rwsem_locked;   /* indicate cp_rwsem is held */
+        bool need_lock;         /* indicate we need to lock cp_rwsem */
 };
 
 #define is_read_io(rw) ((rw) == READ)
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index c2a9ae8397d3..026522107ca3 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -717,6 +717,7 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type,
                         .old_blkaddr = NULL_ADDR,
                         .page = page,
                         .encrypted_page = NULL,
+                        .need_lock = true,
                 };
                 bool is_dirty = PageDirty(page);
                 int err;
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 656e1515ff56..e302f30ec7fe 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -312,6 +312,7 @@ static int __commit_inmem_pages(struct inode *inode,
                         fio.page = page;
                         fio.old_blkaddr = NULL_ADDR;
                         fio.encrypted_page = NULL;
+                        fio.need_lock = false,
                         err = do_write_data_page(&fio);
                         if (err) {
                                 unlock_page(page);