From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 03/16] xfs: finobt AG reserves don't consider last AG can be a runt
Date: Wed, 7 Nov 2018 08:55:08 -0800 [thread overview]
Message-ID: <20181107165508.GA4135@magnolia> (raw)
In-Reply-To: <20181107063127.3902-4-david@fromorbit.com>
On Wed, Nov 07, 2018 at 05:31:14PM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The last AG may be very small comapred to all other AGs, and hence
> AG reservations based on the superblock AG size may actually consume
> more space than the AG actually has. This results on assert failures
> like:
>
> XFS: Assertion failed: xfs_perag_resv(pag, XFS_AG_RESV_METADATA)->ar_reserved + xfs_perag_resv(pag, XFS_AG_RESV_RMAPBT)->ar_reserved <= pag->pagf_freeblks + pag->pagf_flcount, file: fs/xfs/libxfs/xfs_ag_resv.c, line: 319
> [ 48.932891] xfs_ag_resv_init+0x1bd/0x1d0
> [ 48.933853] xfs_fs_reserve_ag_blocks+0x37/0xb0
> [ 48.934939] xfs_mountfs+0x5b3/0x920
> [ 48.935804] xfs_fs_fill_super+0x462/0x640
> [ 48.936784] ? xfs_test_remount_options+0x60/0x60
> [ 48.937908] mount_bdev+0x178/0x1b0
> [ 48.938751] mount_fs+0x36/0x170
> [ 48.939533] vfs_kern_mount.part.43+0x54/0x130
> [ 48.940596] do_mount+0x20e/0xcb0
> [ 48.941396] ? memdup_user+0x3e/0x70
> [ 48.942249] ksys_mount+0xba/0xd0
> [ 48.943046] __x64_sys_mount+0x21/0x30
> [ 48.943953] do_syscall_64+0x54/0x170
> [ 48.944835] entry_SYSCALL_64_after_hwframe+0x49/0xbe
>
> Hence we need to ensure the finobt per-ag space reservations take
> into account the size of the last AG rather than treat it like all
> the other full size AGs.
>
> Note that both refcountbt and rmapbt already take the size of the AG
> into account via reading the AGF length directly.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/xfs/libxfs/xfs_ialloc_btree.c | 17 +++++++++++++----
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
> index 86c50208a143..62014780d5e4 100644
> --- a/fs/xfs/libxfs/xfs_ialloc_btree.c
> +++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
> @@ -538,15 +538,24 @@ xfs_inobt_rec_check_count(
>
> static xfs_extlen_t
> xfs_inobt_max_size(
> - struct xfs_mount *mp)
> + struct xfs_mount *mp,
> + xfs_agnumber_t agno)
> {
> + uint32_t agblocks = mp->m_sb.sb_agblocks;
> +
> /* Bail out if we're uninitialized, which can happen in mkfs. */
> if (mp->m_inobt_mxr[0] == 0)
> return 0;
>
> + /* last AG can be a runt */
> + if (agno == mp->m_sb.sb_agcount - 1) {
> + div_u64_rem(mp->m_sb.sb_dblocks, mp->m_sb.sb_agblocks,
> + &agblocks);
> + }
Why not: agblocks = xfs_ag_block_count(mp, agno); ?
--D
> +
> return xfs_btree_calc_size(mp->m_inobt_mnr,
> - (uint64_t)mp->m_sb.sb_agblocks * mp->m_sb.sb_inopblock /
> - XFS_INODES_PER_CHUNK);
> + (uint64_t)agblocks * mp->m_sb.sb_inopblock /
> + XFS_INODES_PER_CHUNK);
> }
>
> static int
> @@ -594,7 +603,7 @@ xfs_finobt_calc_reserves(
> if (error)
> return error;
>
> - *ask += xfs_inobt_max_size(mp);
> + *ask += xfs_inobt_max_size(mp, agno);
> *used += tree_len;
> return 0;
> }
> --
> 2.19.1
>
next prev parent reply other threads:[~2018-11-08 2:26 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-07 6:31 [RFC PATCH 00/16] xfs: Block size > PAGE_SIZE support Dave Chinner
2018-11-07 6:31 ` [PATCH 01/16] xfs: drop ->writepage completely Dave Chinner
2018-11-09 15:12 ` Christoph Hellwig
2018-11-12 21:08 ` Dave Chinner
2021-02-02 20:51 ` Darrick J. Wong
2018-11-07 6:31 ` [PATCH 02/16] xfs: move writepage context warnings to writepages Dave Chinner
2018-11-07 6:31 ` [PATCH 03/16] xfs: finobt AG reserves don't consider last AG can be a runt Dave Chinner
2018-11-07 16:55 ` Darrick J. Wong [this message]
2018-11-09 0:21 ` Dave Chinner
2018-11-07 6:31 ` [PATCH 04/16] xfs: extent shifting doesn't fully invalidate page cache Dave Chinner
2018-11-07 6:31 ` [PATCH 05/16] iomap: sub-block dio needs to zeroout beyond EOF Dave Chinner
2018-11-09 15:15 ` Christoph Hellwig
2018-11-07 6:31 ` [PATCH 06/16] iomap: support block size > page size for direct IO Dave Chinner
2018-11-08 11:28 ` Nikolay Borisov
2018-11-09 15:18 ` Christoph Hellwig
2018-11-11 1:12 ` Dave Chinner
2018-11-07 6:31 ` [PATCH 07/16] iomap: prepare buffered IO paths for block size > page size Dave Chinner
2018-11-09 15:19 ` Christoph Hellwig
2018-11-11 1:15 ` Dave Chinner
2018-11-07 6:31 ` [PATCH 08/16] iomap: mode iomap_zero_range and friends Dave Chinner
2018-11-09 15:19 ` Christoph Hellwig
2018-11-07 6:31 ` [PATCH 09/16] iomap: introduce zero-around functionality Dave Chinner
2018-11-07 6:31 ` [PATCH 10/16] iomap: enable zero-around for iomap_zero_range() Dave Chinner
2018-11-07 6:31 ` [PATCH 11/16] iomap: Don't mark partial pages zeroing uptodate for zero-around Dave Chinner
2018-11-07 6:31 ` [PATCH 12/16] iomap: zero-around in iomap_page_mkwrite Dave Chinner
2018-11-07 6:31 ` [PATCH 13/16] xfs: add zero-around controls to iomap Dave Chinner
2018-11-07 6:31 ` [PATCH 14/16] xfs: align writepages to large block sizes Dave Chinner
2018-11-09 15:22 ` Christoph Hellwig
2018-11-11 1:20 ` Dave Chinner
2018-11-11 16:32 ` Christoph Hellwig
2018-11-14 14:19 ` Brian Foster
2018-11-14 21:18 ` Dave Chinner
2018-11-15 12:55 ` Brian Foster
2018-11-16 6:19 ` Dave Chinner
2018-11-16 13:29 ` Brian Foster
2018-11-19 1:14 ` Dave Chinner
2018-11-07 6:31 ` [PATCH 15/16] xfs: expose block size in stat Dave Chinner
2018-11-07 6:31 ` [PATCH 16/16] xfs: enable block size larger than page size support Dave Chinner
2018-11-07 17:14 ` [RFC PATCH 00/16] xfs: Block size > PAGE_SIZE support Darrick J. Wong
2018-11-07 22:04 ` Dave Chinner
2018-11-08 1:38 ` Darrick J. Wong
2018-11-08 9:04 ` Dave Chinner
2018-11-08 22:17 ` Darrick J. Wong
2018-11-08 22:22 ` 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=20181107165508.GA4135@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-fsdevel@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).