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 06/10] xfs: remove ->b_offset handling for page backed buffers
Date: Thu, 27 May 2021 16:09:58 -0700 [thread overview]
Message-ID: <20210527230958.GG2402049@locust> (raw)
In-Reply-To: <20210526224722.1111377-7-david@fromorbit.com>
On Thu, May 27, 2021 at 08:47:18AM +1000, Dave Chinner wrote:
> From : Christoph Hellwig <hch@lst.de>
>
> ->b_offset can only be non-zero for _XBF_KMEM backed buffers, so
> remove all code dealing with it for page backed buffers.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> [dgc: modified to fit this patchset]
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
I think it's the case that the only time we'd end up with a nonzero
b_offset is if the kmem_alloc returns a slab object in the middle of a
page, right? i.e. vmalloc is supposed to give us full pages, and we
hope that nobody ever sells a device with a 64k dma alignment...?
Assuming that's right,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/xfs_buf.c | 8 +++-----
> fs/xfs/xfs_buf.h | 3 ++-
> 2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index d15999c41885..87151d78a0d8 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -79,7 +79,7 @@ static inline int
> xfs_buf_vmap_len(
> struct xfs_buf *bp)
> {
> - return (bp->b_page_count * PAGE_SIZE) - bp->b_offset;
> + return (bp->b_page_count * PAGE_SIZE);
> }
>
> /*
> @@ -281,7 +281,7 @@ xfs_buf_free_pages(
> ASSERT(bp->b_flags & _XBF_PAGES);
>
> if (xfs_buf_is_vmapped(bp))
> - vm_unmap_ram(bp->b_addr - bp->b_offset, bp->b_page_count);
> + vm_unmap_ram(bp->b_addr, bp->b_page_count);
>
> for (i = 0; i < bp->b_page_count; i++) {
> if (bp->b_pages[i])
> @@ -442,7 +442,7 @@ _xfs_buf_map_pages(
> ASSERT(bp->b_flags & _XBF_PAGES);
> if (bp->b_page_count == 1) {
> /* A single page buffer is always mappable */
> - bp->b_addr = page_address(bp->b_pages[0]) + bp->b_offset;
> + bp->b_addr = page_address(bp->b_pages[0]);
> } else if (flags & XBF_UNMAPPED) {
> bp->b_addr = NULL;
> } else {
> @@ -469,7 +469,6 @@ _xfs_buf_map_pages(
>
> if (!bp->b_addr)
> return -ENOMEM;
> - bp->b_addr += bp->b_offset;
> }
>
> return 0;
> @@ -1680,7 +1679,6 @@ xfs_buf_offset(
> if (bp->b_addr)
> return bp->b_addr + offset;
>
> - offset += bp->b_offset;
> page = bp->b_pages[offset >> PAGE_SHIFT];
> return page_address(page) + (offset & (PAGE_SIZE-1));
> }
> diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
> index 459ca34f26f5..464dc548fa23 100644
> --- a/fs/xfs/xfs_buf.h
> +++ b/fs/xfs/xfs_buf.h
> @@ -167,7 +167,8 @@ struct xfs_buf {
> atomic_t b_pin_count; /* pin count */
> atomic_t b_io_remaining; /* #outstanding I/O requests */
> unsigned int b_page_count; /* size of page array */
> - unsigned int b_offset; /* page offset in first page */
> + unsigned int b_offset; /* page offset of b_addr,
> + only for _XBF_KMEM buffers */
> int b_error; /* error code on I/O */
>
> /*
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-05-27 23:10 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
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 [this message]
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=20210527230958.GG2402049@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