Skip to content

Commit

Permalink
xfs: try to idiot-proof the allocators
Browse files Browse the repository at this point in the history
In porting his development branch to 6.3-rc1, yours truly has
repeatedly screwed up the args->pag being fed to the xfs_alloc_vextent*
functions.  Add some debugging assertions to test the preconditions
required of the callers.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
  • Loading branch information
Darrick J. Wong committed Mar 16, 2023
1 parent 8ac5b99 commit 6de4b1a
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions fs/xfs/libxfs/xfs_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3279,6 +3279,9 @@ xfs_alloc_vextent_this_ag(
xfs_agnumber_t minimum_agno;
int error;

ASSERT(args->pag != NULL);
ASSERT(args->pag->pag_agno == agno);

args->agno = agno;
args->agbno = 0;
error = xfs_alloc_vextent_check_args(args, XFS_AGB_TO_FSB(mp, agno, 0),
Expand Down Expand Up @@ -3394,6 +3397,8 @@ xfs_alloc_vextent_start_ag(
bool bump_rotor = false;
int error;

ASSERT(args->pag == NULL);

args->agno = NULLAGNUMBER;
args->agbno = NULLAGBLOCK;
error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);
Expand Down Expand Up @@ -3442,6 +3447,8 @@ xfs_alloc_vextent_first_ag(
xfs_agnumber_t start_agno;
int error;

ASSERT(args->pag == NULL);

args->agno = NULLAGNUMBER;
args->agbno = NULLAGBLOCK;
error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);
Expand Down Expand Up @@ -3470,6 +3477,9 @@ xfs_alloc_vextent_exact_bno(
xfs_agnumber_t minimum_agno;
int error;

ASSERT(args->pag != NULL);
ASSERT(args->pag->pag_agno == XFS_FSB_TO_AGNO(mp, target));

args->agno = XFS_FSB_TO_AGNO(mp, target);
args->agbno = XFS_FSB_TO_AGBNO(mp, target);
error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);
Expand Down Expand Up @@ -3502,6 +3512,9 @@ xfs_alloc_vextent_near_bno(
bool needs_perag = args->pag == NULL;
int error;

if (!needs_perag)
ASSERT(args->pag->pag_agno == XFS_FSB_TO_AGNO(mp, target));

args->agno = XFS_FSB_TO_AGNO(mp, target);
args->agbno = XFS_FSB_TO_AGBNO(mp, target);
error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);
Expand Down

0 comments on commit 6de4b1a

Please sign in to comment.