From: Nikolay Borisov <nborisov@suse.com>
To: Christoph Hellwig <hch@lst.de>,
"Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Damien Le Moal <Damien.LeMoal@wdc.com>,
Andreas Gruenbacher <agruenba@redhat.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 09/12] xfs: refactor the ioend merging code
Date: Mon, 24 Jun 2019 19:06:22 +0300 [thread overview]
Message-ID: <e42c54c4-4c64-8185-8ac3-cca38ad8e8a4@suse.com> (raw)
In-Reply-To: <20190624055253.31183-10-hch@lst.de>
On 24.06.19 г. 8:52 ч., Christoph Hellwig wrote:
> Introduce two nicely abstracted helper, which can be moved to the
> iomap code later. Also use list_pop and list_first_entry_or_null
> to simplify the code a bit.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/xfs_aops.c | 66 ++++++++++++++++++++++++++---------------------
> 1 file changed, 36 insertions(+), 30 deletions(-)
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index acbd73976067..5d302ebe2a33 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -121,6 +121,19 @@ xfs_destroy_ioend(
> }
> }
>
> +static void
> +xfs_destroy_ioends(
> + struct xfs_ioend *ioend,
> + int error)
> +{
> + struct list_head tmp;
> +
> + list_replace_init(&ioend->io_list, &tmp);
> + xfs_destroy_ioend(ioend, error);
> + while ((ioend = list_pop(&tmp, struct xfs_ioend, io_list)))
> + xfs_destroy_ioend(ioend, error);
nit: I'd prefer if the list_pop patch is right before this one since
this is the first user of it. Additionally, I don't think list_pop is
really a net-negative win in comparison to list_for_each_entry_safe
here. In fact this "delete the list" would seems more idiomatic if
implemented via list_for_each_entry_safe
> +}
> +
> /*
> * Fast and loose check if this write could update the on-disk inode size.
> */
> @@ -173,7 +186,6 @@ xfs_end_ioend(
> struct xfs_ioend *ioend)
> {
> unsigned int nofs_flag = memalloc_nofs_save();
> - struct list_head ioend_list;
> struct xfs_inode *ip = XFS_I(ioend->io_inode);
> xfs_off_t offset = ioend->io_offset;
> size_t size = ioend->io_size;
> @@ -207,16 +219,7 @@ xfs_end_ioend(
> if (!error && xfs_ioend_is_append(ioend))
> error = xfs_setfilesize(ip, offset, size);
> done:
> - list_replace_init(&ioend->io_list, &ioend_list);
> - xfs_destroy_ioend(ioend, error);
> -
> - while (!list_empty(&ioend_list)) {
> - ioend = list_first_entry(&ioend_list, struct xfs_ioend,
> - io_list);
> - list_del_init(&ioend->io_list);
> - xfs_destroy_ioend(ioend, error);
> - }
> -
> + xfs_destroy_ioends(ioend, error);
> memalloc_nofs_restore(nofs_flag);
> }
>
> @@ -246,15 +249,16 @@ xfs_ioend_try_merge(
> struct xfs_ioend *ioend,
> struct list_head *more_ioends)
> {
> - struct xfs_ioend *next_ioend;
> + struct xfs_ioend *next;
>
> - while (!list_empty(more_ioends)) {
> - next_ioend = list_first_entry(more_ioends, struct xfs_ioend,
> - io_list);
> - if (!xfs_ioend_can_merge(ioend, next_ioend))
> + INIT_LIST_HEAD(&ioend->io_list);
> +
> + while ((next = list_first_entry_or_null(more_ioends, struct xfs_ioend,
> + io_list))) {
> + if (!xfs_ioend_can_merge(ioend, next))
> break;
> - list_move_tail(&next_ioend->io_list, &ioend->io_list);
> - ioend->io_size += next_ioend->io_size;
> + list_move_tail(&next->io_list, &ioend->io_list);
> + ioend->io_size += next->io_size;
> }
> }
>
> @@ -277,29 +281,31 @@ xfs_ioend_compare(
> return 0;
> }
>
> +static void
> +xfs_sort_ioends(
> + struct list_head *ioend_list)
> +{
> + list_sort(NULL, ioend_list, xfs_ioend_compare);
> +}
> +
> /* Finish all pending io completions. */
> void
> xfs_end_io(
> struct work_struct *work)
> {
> - struct xfs_inode *ip;
> + struct xfs_inode *ip =
> + container_of(work, struct xfs_inode, i_ioend_work);
> struct xfs_ioend *ioend;
> - struct list_head completion_list;
> + struct list_head tmp;
> unsigned long flags;
>
> - ip = container_of(work, struct xfs_inode, i_ioend_work);
> -
> spin_lock_irqsave(&ip->i_ioend_lock, flags);
> - list_replace_init(&ip->i_ioend_list, &completion_list);
> + list_replace_init(&ip->i_ioend_list, &tmp);
> spin_unlock_irqrestore(&ip->i_ioend_lock, flags);
>
> - list_sort(NULL, &completion_list, xfs_ioend_compare);
> -
> - while (!list_empty(&completion_list)) {
> - ioend = list_first_entry(&completion_list, struct xfs_ioend,
> - io_list);
> - list_del_init(&ioend->io_list);
> - xfs_ioend_try_merge(ioend, &completion_list);
> + xfs_sort_ioends(&tmp);
> + while ((ioend = list_pop(&tmp, struct xfs_ioend, io_list))) {
> + xfs_ioend_try_merge(ioend, &tmp);
> xfs_end_ioend(ioend);
Here again, tmp is a local copy that is immutable so using while()
instead of list_for_each_entry_safe doesn't seem to be providing much.
> }
> }
>
next prev parent reply other threads:[~2019-06-24 16:06 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 5:52 lift the xfs writepage code into iomap Christoph Hellwig
2019-06-24 5:52 ` [PATCH 01/12] list.h: add a list_pop helper Christoph Hellwig
2019-06-24 14:53 ` Darrick J. Wong
2019-06-24 15:51 ` Matthew Wilcox
2019-06-25 10:06 ` Christoph Hellwig
2019-06-24 5:52 ` [PATCH 02/12] xfs: simplify xfs_chain_bio Christoph Hellwig
2019-06-24 15:14 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 03/12] xfs: fix a comment typo in xfs_submit_ioend Christoph Hellwig
2019-06-24 14:53 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 04/12] xfs: initialize ioma->flags in xfs_bmbt_to_iomap Christoph Hellwig
2019-06-24 14:57 ` Darrick J. Wong
2019-06-25 10:07 ` Christoph Hellwig
2019-06-25 15:13 ` Darrick J. Wong
2019-06-25 15:21 ` Christoph Hellwig
2019-06-24 5:52 ` [PATCH 05/12] xfs: use a struct iomap in xfs_writepage_ctx Christoph Hellwig
2019-06-24 15:50 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 06/12] xfs: remove XFS_TRANS_NOFS Christoph Hellwig
2019-06-24 15:58 ` Darrick J. Wong
2019-06-24 22:59 ` Dave Chinner
2019-06-25 10:12 ` Christoph Hellwig
2019-06-24 5:52 ` [PATCH 07/12] xfs: don't preallocate a transaction for file size updates Christoph Hellwig
2019-06-24 16:17 ` Darrick J. Wong
2019-06-24 23:15 ` Dave Chinner
2019-06-25 10:25 ` Christoph Hellwig
2019-06-27 22:23 ` Dave Chinner
2019-06-24 5:52 ` [PATCH 08/12] xfs: simplify xfs_ioend_can_merge Christoph Hellwig
2019-06-24 16:00 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 09/12] xfs: refactor the ioend merging code Christoph Hellwig
2019-06-24 16:04 ` Darrick J. Wong
2019-06-24 16:06 ` Nikolay Borisov [this message]
2019-06-25 10:14 ` Christoph Hellwig
2019-06-25 12:42 ` Nikolay Borisov
2019-06-25 14:45 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 10/12] xfs: remove the fork fields in the writepage_ctx and ioend Christoph Hellwig
2019-06-24 16:08 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 11/12] iomap: move the xfs writeback code to iomap.c Christoph Hellwig
2019-06-24 15:46 ` Darrick J. Wong
2019-06-25 10:08 ` Christoph Hellwig
2019-06-24 23:43 ` Dave Chinner
2019-06-25 10:10 ` Christoph Hellwig
2019-06-28 0:45 ` Dave Chinner
2019-06-28 5:33 ` Christoph Hellwig
2019-07-01 0:08 ` Dave Chinner
2019-07-01 6:43 ` Christoph Hellwig
2019-07-01 23:09 ` Dave Chinner
2019-06-28 22:27 ` Luis Chamberlain
2019-07-11 21:31 ` Brendan Higgins
2019-06-24 5:52 ` [PATCH 12/12] iomap: add tracing for the address space operations Christoph Hellwig
2019-06-24 23:49 ` Dave Chinner
2019-06-25 10:15 ` Christoph Hellwig
2019-06-25 14:47 ` Darrick J. Wong
2019-06-27 22:35 ` Dave Chinner
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=e42c54c4-4c64-8185-8ac3-cca38ad8e8a4@suse.com \
--to=nborisov@suse.com \
--cc=Damien.LeMoal@wdc.com \
--cc=agruenba@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@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).