From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4F9251292F5 for ; Tue, 26 Mar 2024 04:00:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711425648; cv=none; b=nbQO4EQXd3mdUKy4xbwcMEsnoBkhdWMnxwItHrPzoJffTepjJ3Numl/YC+/YqhG+C6++5/Bp7T1OHoR/EfCyntJrBxPltQ585DblLbBVvvIA74wZ7kcAVfy1wt6RiRE76G1ibtqwhigx9qqT4G37goDmpnX2zoX79PVAkj0AMOI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711425648; c=relaxed/simple; bh=g2hrooeTKnjMhPcqGk0H9p5P3S+an94SVi4x4Gk9yfs=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=g1Axx1bi1Fd2Djr6hf4KvPqXWEHtqRiYBltUyWUwdBGl2Z87vvTQ+tw3QlXsKAKtFFIew7Wdet0iufY98Od73pFeSDRJSQ0c61HF0bsGnlg1x7Qe/mYEKl/tlszEwQPZZb/7n6tSDyX2FOAcl1AzxUx1FWEdcTQQONcTiMjFCNY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ykai29+o; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ykai29+o" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FDA9C43390; Tue, 26 Mar 2024 04:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711425648; bh=g2hrooeTKnjMhPcqGk0H9p5P3S+an94SVi4x4Gk9yfs=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=Ykai29+ojHxQU9smLNZ08F+sA8RDV3CkQ7agQSOV3JyDtjPjAIH9x4xXsgxSUBu58 GflyOw/TREVAJhIpLQHwE9IF02bA6xqXWDspCEoAi3IIzVOg94GKNfcWN3fIV5NRm2 pIuOh5jh0joBBVDypgVFu7m9F//Leuje4Y5WunIvWZt3Xx8kRasEDLVUDZ6LC+TS+9 0ikYTRr/484HaIsWNIi+OLBHjqvlqKNIlfxE+50kjUbNbiMK+/riFi7wAUeJg+MLHY eRvPcZC9yC+NsIL1jN+taZztPn3frLmWMJ0qFuKnPwsUmUY6toEPSW9lBZwr/DoRi5 dxaj3EqDPLdOg== Date: Mon, 25 Mar 2024 21:00:47 -0700 Subject: [PATCH 2/5] xfs_repair: verify on-disk rmap btrees with in-memory btree data From: "Darrick J. Wong" To: cem@kernel.org, djwong@kernel.org Cc: linux-xfs@vger.kernel.org Message-ID: <171142134708.2220026.6548177116311124542.stgit@frogsfrogsfrogs> In-Reply-To: <171142134672.2220026.18064456796378653896.stgit@frogsfrogsfrogs> References: <171142134672.2220026.18064456796378653896.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit From: Darrick J. Wong Check the on-disk reverse mappings with the observations we've recorded in the in-memory btree during the filesystem walk. Signed-off-by: Darrick J. Wong --- repair/rmap.c | 58 +++++++++++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/repair/rmap.c b/repair/rmap.c index 883d8e21294c..03366005ee7d 100644 --- a/repair/rmap.c +++ b/repair/rmap.c @@ -1190,11 +1190,11 @@ rmaps_verify_btree( struct xfs_mount *mp, xfs_agnumber_t agno) { + struct xfs_btree_cur *rm_cur; + struct xfs_rmap_irec rm_rec; struct xfs_rmap_irec tmp; - struct xfs_slab_cursor *rm_cur; struct xfs_btree_cur *bt_cur = NULL; struct xfs_buf *agbp = NULL; - struct xfs_rmap_irec *rm_rec; struct xfs_perag *pag = NULL; int have; int error; @@ -1207,8 +1207,8 @@ rmaps_verify_btree( return; } - /* Create cursors to refcount structures */ - error = rmap_init_cursor(agno, &rm_cur); + /* Create cursors to rmap structures */ + error = rmap_init_mem_cursor(mp, NULL, agno, &rm_cur); if (error) { do_warn(_("Not enough memory to check reverse mappings.\n")); return; @@ -1231,13 +1231,12 @@ rmaps_verify_btree( goto err_agf; } - rm_rec = pop_slab_cursor(rm_cur); - while (rm_rec) { - error = rmap_lookup(bt_cur, rm_rec, &tmp, &have); + while ((error = rmap_get_mem_rec(rm_cur, &rm_rec)) == 1) { + error = rmap_lookup(bt_cur, &rm_rec, &tmp, &have); if (error) { do_warn( _("Could not read reverse-mapping record for (%u/%u).\n"), - agno, rm_rec->rm_startblock); + agno, rm_rec.rm_startblock); goto err_cur; } @@ -1247,13 +1246,13 @@ _("Could not read reverse-mapping record for (%u/%u).\n"), * match the observed rmap. */ if (xfs_has_reflink(bt_cur->bc_mp) && - (!have || !rmap_is_good(rm_rec, &tmp))) { - error = rmap_lookup_overlapped(bt_cur, rm_rec, + (!have || !rmap_is_good(&rm_rec, &tmp))) { + error = rmap_lookup_overlapped(bt_cur, &rm_rec, &tmp, &have); if (error) { do_warn( _("Could not read reverse-mapping record for (%u/%u).\n"), - agno, rm_rec->rm_startblock); + agno, rm_rec.rm_startblock); goto err_cur; } } @@ -1261,21 +1260,21 @@ _("Could not read reverse-mapping record for (%u/%u).\n"), do_warn( _("Missing reverse-mapping record for (%u/%u) %slen %u owner %"PRId64" \ %s%soff %"PRIu64"\n"), - agno, rm_rec->rm_startblock, - (rm_rec->rm_flags & XFS_RMAP_UNWRITTEN) ? + agno, rm_rec.rm_startblock, + (rm_rec.rm_flags & XFS_RMAP_UNWRITTEN) ? _("unwritten ") : "", - rm_rec->rm_blockcount, - rm_rec->rm_owner, - (rm_rec->rm_flags & XFS_RMAP_ATTR_FORK) ? + rm_rec.rm_blockcount, + rm_rec.rm_owner, + (rm_rec.rm_flags & XFS_RMAP_ATTR_FORK) ? _("attr ") : "", - (rm_rec->rm_flags & XFS_RMAP_BMBT_BLOCK) ? + (rm_rec.rm_flags & XFS_RMAP_BMBT_BLOCK) ? _("bmbt ") : "", - rm_rec->rm_offset); - goto next_loop; + rm_rec.rm_offset); + continue; } /* Compare each refcount observation against the btree's */ - if (!rmap_is_good(rm_rec, &tmp)) { + if (!rmap_is_good(&rm_rec, &tmp)) { do_warn( _("Incorrect reverse-mapping: saw (%u/%u) %slen %u owner %"PRId64" %s%soff \ %"PRIu64"; should be (%u/%u) %slen %u owner %"PRId64" %s%soff %"PRIu64"\n"), @@ -1289,20 +1288,17 @@ _("Incorrect reverse-mapping: saw (%u/%u) %slen %u owner %"PRId64" %s%soff \ (tmp.rm_flags & XFS_RMAP_BMBT_BLOCK) ? _("bmbt ") : "", tmp.rm_offset, - agno, rm_rec->rm_startblock, - (rm_rec->rm_flags & XFS_RMAP_UNWRITTEN) ? + agno, rm_rec.rm_startblock, + (rm_rec.rm_flags & XFS_RMAP_UNWRITTEN) ? _("unwritten ") : "", - rm_rec->rm_blockcount, - rm_rec->rm_owner, - (rm_rec->rm_flags & XFS_RMAP_ATTR_FORK) ? + rm_rec.rm_blockcount, + rm_rec.rm_owner, + (rm_rec.rm_flags & XFS_RMAP_ATTR_FORK) ? _("attr ") : "", - (rm_rec->rm_flags & XFS_RMAP_BMBT_BLOCK) ? + (rm_rec.rm_flags & XFS_RMAP_BMBT_BLOCK) ? _("bmbt ") : "", - rm_rec->rm_offset); - goto next_loop; + rm_rec.rm_offset); } -next_loop: - rm_rec = pop_slab_cursor(rm_cur); } err_cur: @@ -1311,7 +1307,7 @@ _("Incorrect reverse-mapping: saw (%u/%u) %slen %u owner %"PRId64" %s%soff \ libxfs_buf_relse(agbp); err_pag: libxfs_perag_put(pag); - free_slab_cursor(&rm_cur); + libxfs_btree_del_cursor(rm_cur, error); } /*