fix dblocks adjustment in growfs v3
Subsystems (2)
Hi all,
the first patch fixes a possible incorrect sb_dblocks when growfs gits the maximum agcount or a too small AG. The second then cleans up the surrounding code to be better readable.
Btw, is there any reason to have this code in xfs_ag.c? It is only used by growfs and not at all in userspace, so having it in xfs_fsops.c would seem more natural.
Changes since v2:
- another too large overflow fix
- spelling fixes
Changes since v1:
- clarify what we wrong in the commit log for patch 1
- use a 64-bit agno variable in patch 2 to deal with 32-bit overflows
Diffstat:
libxfs/xfs_ag.c | 44 +++++++++++++++++++++----------------------- libxfs/xfs_ag.h | 5 ++--- xfs_fsops.c | 4 +++- 3 files changed, 26 insertions(+), 27 deletions(-)
PATCH 1/2 xfs: pass back updated nb from xfs_growfs_compute_deltas
xfs_growfs_compute_deltas can update nb for corner cases like a number of blocks that would create a less the minimal sized AG, or running past the max AG limit. Pass back the calculated value to the caller, as it relies on to calculate the new number of perag structures.
Note that the grown file system size is not affected by this miscalculation as it uses the passed back delta value.
--- fs/xfs/libxfs/xfs_ag.c | 10 +++++----- fs/xfs/libxfs/xfs_ag.h | 2 +- fs/xfs/xfs_fsops.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
fs/xfs/libxfs/xfs_ag.c +5 -5
@@ -866,7 +866,7 @@ xfs_ag_shrink_space(void xfs_growfs_compute_deltas (struct xfs_mount *mp, -xfs_rfsblock_t nb, +xfs_rfsblock_t *nb,int64_t *deltap,xfs_agnumber_t *nagcountp) {
@@ -874,19 +874,19 @@ xfs_growfs_compute_deltas(int64_t delta;xfs_agnumber_t nagcount; - nb_div = nb; + nb_div = *nb; nb_mod =do_div (nb_div, mp->m_sb.sb_agblocks);if (nb_mod && nb_mod >=XFS_MIN_AG_BLOCKS ) nb_div++;else if (nb_mod) - nb = nb_div * mp->m_sb.sb_agblocks; + *nb = nb_div * mp->m_sb.sb_agblocks;if (nb_div >XFS_MAX_AGNUMBER +1 ) { nb_div =XFS_MAX_AGNUMBER +1 ; - nb = nb_div * mp->m_sb.sb_agblocks; + *nb = nb_div * mp->m_sb.sb_agblocks; } nagcount = nb_div; - delta = nb - mp->m_sb.sb_dblocks; + delta = *nb - mp->m_sb.sb_dblocks; *deltap = delta; *nagcountp = nagcount; }
fs/xfs/libxfs/xfs_ag.h +1 -1
@@ -330,7 +330,7 @@ int xfs_ag_init_headers(struct xfs_mount *mp, struct aghdr_init_data *id);int xfs_ag_shrink_space (struct xfs_perag *pag,struct xfs_trans **tpp,xfs_extlen_t delta);void -xfs_growfs_compute_deltas (struct xfs_mount *mp,xfs_rfsblock_t nb, +xfs_growfs_compute_deltas (struct xfs_mount *mp,xfs_rfsblock_t *nb,int64_t *deltap,xfs_agnumber_t *nagcountp);int xfs_ag_extend_space (struct xfs_perag *pag,struct xfs_trans *tp,xfs_extlen_t len);
fs/xfs/xfs_fsops.c +1 -1
@@ -124,7 +124,7 @@ xfs_growfs_data_private( mp->m_sb.sb_rextsize);if (error)return error; -xfs_growfs_compute_deltas (mp, nb, &delta, &nagcount); +xfs_growfs_compute_deltas (mp, &nb, &delta, &nagcount);/* * Reject filesystems with a single AG because they are not
Signature · 1 line
2.53.0
PATCH 2/2 xfs: cleanup xfs_growfs_compute_deltas
In reply to Christoph Hellwigxfs_growfs_compute_deltas has an odd calling conventions, and looks very convoluted due to the use of do_div and strangely named and typed variables.
Rename it, make it return the agcount and let the caller calculate the delta. The internally use the better div_u64_rem helper and descriptive variable names and types. Also add a comment describing what the function is used for.
--- fs/xfs/libxfs/xfs_ag.c | 44 ++++++++++++++++++++---------------------- fs/xfs/libxfs/xfs_ag.h | 5 ++--- fs/xfs/xfs_fsops.c | 4 +++- 3 files changed, 26 insertions(+), 27 deletions(-)
fs/xfs/libxfs/xfs_ag.c +21 -23
@@ -863,32 +863,30 @@ xfs_ag_shrink_space(return err2; } -void -xfs_growfs_compute_deltas ( +/* +* Return the agcount for the new file system size passed in *nb and adjust *nb +* when it has to be reduced because of maximum AG count or because it would +* create a below minimum size AG. +*/ +xfs_agnumber_t +xfs_growfs_compute_agcount (struct xfs_mount *mp, -xfs_rfsblock_t *nb, -int64_t *deltap, -xfs_agnumber_t *nagcountp) +xfs_rfsblock_t *nb) { -xfs_rfsblock_t nb_div, nb_mod; -int64_t delta; -xfs_agnumber_t nagcount; - - nb_div = *nb; - nb_mod =do_div (nb_div, mp->m_sb.sb_agblocks); -if (nb_mod && nb_mod >=XFS_MIN_AG_BLOCKS ) - nb_div++; -else if (nb_mod) - *nb = nb_div * mp->m_sb.sb_agblocks; - -if (nb_div >XFS_MAX_AGNUMBER +1 ) { - nb_div =XFS_MAX_AGNUMBER +1 ; - *nb = nb_div * mp->m_sb.sb_agblocks; +uint64_t agcount;/* 64-bits wide to catch overflows */ +xfs_extlen_t remainder; + + agcount =div_u64_rem (*nb, mp->m_sb.sb_agblocks, &remainder); +if (agcount >=XFS_MAX_AGNUMBER +1 ) { + agcount =XFS_MAX_AGNUMBER +1 ; + remainder =0 ; + } + *nb = (xfs_rfsblock_t )agcount * mp->m_sb.sb_agblocks; +if (remainder >=XFS_MIN_AG_BLOCKS ) { + *nb += remainder; + agcount++; } - nagcount = nb_div; - delta = *nb - mp->m_sb.sb_dblocks; - *deltap = delta; - *nagcountp = nagcount; +return agcount; }/*
fs/xfs/libxfs/xfs_ag.h +2 -3
@@ -329,12 +329,11 @@ struct aghdr_init_data {int xfs_ag_init_headers (struct xfs_mount *mp,struct aghdr_init_data *id);int xfs_ag_shrink_space (struct xfs_perag *pag,struct xfs_trans **tpp,xfs_extlen_t delta); -void -xfs_growfs_compute_deltas (struct xfs_mount *mp,xfs_rfsblock_t *nb, -int64_t *deltap,xfs_agnumber_t *nagcountp);int xfs_ag_extend_space (struct xfs_perag *pag,struct xfs_trans *tp,xfs_extlen_t len);int xfs_ag_get_geometry (struct xfs_perag *pag,struct xfs_ag_geometry *ageo); +xfs_agnumber_t xfs_growfs_compute_agcount (struct xfs_mount *mp, +xfs_rfsblock_t *nb);static inline xfs_fsblock_t xfs_agbno_to_fsb(
fs/xfs/xfs_fsops.c +3 -1
@@ -124,7 +124,9 @@ xfs_growfs_data_private( mp->m_sb.sb_rextsize);if (error)return error; -xfs_growfs_compute_deltas (mp, &nb, &delta, &nagcount); + + nagcount =xfs_growfs_compute_agcount (mp, &nb); + delta = nb - mp->m_sb.sb_dblocks;/* * Reject filesystems with a single AG because they are not
Signature · 1 line
2.53.0
Quoted 9 lines · Christoph Hellwig
the first patch fixes a possible incorrect
sb_dblockswhen growfs gits the maximum agcount or a too small AG. The second then cleans up the surrounding code to be better readable.Btw, is there any reason to have this code in
xfs_ag.c? It is only used by growfs and not at all in userspace, so having it inxfs_fsops.cwould seem more natural.[...]
Applied to for-next, thanks!
[1/2] xfs: pass back updated nb from xfs_growfs_compute_deltas
commit: 4cb6e89a3d901d4da515977e55f9a9a779238660
[2/2] xfs: cleanup xfs_growfs_compute_deltas
commit: dfac6ba84819bd12535943c4090766bbc6c5ea7eBest regards,
Signature · 1 line
Carlos Maiolino <[email protected]>