From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
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, Dave Chinner <dchinner@redhat.com>
Subject: Re: [PATCH 05/14] xfs: refactor the ioend merging code
Date: Thu, 17 Oct 2019 11:40:30 -0700 [thread overview]
Message-ID: <20191017184030.GM13108@magnolia> (raw)
In-Reply-To: <20191017175624.30305-6-hch@lst.de>
On Thu, Oct 17, 2019 at 07:56:15PM +0200, Christoph Hellwig wrote:
> Introduce two nicely abstracted helper, which can be moved to the iomap
> code later. Also use list_first_entry_or_null to simplify the code a
> bit.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Dave Chinner <dchinner@redhat.com>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_aops.c | 73 +++++++++++++++++++++++++++--------------------
> 1 file changed, 42 insertions(+), 31 deletions(-)
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index 91899de2be09..c29ef69d1e51 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -116,6 +116,22 @@ 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_first_entry_or_null(&tmp, struct xfs_ioend,
> + io_list))) {
> + list_del_init(&ioend->io_list);
> + xfs_destroy_ioend(ioend, error);
> + }
> +}
> +
> /*
> * Fast and loose check if this write could update the on-disk inode size.
> */
> @@ -230,7 +246,6 @@ STATIC void
> xfs_end_ioend(
> struct xfs_ioend *ioend)
> {
> - 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;
> @@ -275,16 +290,7 @@ xfs_end_ioend(
> done:
> if (ioend->io_append_trans)
> error = xfs_setfilesize_ioend(ioend, error);
> - 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);
> }
>
> @@ -333,17 +339,18 @@ xfs_ioend_try_merge(
> struct xfs_ioend *ioend,
> struct list_head *more_ioends)
> {
> - struct xfs_ioend *next_ioend;
> + struct xfs_ioend *next;
> +
> + INIT_LIST_HEAD(&ioend->io_list);
>
> - 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))
> + 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;
> - if (next_ioend->io_append_trans)
> - xfs_ioend_merge_append_transactions(ioend, next_ioend);
> + list_move_tail(&next->io_list, &ioend->io_list);
> + ioend->io_size += next->io_size;
> + if (next->io_append_trans)
> + xfs_ioend_merge_append_transactions(ioend, next);
> }
> }
>
> @@ -366,29 +373,33 @@ 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);
> + xfs_sort_ioends(&tmp);
> + while ((ioend = list_first_entry_or_null(&tmp, struct xfs_ioend,
> + io_list))) {
> list_del_init(&ioend->io_list);
> - xfs_ioend_try_merge(ioend, &completion_list);
> + xfs_ioend_try_merge(ioend, &tmp);
> xfs_end_ioend(ioend);
> }
> }
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-10-17 18:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 17:56 lift the xfs writepage code into iomap v8 Christoph Hellwig
2019-10-17 17:56 ` [PATCH 01/14] iomap: iomap that extends beyond EOF should be marked dirty Christoph Hellwig
2019-10-17 18:39 ` Darrick J. Wong
2019-10-17 21:56 ` Dave Chinner
2019-10-17 23:08 ` Matthew Bobrowski
2019-10-18 1:02 ` Darrick J. Wong
2019-10-18 7:20 ` Christoph Hellwig
2019-10-17 17:56 ` [PATCH 02/14] xfs: initialize iomap->flags in xfs_bmbt_to_iomap Christoph Hellwig
2019-10-17 17:56 ` [PATCH 03/14] xfs: set IOMAP_F_NEW more carefully Christoph Hellwig
2019-10-17 17:56 ` [PATCH 04/14] xfs: use a struct iomap in xfs_writepage_ctx Christoph Hellwig
2019-10-17 17:56 ` [PATCH 05/14] xfs: refactor the ioend merging code Christoph Hellwig
2019-10-17 18:40 ` Darrick J. Wong [this message]
2019-10-17 17:56 ` [PATCH 06/14] xfs: turn io_append_trans into an io_private void pointer Christoph Hellwig
2019-10-17 17:56 ` [PATCH 07/14] xfs: remove the fork fields in the writepage_ctx and ioend Christoph Hellwig
2019-10-17 17:56 ` [PATCH 08/14] iomap: zero newly allocated mapped blocks Christoph Hellwig
2019-10-17 17:56 ` [PATCH 09/14] iomap: lift common tracing code from xfs to iomap Christoph Hellwig
2019-10-17 17:56 ` [PATCH 10/14] iomap: lift the xfs writeback code " Christoph Hellwig
2019-10-17 18:48 ` Darrick J. Wong
2019-10-17 22:01 ` Dave Chinner
2019-10-17 17:56 ` [PATCH 11/14] iomap: warn on inline maps in iomap_writepage_map Christoph Hellwig
2019-10-17 17:56 ` [PATCH 12/14] iomap: move struct iomap_page out of iomap.h Christoph Hellwig
2019-10-17 17:56 ` [PATCH 13/14] iomap: cleanup iomap_ioend_compare Christoph Hellwig
2019-10-17 17:56 ` [PATCH 14/14] iomap: pass a struct page to iomap_finish_page_writeback Christoph Hellwig
2019-10-17 18:41 ` Darrick J. Wong
2019-10-17 20:49 ` lift the xfs writepage code into iomap v8 Darrick J. Wong
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=20191017184030.GM13108@magnolia \
--to=darrick.wong@oracle.com \
--cc=Damien.LeMoal@wdc.com \
--cc=agruenba@redhat.com \
--cc=dchinner@redhat.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).