Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB2F02C11E7 for ; Sun, 23 Aug 2026 18:03:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787508234; cv=none; b=JNBUM8r6YjzItYd9pnHfnvsCgAewkq7AfJEPw+U+i8u7gO4GQoiFGuU2Vr9yySCYiMw513HHRf2FPMRV22QP+2Sb3PZYO1m9lvyc/yR4aYIW8TfcRmVtlMIa8jv+AgOucBkL2Mux+tJkT6EbmdTYPBRfT4Xf6IqFcHB4DXOvB+s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787508234; c=relaxed/simple; bh=QeuV3SjE9xVAAGKD3Vnxl4FoKDrIqQZNssbQrZ9YPkQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tB/5vNnGqImNNMLsAdI0PI5foRDcEsOhoS1dqqKb5VIZVElmk6NgfNKbZpDacrXgWbJnAFrOmlSU/xKOobeAafj5T4jrNG6ukd8oIUrhXK5l0T47lrAiu0+5XKCoxtqpgUvgmaMZBV4FJhdSzMJ4mzyFa11S3g5DdiK+rEkRu90= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NYWiO8mq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NYWiO8mq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC21B1F000E9; Sun, 23 Aug 2026 18:03:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787508233; bh=0ehPfzn3JHd/Is9JIvZmT3iQGVXlmFUCNJMgcgKOnyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NYWiO8mqBQ+8jnePWRFmJBucwR+b0cAhJgm59EuFrEr2GIKqAriGwp736TLdRbs7/ kmyZ3wTHHUkOLW7eWhJX3OGoEmS8S4pGT7aBoScur3mbPhUq2tHpQ4XQgLbk5xzYNI hZDlq2xsBZqXumR/sSQvXBsf+MmQMQJz8TuCPV2j5mpHnt6w5cWieYA85b/UGhq4e+ N4lDaZoA03fWcOtqzPtNEwr04AHrQYABQgL+2RfyFdpcMT+Kmj3NwLSLlVpuFZM7LR LTUQYmQwoPctJtPPQ3UtYw6qsIat1+V6tiJngjwq4dxiOYx2fZOkcBt/js7G2I5lAK f0au1Bov9CrIA== From: Sasha Levin To: stable@vger.kernel.org Cc: "Darrick J. Wong" , Christoph Hellwig , Carlos Maiolino , Sasha Levin Subject: [PATCH 7.1.y 1/2] xfs: hoist per-bucket unlinked list check to helper Date: Sun, 23 Aug 2026 14:03:50 -0400 Message-ID: <20260823180351.1420766-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026082043-tameness-radiated-971a@gregkh> References: <2026082043-tameness-radiated-971a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Darrick J. Wong" [ Upstream commit 7cdafd8f10ebdf745ba6046b9fa67490c343a17f ] In the next patch we're going to make this loop more exciting, so hoist the code to a helper function to reduce clutter in the resulting code. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino Stable-dep-of: 527eaaefddb6 ("xfs: don't livelock in scrub on a circular unlinked list") Signed-off-by: Sasha Levin --- fs/xfs/scrub/agheader.c | 64 +++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/fs/xfs/scrub/agheader.c b/fs/xfs/scrub/agheader.c index 62ed5eaf08fbc..cecf034ef989c 100644 --- a/fs/xfs/scrub/agheader.c +++ b/fs/xfs/scrub/agheader.c @@ -932,6 +932,42 @@ xchk_agi_xref( /* scrub teardown will take care of sc->sa for us */ } +/* + * Walk the incore unlinked list for a particular AGI bucket to construct + * the unlinked inode bitmap for later reconstruction of the unlinked list. + * Returns 1 if we should keep checking, or 0 to stop checking. + */ +static int +xchk_iunlink_bucket( + struct xfs_scrub *sc, + unsigned int bucket, + xfs_agino_t agino) +{ + while (agino != NULLAGINO) { + struct xfs_inode *ip; + + if (agino % XFS_AGI_UNLINKED_BUCKETS != bucket) { + xchk_block_set_corrupt(sc, sc->sa.agi_bp); + return 0; + } + + ip = xfs_iunlink_lookup(sc->sa.pag, agino); + if (!ip) { + xchk_block_set_corrupt(sc, sc->sa.agi_bp); + return 0; + } + + if (!xfs_inode_on_unlinked_list(ip)) { + xchk_block_set_corrupt(sc, sc->sa.agi_bp); + return 0; + } + + agino = ip->i_next_unlinked; + } + + return 1; +} + /* * Check the unlinked buckets for links to bad inodes. We hold the AGI, so * there cannot be any threads updating unlinked list pointers in this AG. @@ -942,30 +978,14 @@ xchk_iunlink( struct xfs_agi *agi) { unsigned int i; - struct xfs_inode *ip; for (i = 0; i < XFS_AGI_UNLINKED_BUCKETS; i++) { - xfs_agino_t agino = be32_to_cpu(agi->agi_unlinked[i]); - - while (agino != NULLAGINO) { - if (agino % XFS_AGI_UNLINKED_BUCKETS != i) { - xchk_block_set_corrupt(sc, sc->sa.agi_bp); - return; - } - - ip = xfs_iunlink_lookup(sc->sa.pag, agino); - if (!ip) { - xchk_block_set_corrupt(sc, sc->sa.agi_bp); - return; - } - - if (!xfs_inode_on_unlinked_list(ip)) { - xchk_block_set_corrupt(sc, sc->sa.agi_bp); - return; - } - - agino = ip->i_next_unlinked; - } + int ret; + + ret = xchk_iunlink_bucket(sc, i, + be32_to_cpu(agi->agi_unlinked[i])); + if (ret < 1) + return; } } -- 2.53.0