From: Kent Overstreet <kent.overstreet@linux.dev>
To: linux-bcachefs@vger.kernel.org
Cc: Kent Overstreet <kent.overstreet@linux.dev>,
Jann Horn <jannh@google.com>, Jens Axboe <axboe@kernel.dk>
Subject: [PATCH] bcachefs: dio write: Take ref on mm_struct when using asynchronously
Date: Wed, 27 Nov 2024 16:36:49 -0500 [thread overview]
Message-ID: <20241127213649.1615078-1-kent.overstreet@linux.dev> (raw)
When invoked from aio, mm_struct is guaranteed to outlive the request
since its lifetime is tied to the io_context - but that's not the case
for io_uring, it's possible that a process could be killed and mm_struct
goes away while a request is in flight.
So if we're submitting the rest of the io asynchronously, we may need a
ref on mm_struct.
Per Jens, this is not actually a bug because we're not yet flipping on
FMODE_NOWAIT, meaning io_uring will do the submission from an io_worker
kthread - but this patch is necessary for safely flipping on
FMODE_NOWAIT for more efficient submissions in the future.
Reported-by: Jann Horn <jannh@google.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---
fs/bcachefs/fs-io-direct.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/fs/bcachefs/fs-io-direct.c b/fs/bcachefs/fs-io-direct.c
index 2089c36b5866..cea4dd9a0745 100644
--- a/fs/bcachefs/fs-io-direct.c
+++ b/fs/bcachefs/fs-io-direct.c
@@ -226,6 +226,7 @@ struct dio_write {
struct mm_struct *mm;
const struct iovec *iov;
unsigned loop:1,
+ have_mm_ref:1,
extending:1,
sync:1,
flush:1;
@@ -390,6 +391,9 @@ static __always_inline long bch2_dio_write_done(struct dio_write *dio)
kfree(dio->iov);
+ if (dio->have_mm_ref)
+ mmput(dio->mm);
+
ret = dio->op.error ?: ((long) dio->written << 9);
bio_put(&dio->op.wbio.bio);
@@ -529,9 +533,24 @@ static __always_inline long bch2_dio_write_loop(struct dio_write *dio)
if (unlikely(dio->iter.count) &&
!dio->sync &&
- !dio->loop &&
- bch2_dio_write_copy_iov(dio))
- dio->sync = sync = true;
+ !dio->loop) {
+ /*
+ * Rest of write will be submitted asynchronously -
+ * unless copying the iov fails:
+ */
+ if (likely(!bch2_dio_write_copy_iov(dio))) {
+ /*
+ * aio guarantees that mm_struct outlives the
+ * request, but io_uring does not
+ */
+ if (dio->mm) {
+ mmgrab(dio->mm);
+ dio->have_mm_ref = true;
+ }
+ } else {
+ dio->sync = sync = true;
+ }
+ }
dio->loop = true;
closure_call(&dio->op.cl, bch2_write, NULL, NULL);
@@ -559,7 +578,7 @@ static __always_inline long bch2_dio_write_loop(struct dio_write *dio)
static noinline __cold void bch2_dio_write_continue(struct dio_write *dio)
{
- struct mm_struct *mm = dio->mm;
+ struct mm_struct *mm = dio->have_mm_ref ? dio->mm: NULL;
bio_reset(&dio->op.wbio.bio, NULL, REQ_OP_WRITE);
--
2.45.2
next reply other threads:[~2024-11-27 21:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-27 21:36 Kent Overstreet [this message]
2024-11-27 21:47 ` [PATCH] bcachefs: dio write: Take ref on mm_struct when using asynchronously Jens Axboe
2024-11-27 21:48 ` Jann Horn
2024-11-27 22:11 ` Kent Overstreet
2024-11-27 22:21 ` Jens Axboe
2024-11-27 23:11 ` Jann Horn
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=20241127213649.1615078-1-kent.overstreet@linux.dev \
--to=kent.overstreet@linux.dev \
--cc=axboe@kernel.dk \
--cc=jannh@google.com \
--cc=linux-bcachefs@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