From: "Darrick J. Wong" <[email protected]>
To: Jens Axboe <[email protected]>
Cc: [email protected], [email protected], [email protected],
[email protected], [email protected]
Subject: Re: [PATCH 1/8] iomap: cleanup up iomap_dio_bio_end_io()
Date: Fri, 21 Jul 2023 08:13:40 -0700 [thread overview]
Message-ID: <20230721151340.GK11352@frogsfrogsfrogs> (raw)
In-Reply-To: <[email protected]>
On Thu, Jul 20, 2023 at 12:13:03PM -0600, Jens Axboe wrote:
> Make the logic a bit easier to follow:
>
> 1) Add a release_bio out path, as everybody needs to touch that, and
> have our bio ref check jump there if it's non-zero.
> 2) Add a kiocb local variable.
> 3) Add comments for each of the three conditions (sync, inline, or
> async workqueue punt).
>
> No functional changes in this patch.
>
> Signed-off-by: Jens Axboe <[email protected]>
Thanks for deindentifying this,
Reviewed-by: Darrick J. Wong <[email protected]>
--D
> ---
> fs/iomap/direct-io.c | 46 +++++++++++++++++++++++++++++---------------
> 1 file changed, 31 insertions(+), 15 deletions(-)
>
> diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
> index ea3b868c8355..0ce60e80c901 100644
> --- a/fs/iomap/direct-io.c
> +++ b/fs/iomap/direct-io.c
> @@ -152,27 +152,43 @@ void iomap_dio_bio_end_io(struct bio *bio)
> {
> struct iomap_dio *dio = bio->bi_private;
> bool should_dirty = (dio->flags & IOMAP_DIO_DIRTY);
> + struct kiocb *iocb = dio->iocb;
>
> if (bio->bi_status)
> iomap_dio_set_error(dio, blk_status_to_errno(bio->bi_status));
> + if (!atomic_dec_and_test(&dio->ref))
> + goto release_bio;
>
> - if (atomic_dec_and_test(&dio->ref)) {
> - if (dio->wait_for_completion) {
> - struct task_struct *waiter = dio->submit.waiter;
> - WRITE_ONCE(dio->submit.waiter, NULL);
> - blk_wake_io_task(waiter);
> - } else if (dio->flags & IOMAP_DIO_WRITE) {
> - struct inode *inode = file_inode(dio->iocb->ki_filp);
> -
> - WRITE_ONCE(dio->iocb->private, NULL);
> - INIT_WORK(&dio->aio.work, iomap_dio_complete_work);
> - queue_work(inode->i_sb->s_dio_done_wq, &dio->aio.work);
> - } else {
> - WRITE_ONCE(dio->iocb->private, NULL);
> - iomap_dio_complete_work(&dio->aio.work);
> - }
> + /*
> + * Synchronous dio, task itself will handle any completion work
> + * that needs after IO. All we need to do is wake the task.
> + */
> + if (dio->wait_for_completion) {
> + struct task_struct *waiter = dio->submit.waiter;
> +
> + WRITE_ONCE(dio->submit.waiter, NULL);
> + blk_wake_io_task(waiter);
> + goto release_bio;
> + }
> +
> + /* Read completion can always complete inline. */
> + if (!(dio->flags & IOMAP_DIO_WRITE)) {
> + WRITE_ONCE(iocb->private, NULL);
> + iomap_dio_complete_work(&dio->aio.work);
> + goto release_bio;
> }
>
> + /*
> + * Async DIO completion that requires filesystem level completion work
> + * gets punted to a work queue to complete as the operation may require
> + * more IO to be issued to finalise filesystem metadata changes or
> + * guarantee data integrity.
> + */
> + WRITE_ONCE(iocb->private, NULL);
> + INIT_WORK(&dio->aio.work, iomap_dio_complete_work);
> + queue_work(file_inode(iocb->ki_filp)->i_sb->s_dio_done_wq,
> + &dio->aio.work);
> +release_bio:
> if (should_dirty) {
> bio_check_pages_dirty(bio);
> } else {
> --
> 2.40.1
>
next prev parent reply other threads:[~2023-07-21 15:13 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 18:13 [PATCHSET v4 0/8] Improve async iomap DIO performance Jens Axboe
2023-07-20 18:13 ` [PATCH 1/8] iomap: cleanup up iomap_dio_bio_end_io() Jens Axboe
2023-07-21 6:14 ` Christoph Hellwig
2023-07-21 15:13 ` Darrick J. Wong [this message]
2023-07-20 18:13 ` [PATCH 2/8] iomap: add IOMAP_DIO_INLINE_COMP Jens Axboe
2023-07-21 6:14 ` Christoph Hellwig
2023-07-21 15:16 ` Darrick J. Wong
2023-07-20 18:13 ` [PATCH 3/8] iomap: treat a write through cache the same as FUA Jens Axboe
2023-07-21 6:15 ` Christoph Hellwig
2023-07-21 14:04 ` Jens Axboe
2023-07-21 15:55 ` Darrick J. Wong
2023-07-21 16:03 ` Jens Axboe
2023-07-20 18:13 ` [PATCH 4/8] iomap: completed polled IO inline Jens Axboe
2023-07-21 6:16 ` Christoph Hellwig
2023-07-21 15:19 ` Darrick J. Wong
2023-07-21 21:43 ` Dave Chinner
2023-07-22 3:10 ` Jens Axboe
2023-07-22 23:05 ` Dave Chinner
2023-07-24 22:35 ` Jens Axboe
2023-07-22 16:54 ` Jens Axboe
2023-07-20 18:13 ` [PATCH 5/8] iomap: only set iocb->private for polled bio Jens Axboe
2023-07-21 6:18 ` Christoph Hellwig
2023-07-21 15:35 ` Darrick J. Wong
2023-07-21 15:37 ` Jens Axboe
2023-07-20 18:13 ` [PATCH 6/8] fs: add IOCB flags related to passing back dio completions Jens Axboe
2023-07-21 6:18 ` Christoph Hellwig
2023-07-21 15:48 ` Darrick J. Wong
2023-07-21 15:53 ` Jens Axboe
2023-07-20 18:13 ` [PATCH 7/8] io_uring/rw: add write support for IOCB_DIO_DEFER Jens Axboe
2023-07-21 6:19 ` Christoph Hellwig
2023-07-21 15:50 ` Darrick J. Wong
2023-07-21 15:53 ` Jens Axboe
2023-07-20 18:13 ` [PATCH 8/8] iomap: support IOCB_DIO_DEFER Jens Axboe
2023-07-21 6:19 ` Christoph Hellwig
2023-07-21 16:01 ` Darrick J. Wong
2023-07-21 16:30 ` Jens Axboe
2023-07-21 22:05 ` Dave Chinner
2023-07-22 3:12 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2023-07-24 22:55 [PATCHSET v6 0/8] Improve async iomap DIO performance Jens Axboe
2023-07-24 22:55 ` [PATCH 1/8] iomap: cleanup up iomap_dio_bio_end_io() Jens Axboe
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=20230721151340.GK11352@frogsfrogsfrogs \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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