mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-19 22:36:49 +07:00
b2a8864728
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: 9d43b180af ("xfs: update inode allocation/free transaction reservations for finobt")
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
102 lines
3.7 KiB
C
102 lines
3.7 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
|
|
* All Rights Reserved.
|
|
*/
|
|
#ifndef __XFS_TRANS_SPACE_H__
|
|
#define __XFS_TRANS_SPACE_H__
|
|
|
|
/*
|
|
* Components of space reservations.
|
|
*/
|
|
|
|
/* Worst case number of rmaps that can be held in a block. */
|
|
#define XFS_MAX_CONTIG_RMAPS_PER_BLOCK(mp) \
|
|
(((mp)->m_rmap_mxr[0]) - ((mp)->m_rmap_mnr[0]))
|
|
|
|
/* Adding one rmap could split every level up to the top of the tree. */
|
|
#define XFS_RMAPADD_SPACE_RES(mp) ((mp)->m_rmap_maxlevels)
|
|
|
|
/* Blocks we might need to add "b" rmaps to a tree. */
|
|
#define XFS_NRMAPADD_SPACE_RES(mp, b)\
|
|
(((b + XFS_MAX_CONTIG_RMAPS_PER_BLOCK(mp) - 1) / \
|
|
XFS_MAX_CONTIG_RMAPS_PER_BLOCK(mp)) * \
|
|
XFS_RMAPADD_SPACE_RES(mp))
|
|
|
|
#define XFS_MAX_CONTIG_EXTENTS_PER_BLOCK(mp) \
|
|
(((mp)->m_alloc_mxr[0]) - ((mp)->m_alloc_mnr[0]))
|
|
#define XFS_EXTENTADD_SPACE_RES(mp,w) (XFS_BM_MAXLEVELS(mp,w) - 1)
|
|
#define XFS_NEXTENTADD_SPACE_RES(mp,b,w)\
|
|
(((b + XFS_MAX_CONTIG_EXTENTS_PER_BLOCK(mp) - 1) / \
|
|
XFS_MAX_CONTIG_EXTENTS_PER_BLOCK(mp)) * \
|
|
XFS_EXTENTADD_SPACE_RES(mp,w))
|
|
|
|
/* Blocks we might need to add "b" mappings & rmappings to a file. */
|
|
#define XFS_SWAP_RMAP_SPACE_RES(mp,b,w)\
|
|
(XFS_NEXTENTADD_SPACE_RES((mp), (b), (w)) + \
|
|
XFS_NRMAPADD_SPACE_RES((mp), (b)))
|
|
|
|
#define XFS_DAENTER_1B(mp,w) \
|
|
((w) == XFS_DATA_FORK ? (mp)->m_dir_geo->fsbcount : 1)
|
|
#define XFS_DAENTER_DBS(mp,w) \
|
|
(XFS_DA_NODE_MAXDEPTH + (((w) == XFS_DATA_FORK) ? 2 : 0))
|
|
#define XFS_DAENTER_BLOCKS(mp,w) \
|
|
(XFS_DAENTER_1B(mp,w) * XFS_DAENTER_DBS(mp,w))
|
|
#define XFS_DAENTER_BMAP1B(mp,w) \
|
|
XFS_NEXTENTADD_SPACE_RES(mp, XFS_DAENTER_1B(mp, w), w)
|
|
#define XFS_DAENTER_BMAPS(mp,w) \
|
|
(XFS_DAENTER_DBS(mp,w) * XFS_DAENTER_BMAP1B(mp,w))
|
|
#define XFS_DAENTER_SPACE_RES(mp,w) \
|
|
(XFS_DAENTER_BLOCKS(mp,w) + XFS_DAENTER_BMAPS(mp,w))
|
|
#define XFS_DAREMOVE_SPACE_RES(mp,w) XFS_DAENTER_BMAPS(mp,w)
|
|
#define XFS_DIRENTER_MAX_SPLIT(mp,nl) 1
|
|
#define XFS_DIRENTER_SPACE_RES(mp,nl) \
|
|
(XFS_DAENTER_SPACE_RES(mp, XFS_DATA_FORK) * \
|
|
XFS_DIRENTER_MAX_SPLIT(mp,nl))
|
|
#define XFS_DIRREMOVE_SPACE_RES(mp) \
|
|
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) * \
|
|
(M_IGEO(mp)->inobt_maxlevels - 1)))
|
|
|
|
/*
|
|
* Space reservation values for various transactions.
|
|
*/
|
|
#define XFS_ADDAFORK_SPACE_RES(mp) \
|
|
((mp)->m_dir_geo->fsbcount + XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK))
|
|
#define XFS_ATTRRM_SPACE_RES(mp) \
|
|
XFS_DAREMOVE_SPACE_RES(mp, XFS_ATTR_FORK)
|
|
/* This macro is not used - see inline code in xfs_attr_set */
|
|
#define XFS_ATTRSET_SPACE_RES(mp, v) \
|
|
(XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK) + XFS_B_TO_FSB(mp, v))
|
|
#define XFS_CREATE_SPACE_RES(mp,nl) \
|
|
(XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))
|
|
#define XFS_DIOSTRAT_SPACE_RES(mp, v) \
|
|
(XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + (v))
|
|
#define XFS_GROWFS_SPACE_RES(mp) \
|
|
(2 * (mp)->m_ag_maxlevels)
|
|
#define XFS_GROWFSRT_SPACE_RES(mp,b) \
|
|
((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK))
|
|
#define XFS_LINK_SPACE_RES(mp,nl) \
|
|
XFS_DIRENTER_SPACE_RES(mp,nl)
|
|
#define XFS_MKDIR_SPACE_RES(mp,nl) \
|
|
(XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))
|
|
#define XFS_QM_DQALLOC_SPACE_RES(mp) \
|
|
(XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + \
|
|
XFS_DQUOT_CLUSTER_SIZE_FSB)
|
|
#define XFS_QM_QINOCREATE_SPACE_RES(mp) \
|
|
XFS_IALLOC_SPACE_RES(mp)
|
|
#define XFS_REMOVE_SPACE_RES(mp) \
|
|
XFS_DIRREMOVE_SPACE_RES(mp)
|
|
#define XFS_RENAME_SPACE_RES(mp,nl) \
|
|
(XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))
|
|
#define XFS_SYMLINK_SPACE_RES(mp,nl,b) \
|
|
(XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl) + (b))
|
|
#define XFS_IFREE_SPACE_RES(mp) \
|
|
(xfs_sb_version_hasfinobt(&mp->m_sb) ? \
|
|
M_IGEO(mp)->inobt_maxlevels : 0)
|
|
|
|
|
|
#endif /* __XFS_TRANS_SPACE_H__ */
|