From: Dave Hansen <dave.hansen@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,Ted Ts'o
<tytso@mit.edu>,Christian Brauner <brauner@kernel.org>,Darrick
J. Wong <djwong@kernel.org>,Matthew Wilcox (Oracle)
<willy@infradead.org>,Al Viro
<viro@zeniv.linux.org.uk>,linux-fsdevel@vger.kernel.org,Dave
Hansen
<dave.hansen@linux.intel.com>,clm@fb.com,josef@toxicpanda.com,dsterba@suse.com,linux-btrfs@vger.kernel.org
Subject: [PATCH 6/7] btrfs: Move prefaulting out of hot write path
Date: Wed, 29 Jan 2025 10:18:00 -0800 [thread overview]
Message-ID: <20250129181800.ADD26AB5@davehans-spike.ostc.intel.com> (raw)
In-Reply-To: <20250129181749.C229F6F3@davehans-spike.ostc.intel.com>
From: Dave Hansen <dave.hansen@linux.intel.com>
Prefaulting the write source buffer incurs an extra userspace access
in the common fast path. Make btrfs_buffered_write() consistent with
generic_perform_write(): only touch userspace an extra time when
copy_folio_from_iter_atomic() has failed to make progress.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org
---
b/fs/btrfs/file.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff -puN fs/btrfs/file.c~btrfs-postfault fs/btrfs/file.c
--- a/fs/btrfs/file.c~btrfs-postfault 2025-01-29 09:03:36.927756510 -0800
+++ b/fs/btrfs/file.c 2025-01-29 09:03:36.935757176 -0800
@@ -1164,15 +1164,6 @@ ssize_t btrfs_buffered_write(struct kioc
int extents_locked;
bool force_page_uptodate = false;
- /*
- * Fault pages before locking them in prepare_one_folio()
- * to avoid recursive lock
- */
- if (unlikely(fault_in_iov_iter_readable(i, write_bytes))) {
- ret = -EFAULT;
- break;
- }
-
only_release_metadata = false;
sector_offset = pos & (fs_info->sectorsize - 1);
@@ -1314,6 +1305,17 @@ again:
cond_resched();
+ /*
+ * Fault pages in a slow path after dropping folio
+ * lock. This avoids the chance of deadlocking in
+ * the fault handler.
+ */
+ if (unlikely(copied == 0) &&
+ (fault_in_iov_iter_readable(i, write_bytes) == write_bytes)) {
+ ret = -EFAULT;
+ break;
+ }
+
pos += copied;
num_written += copied;
}
_
next prev parent reply other threads:[~2025-01-29 18:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-29 18:17 [PATCH 0/7] Move prefaulting into write slow paths Dave Hansen
2025-01-29 18:18 ` Dave Hansen [this message]
2025-01-30 7:44 ` Kent Overstreet
2025-01-30 16:04 ` Dave Hansen
2025-01-30 21:36 ` Dave Chinner
2025-01-31 1:06 ` Kent Overstreet
2025-01-31 0:56 ` Kent Overstreet
2025-01-31 1:34 ` Dave Hansen
2025-01-31 2:17 ` Kent Overstreet
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=20250129181800.ADD26AB5@davehans-spike.ostc.intel.com \
--to=dave.hansen@linux.intel.com \
--cc=brauner@kernel.org \
--cc=clm@fb.com \
--cc=djwong@kernel.org \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.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