From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Dave Chinner <david@fromorbit.com>
Cc: Brian Foster <bfoster@redhat.com>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH] xfs: fix inode allocation block res calculation precedence
Date: Wed, 15 Jul 2020 18:47:59 -0700 [thread overview]
Message-ID: <20200716014759.GH3151642@magnolia> (raw)
In-Reply-To: <20200715222935.GI2005@dread.disaster.area>
On Thu, Jul 16, 2020 at 08:29:35AM +1000, Dave Chinner wrote:
> On Wed, Jul 15, 2020 at 03:33:10PM -0400, Brian Foster wrote:
> > The block reservation calculation for inode allocation is supposed
> > to consist of the blocks required for the inode chunk plus
> > (maxlevels-1) of the inode btree multiplied by the number of inode
> > btrees in the fs (2 when finobt is enabled, 1 otherwise).
> >
> > Instead, the macro returns (ialloc_blocks + 2) due to a precedence
> > error in the calculation logic. This leads to block reservation
> > overruns via generic/531 on small block filesystems with finobt
> > enabled. Add braces to fix the calculation and reserve the
> > appropriate number of blocks.
> >
> > Fixes: 9d43b180af67 ("xfs: update inode allocation/free transaction reservations for finobt")
> > Signed-off-by: Brian Foster <bfoster@redhat.com>
> > ---
> > fs/xfs/libxfs/xfs_trans_space.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h
> > index 88221c7a04cc..c6df01a2a158 100644
> > --- a/fs/xfs/libxfs/xfs_trans_space.h
> > +++ b/fs/xfs/libxfs/xfs_trans_space.h
> > @@ -57,7 +57,7 @@
> > XFS_DAREMOVE_SPACE_RES(mp, XFS_DATA_FORK)
> > #define XFS_IALLOC_SPACE_RES(mp) \
> > (M_IGEO(mp)->ialloc_blks + \
> > - (xfs_sb_version_hasfinobt(&mp->m_sb) ? 2 : 1 * \
> > + ((xfs_sb_version_hasfinobt(&mp->m_sb) ? 2 : 1) * \
> > (M_IGEO(mp)->inobt_maxlevels - 1)))
>
> Ugh. THese macros really need rewriting as static inline functions.
> This would not have happened if it were written as:
>
> static inline int
> xfs_ialloc_space_res(struct xfs_mount *mp)
> {
> int res = M_IGEO(mp)->ialloc_blks;
>
> res += M_IGEO(mp)->inobt_maxlevels - 1;
> if (xfs_sb_version_hasfinobt(&mp->m_sb))
> res += M_IGEO(mp)->inobt_maxlevels - 1;
> return res;
> }
>
> Next question: why is this even a macro that is calculated on demand
> instead of a read-only constant held in inode geometry calculated
> at mount time? Then it doesn't even need to be an inline function
> and can just be rolled into xfs_ialloc_setup_geometry()....
Yeah, I hate those macros too. Fixing all that sounds like a <cough>
cleanup series for someone, but in the meantime this is easy enough to
backport to stable kernels.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
next prev parent reply other threads:[~2020-07-16 1:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 19:33 [PATCH] xfs: fix inode allocation block res calculation precedence Brian Foster
2020-07-15 22:29 ` Dave Chinner
2020-07-16 1:47 ` Darrick J. Wong [this message]
2020-07-16 2:02 ` Dave Chinner
2020-07-16 12:18 ` Brian Foster
2020-07-17 17:16 ` Eric Sandeen
2020-07-17 20:07 ` Darrick J. Wong
2020-07-16 12:18 ` [PATCH 2/2] xfs: replace ialloc space res macro with inline helper Brian Foster
2020-07-16 22:01 ` Dave Chinner
2020-07-17 12:25 ` Brian Foster
2020-07-21 15:01 ` [PATCH] xfs: fix inode allocation block res calculation precedence Christoph Hellwig
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=20200716014759.GH3151642@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--cc=david@fromorbit.com \
--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).