From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org, hch@lst.de
Subject: Re: [PATCH 02/10] xfs: use xfs_buf_alloc_pages for uncached buffers
Date: Thu, 27 May 2021 15:50:49 -0700 [thread overview]
Message-ID: <20210527225049.GB2402049@locust> (raw)
In-Reply-To: <20210526224722.1111377-3-david@fromorbit.com>
On Thu, May 27, 2021 at 08:47:14AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Use the newly factored out page allocation code. This adds
> automatic buffer zeroing for non-read uncached buffers.
>
> This also allows us to greatly simply the error handling in
> xfs_buf_get_uncached(). Because xfs_buf_alloc_pages() cleans up
> partial allocation failure, we can just call xfs_buf_free() in all
> error cases now to clean up after failures.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Nice cleanup!
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/libxfs/xfs_ag.c | 1 -
> fs/xfs/xfs_buf.c | 27 ++++++---------------------
> 2 files changed, 6 insertions(+), 22 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c
> index c68a36688474..be0087825ae0 100644
> --- a/fs/xfs/libxfs/xfs_ag.c
> +++ b/fs/xfs/libxfs/xfs_ag.c
> @@ -43,7 +43,6 @@ xfs_get_aghdr_buf(
> if (error)
> return error;
>
> - xfs_buf_zero(bp, 0, BBTOB(bp->b_length));
> bp->b_bn = blkno;
> bp->b_maps[0].bm_bn = blkno;
> bp->b_ops = ops;
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 2e35d344a69b..b1610115d401 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -973,7 +973,7 @@ xfs_buf_get_uncached(
> struct xfs_buf **bpp)
> {
> unsigned long page_count;
> - int error, i;
> + int error;
> struct xfs_buf *bp;
> DEFINE_SINGLE_BUF_MAP(map, XFS_BUF_DADDR_NULL, numblks);
>
> @@ -982,41 +982,26 @@ xfs_buf_get_uncached(
> /* flags might contain irrelevant bits, pass only what we care about */
> error = _xfs_buf_alloc(target, &map, 1, flags & XBF_NO_IOACCT, &bp);
> if (error)
> - goto fail;
> + return error;
>
> page_count = PAGE_ALIGN(numblks << BBSHIFT) >> PAGE_SHIFT;
> - error = _xfs_buf_get_pages(bp, page_count);
> + error = xfs_buf_alloc_pages(bp, page_count, flags);
> if (error)
> goto fail_free_buf;
>
> - for (i = 0; i < page_count; i++) {
> - bp->b_pages[i] = alloc_page(xb_to_gfp(flags));
> - if (!bp->b_pages[i]) {
> - error = -ENOMEM;
> - goto fail_free_mem;
> - }
> - }
> - bp->b_flags |= _XBF_PAGES;
> -
> error = _xfs_buf_map_pages(bp, 0);
> if (unlikely(error)) {
> xfs_warn(target->bt_mount,
> "%s: failed to map pages", __func__);
> - goto fail_free_mem;
> + goto fail_free_buf;
> }
>
> trace_xfs_buf_get_uncached(bp, _RET_IP_);
> *bpp = bp;
> return 0;
>
> - fail_free_mem:
> - while (--i >= 0)
> - __free_page(bp->b_pages[i]);
> - _xfs_buf_free_pages(bp);
> - fail_free_buf:
> - xfs_buf_free_maps(bp);
> - kmem_cache_free(xfs_buf_zone, bp);
> - fail:
> +fail_free_buf:
> + xfs_buf_free(bp);
> return error;
> }
>
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-05-27 22:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 22:47 [PATCH 00/10] xfs: buffer bulk page allocation and cleanups Dave Chinner
2021-05-26 22:47 ` [PATCH 01/10] xfs: split up xfs_buf_allocate_memory Dave Chinner
2021-05-27 22:48 ` Darrick J. Wong
2021-05-27 23:10 ` Darrick J. Wong
2021-05-26 22:47 ` [PATCH 02/10] xfs: use xfs_buf_alloc_pages for uncached buffers Dave Chinner
2021-05-27 22:50 ` Darrick J. Wong [this message]
2021-05-26 22:47 ` [PATCH 03/10] xfs: use alloc_pages_bulk_array() for buffers Dave Chinner
2021-05-27 22:59 ` Darrick J. Wong
2021-05-27 23:01 ` Darrick J. Wong
2021-05-26 22:47 ` [PATCH 04/10] xfs: merge _xfs_buf_get_pages() Dave Chinner
2021-05-27 23:02 ` Darrick J. Wong
2021-05-26 22:47 ` [PATCH 05/10] xfs: move page freeing into _xfs_buf_free_pages() Dave Chinner
2021-05-27 23:03 ` Darrick J. Wong
2021-05-26 22:47 ` [PATCH 06/10] xfs: remove ->b_offset handling for page backed buffers Dave Chinner
2021-05-27 23:09 ` Darrick J. Wong
2021-06-01 1:46 ` Dave Chinner
2021-05-26 22:47 ` [PATCH 07/10] xfs: simplify the b_page_count calculation Dave Chinner
2021-05-27 23:15 ` Darrick J. Wong
2021-05-27 23:29 ` Dave Chinner
2021-05-26 22:47 ` [PATCH 08/10] xfs: get rid of xb_to_gfp() Dave Chinner
2021-05-27 23:12 ` Darrick J. Wong
2021-05-26 22:47 ` [PATCH 09/10] xfs: cleanup error handling in xfs_buf_get_map Dave Chinner
2021-05-27 23:16 ` Darrick J. Wong
2021-05-26 22:47 ` [PATCH 10/10] xfs: merge xfs_buf_allocate_memory Dave Chinner
2021-05-27 23:17 ` 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=20210527225049.GB2402049@locust \
--to=djwong@kernel.org \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--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