From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v3 1/4] btrfs: refactor @nrptrs calculation of btrfs_buffered_write()
Date: Tue, 25 Aug 2020 13:48:05 +0800 [thread overview]
Message-ID: <20200825054808.16241-2-wqu@suse.com> (raw)
In-Reply-To: <20200825054808.16241-1-wqu@suse.com>
@nrptrs of btrfs_bufferd_write() determines the up limit of pages we can
process in one batch.
Refactor that calculation into its own function, and fix a small page
alignment bug where the result can be one page less than ideal.
Despite that, no functionality change.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/file.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 5a818ebcb01f..64f744989697 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1620,6 +1620,25 @@ void btrfs_check_nocow_unlock(struct btrfs_inode *inode)
btrfs_drew_write_unlock(&inode->root->snapshot_lock);
}
+/* Helper to get how many pages we should alloc for the batch */
+static int calc_nr_pages(loff_t pos, struct iov_iter *iov)
+{
+ int nr_pages;
+
+ /*
+ * Try to cover the full iov range, as btrfs metadata/data reserve
+ * and release can be pretty slow, thus the more pages we process in
+ * one batch the better.
+ */
+ nr_pages = (round_up(pos + iov_iter_count(iov), PAGE_SIZE) -
+ round_down(pos, PAGE_SIZE)) / PAGE_SIZE;
+
+ nr_pages = min(nr_pages, current->nr_dirtied_pause -
+ current->nr_dirtied);
+ nr_pages = max(nr_pages, 8);
+ return nr_pages;
+}
+
static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,
struct iov_iter *i)
{
@@ -1638,10 +1657,7 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,
bool only_release_metadata = false;
bool force_page_uptodate = false;
- nrptrs = min(DIV_ROUND_UP(iov_iter_count(i), PAGE_SIZE),
- PAGE_SIZE / (sizeof(struct page *)));
- nrptrs = min(nrptrs, current->nr_dirtied_pause - current->nr_dirtied);
- nrptrs = max(nrptrs, 8);
+ nrptrs = calc_nr_pages(pos, i);
pages = kmalloc_array(nrptrs, sizeof(struct page *), GFP_KERNEL);
if (!pages)
return -ENOMEM;
--
2.28.0
next prev parent reply other threads:[~2020-08-25 5:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 5:48 [PATCH v3 0/4] btrfs: basic refactor of btrfs_buffered_write() Qu Wenruo
2020-08-25 5:48 ` Qu Wenruo [this message]
2020-08-25 5:48 ` [PATCH v3 2/4] btrfs: refactor btrfs_buffered_write() into process_one_batch() Qu Wenruo
2020-08-25 5:48 ` [PATCH v3 3/4] btrfs: remove the again: tag in process_one_batch() Qu Wenruo
2020-08-25 5:48 ` [PATCH v3 4/4] btrfs: avoid allocating unnecessary page pointers Qu Wenruo
2020-08-25 7:46 ` kernel test robot
2020-08-25 7:57 ` kernel test robot
2020-08-26 12:31 ` kernel test robot
2020-08-25 11:44 ` [PATCH v3 0/4] btrfs: basic refactor of btrfs_buffered_write() Christoph Hellwig
2020-08-25 13:32 ` Goldwyn Rodrigues
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=20200825054808.16241-2-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).