From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 3/4] f2fs: avoid f2fs_lock_op in f2fs_write_begin
Date: Wed, 23 Dec 2015 18:15:19 -0800 [thread overview]
Message-ID: <1450923320-41113-3-git-send-email-jaegeuk@kernel.org> (raw)
In-Reply-To: <1450923320-41113-1-git-send-email-jaegeuk@kernel.org>
If f2fs_write_begin is to update data, we can bypass calling f2fs_lock_op() in
order to avoid the checkpoint latency in the write syscall.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/data.c | 43 ++++++++++++++++++++++++++++++++++---------
1 file changed, 34 insertions(+), 9 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 49092da..d53cf4f 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1418,10 +1418,16 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
pgoff_t index = page->index;
struct dnode_of_data dn;
struct page *ipage;
+ bool locked = false;
+ struct extent_info ei;
int err = 0;
- f2fs_lock_op(sbi);
-
+ if (f2fs_has_inline_data(inode) ||
+ (pos & PAGE_CACHE_MASK) >= i_size_read(inode)) {
+ f2fs_lock_op(sbi);
+ locked = true;
+ }
+restart:
/* check inline_data */
ipage = get_node_page(sbi, inode->i_ino);
if (IS_ERR(ipage)) {
@@ -1436,22 +1442,41 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
read_inline_data(page, ipage);
set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
sync_inode_page(&dn);
- goto done;
} else {
err = f2fs_convert_inline_page(&dn, page);
if (err)
- goto err_out;
+ goto out;
+ err = f2fs_get_block(&dn, index);
+ }
+ } else if (locked) {
+ err = f2fs_get_block(&dn, index);
+ } else {
+ if (f2fs_lookup_extent_cache(inode, index, &ei)) {
+ dn.data_blkaddr = ei.blk + index - ei.fofs;
+ } else {
+ bool restart = false;
+
+ /* hole case */
+ err = get_dnode_of_data(&dn, index, LOOKUP_NODE);
+ if (err || (!err && dn.data_blkaddr == NULL_ADDR))
+ restart = true;
+ if (restart) {
+ f2fs_put_dnode(&dn);
+ f2fs_lock_op(sbi);
+ locked = true;
+ goto restart;
+ }
}
}
- err = f2fs_get_block(&dn, index);
-done:
+
/* convert_inline_page can make node_changed */
*blk_addr = dn.data_blkaddr;
*node_changed = dn.node_changed;
-err_out:
+out:
f2fs_put_dnode(&dn);
unlock_out:
- f2fs_unlock_op(sbi);
+ if (locked)
+ f2fs_unlock_op(sbi);
return err;
}
@@ -1488,7 +1513,7 @@ repeat:
*pagep = page;
- err = prepare_write_begin(sbi, page, pos + len,
+ err = prepare_write_begin(sbi, page, pos, len,
&blkaddr, &need_balance);
if (err)
goto fail;
--
2.5.4 (Apple Git-61)
------------------------------------------------------------------------------
WARNING: multiple messages have this Message-ID (diff)
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 3/4] f2fs: avoid f2fs_lock_op in f2fs_write_begin
Date: Wed, 23 Dec 2015 18:15:19 -0800 [thread overview]
Message-ID: <1450923320-41113-3-git-send-email-jaegeuk@kernel.org> (raw)
In-Reply-To: <1450923320-41113-1-git-send-email-jaegeuk@kernel.org>
If f2fs_write_begin is to update data, we can bypass calling f2fs_lock_op() in
order to avoid the checkpoint latency in the write syscall.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/data.c | 43 ++++++++++++++++++++++++++++++++++---------
1 file changed, 34 insertions(+), 9 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 49092da..d53cf4f 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1418,10 +1418,16 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
pgoff_t index = page->index;
struct dnode_of_data dn;
struct page *ipage;
+ bool locked = false;
+ struct extent_info ei;
int err = 0;
- f2fs_lock_op(sbi);
-
+ if (f2fs_has_inline_data(inode) ||
+ (pos & PAGE_CACHE_MASK) >= i_size_read(inode)) {
+ f2fs_lock_op(sbi);
+ locked = true;
+ }
+restart:
/* check inline_data */
ipage = get_node_page(sbi, inode->i_ino);
if (IS_ERR(ipage)) {
@@ -1436,22 +1442,41 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
read_inline_data(page, ipage);
set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
sync_inode_page(&dn);
- goto done;
} else {
err = f2fs_convert_inline_page(&dn, page);
if (err)
- goto err_out;
+ goto out;
+ err = f2fs_get_block(&dn, index);
+ }
+ } else if (locked) {
+ err = f2fs_get_block(&dn, index);
+ } else {
+ if (f2fs_lookup_extent_cache(inode, index, &ei)) {
+ dn.data_blkaddr = ei.blk + index - ei.fofs;
+ } else {
+ bool restart = false;
+
+ /* hole case */
+ err = get_dnode_of_data(&dn, index, LOOKUP_NODE);
+ if (err || (!err && dn.data_blkaddr == NULL_ADDR))
+ restart = true;
+ if (restart) {
+ f2fs_put_dnode(&dn);
+ f2fs_lock_op(sbi);
+ locked = true;
+ goto restart;
+ }
}
}
- err = f2fs_get_block(&dn, index);
-done:
+
/* convert_inline_page can make node_changed */
*blk_addr = dn.data_blkaddr;
*node_changed = dn.node_changed;
-err_out:
+out:
f2fs_put_dnode(&dn);
unlock_out:
- f2fs_unlock_op(sbi);
+ if (locked)
+ f2fs_unlock_op(sbi);
return err;
}
@@ -1488,7 +1513,7 @@ repeat:
*pagep = page;
- err = prepare_write_begin(sbi, page, pos + len,
+ err = prepare_write_begin(sbi, page, pos, len,
&blkaddr, &need_balance);
if (err)
goto fail;
--
2.5.4 (Apple Git-61)
next prev parent reply other threads:[~2015-12-24 2:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-24 2:15 [PATCH 1/4] f2fs: introduce prepare_write_begin to clean up Jaegeuk Kim
2015-12-24 2:15 ` Jaegeuk Kim
2015-12-24 2:15 ` [PATCH 2/4] f2fs: return early when trying to read null nid Jaegeuk Kim
2015-12-24 2:15 ` Jaegeuk Kim
2015-12-24 5:49 ` [f2fs-dev] " Chao Yu
2015-12-24 20:15 ` Jaegeuk Kim
2015-12-25 0:57 ` Chao Yu
2015-12-25 0:57 ` [f2fs-dev] " Chao Yu
2015-12-24 2:15 ` Jaegeuk Kim [this message]
2015-12-24 2:15 ` [PATCH 3/4] f2fs: avoid f2fs_lock_op in f2fs_write_begin Jaegeuk Kim
2015-12-24 5:50 ` [f2fs-dev] " Chao Yu
2015-12-24 20:33 ` Jaegeuk Kim
2015-12-24 21:51 ` Jaegeuk Kim
2015-12-25 1:18 ` Chao Yu
2015-12-25 1:18 ` [f2fs-dev] " Chao Yu
2015-12-25 1:40 ` Jaegeuk Kim
2015-12-25 1:40 ` [f2fs-dev] " Jaegeuk Kim
2015-12-24 2:15 ` [PATCH 4/4] f2fs: declare static function Jaegeuk Kim
2015-12-24 2:15 ` Jaegeuk Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450923320-41113-3-git-send-email-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.