On 11/27/24 3:11 PM, Kent Overstreet wrote:
> diff --git a/fs/bcachefs/fs-io-direct.c b/fs/bcachefs/fs-io-direct.c
> index 2089c36b5866..8da0577411e8 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)
> + mmdrop(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,15 +578,25 @@ 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);
>
> - if (mm)
> + if (mm) {
> + if (unlikely(!mmget_not_zero(mm))) {
> + /* process exited */
> + dio->op.error = -ESRCH;
> + bch2_dio_write_done(dio);
> + return;
> + }
> +
> kthread_use_mm(mm);
> + }
> bch2_dio_write_loop(dio);
> - if (mm)
> + if (mm) {
> + mmput(mm);
> kthread_unuse_mm(mm);
> + }
> }
>
> static void bch2_dio_write_loop_async(struct bch_write_op *op)
Based on a quick look, this one looks good to me.
--
Jens Axboe
