From patchwork Mon Jun 3 18:51:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13684080 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 B3A3EF9E9 for ; Mon, 3 Jun 2024 18:51:32 +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=1717440692; cv=none; b=DNaK544SE4Cr2Gb5TyoxGxYHQz17qzk3sHlRJnZmU0dZr9Eu/GTlKoAz4qF2iBRb1eCMWcAkzBBACfj21fkkFO4i+ROA/r+4YairABA+icqlMjrl1qtFBKCg5OEXpKcyJBcVGOSEWfrolpSHc4WXMuQgnX+Ec56pK2kBiXdZeUA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717440692; c=relaxed/simple; bh=WWwIT5M/tzs+Feo4cLV5B7sbQMJZeJfo1czDP3f5HjA=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AM1QIMaesqdgc5YgCrKsPC0GZJIMItyDnzdLEK3C0dvehPqKNTf61086xrPLDRbklM9AOAUpcrpoPZ6VQRzy/v0vxGR8QHMLMEV0ocsVBJ+TRm3gWe6Vi7TVJcxbv8HWWS0hv9odjQAdksfM3Vv+8bzDYYPmOMsU7aMydBcleww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A/O1Dxq5; 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="A/O1Dxq5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42B01C2BD10; Mon, 3 Jun 2024 18:51:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717440692; bh=WWwIT5M/tzs+Feo4cLV5B7sbQMJZeJfo1czDP3f5HjA=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=A/O1Dxq5j4BfhSxCguNGRAiIauufGuulBYhGLkudszavKQpojTQKxIylEs1Bu/dnP s5IG/+oxmLV2YMQ1CZFrRglEetrPQS3VJWQ1gaHP2o6xxkVFIRcvo2XW9f9XEk0rbO BOJyZeAuk6mLHYVBt6IHFKsjs/FLrJ3x4NX/Hvsv0Y3xGPH//nczankflj+iPFWjXC yVHElWkfcQM4qLP1Mcsm6pukH542fyFyk1v9F/dFaCzjUd2Ytb4FqR9E/Y0fzQe83Y 2nSF3HrX6Iz3od5pkMNhUbUB88+lP2QKnVd33VNzGY8q8o+9QCFEFVKZO33ULwb0D/ +PKfx39xpB6ig== Date: Mon, 03 Jun 2024 11:51:31 -0700 Subject: [PATCH 1/3] libxfs: actually set m_fsname From: "Darrick J. Wong" To: djwong@kernel.org, cem@kernel.org Cc: Christoph Hellwig , linux-xfs@vger.kernel.org Message-ID: <171744038803.1443816.15899669983217056474.stgit@frogsfrogsfrogs> In-Reply-To: <171744038785.1443816.16653837642691924792.stgit@frogsfrogsfrogs> References: <171744038785.1443816.16653837642691924792.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 From: Darrick J. Wong Set the name of the filesystem before we actually start using it for creating xfiles. This leads to nice(r) output from /proc/maps such as: 7fcd0a44f000-7fcd0a450000 rw-s 021f6000 00:01 3612684 /memfd:xfs_repair (/dev/sda): AG 0 rmap records (deleted) Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- libxfs/init.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libxfs/init.c b/libxfs/init.c index 6ac9d6824..c9c61ac18 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -643,6 +643,11 @@ libxfs_mount( xfs_set_reporting_corruption(mp); libxfs_buftarg_init(mp, xi); + if (xi->data.name) + mp->m_fsname = strdup(xi->data.name); + else + mp->m_fsname = NULL; + mp->m_finobt_nores = true; xfs_set_inode32(mp); mp->m_sb = *sb; @@ -903,6 +908,9 @@ libxfs_umount( kmem_free(mp->m_attr_geo); kmem_free(mp->m_dir_geo); + free(mp->m_fsname); + mp->m_fsname = NULL; + kmem_free(mp->m_rtdev_targp); if (mp->m_logdev_targp != mp->m_ddev_targp) kmem_free(mp->m_logdev_targp); From patchwork Mon Jun 3 18:51:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13684081 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 5E4EFF9E9 for ; Mon, 3 Jun 2024 18:51: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=1717440708; cv=none; b=n2ydkTzBSxCNmWp8UcAztQriZfUo1TpfstPnawW5SYZGYCywlnxJtLDiyHDnptTs3dVXPYiObnHIJGYo4/aT18CqoW2i8bC4viTfeIJ6JvazltoUmxKVpKmOn5XKGRjmy65F06ENlkiuPbVFhsH8OFFKFaIb5+QNrQN5Qyg1KQU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717440708; c=relaxed/simple; bh=SpAgybialj+xMBW6sZNsnTZpb4GMoeTSt8MPhy2C/DU=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iP6TU3BcBqrG3cwipknhRXiSCvgMVAZFuGlJXTQS9ZLF/P6JSEmdLGzA/OYCec+FmGDXxdb8qFtjFWf79/0ESggIv300xM8cEcHLbRU0/1oXV5UVP1m4F7H4o3+6B50jVIbCmKtyVG9eEowPdd6gvr5vDTd8nyQ1KcmilppwuGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LYDvNG/D; 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="LYDvNG/D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E391DC2BD10; Mon, 3 Jun 2024 18:51:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717440708; bh=SpAgybialj+xMBW6sZNsnTZpb4GMoeTSt8MPhy2C/DU=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=LYDvNG/D9gYVp0RoU0FA50a38Mwyqbma7cgFVvQczpO7j8IEYLgf3lSYV3u982Clv wKxrohHti/jPe/nDD71w+aETb7pogVNIMNZ1ftBENTgg0RYr9+AvkQgn0RmPm64NZJ C8qClZwIU1QRz9F5nB5WEBjSuwUD9LfXK09jgJ9A8i/JeqzfKFIvUCivKqgo9BpF+1 rw6odUl7tCTP1KuKdICIhJZ8+1m8OCcROkaHs5RRAnFK119dHR5hxX9d/eqWPRpX0y wNFB8ki7JrBV63VK9oM3N26dS9c7mDWUoGe8BwJlrqIYZbG8a16YsNAzcFZ/lozYA7 dUSL096nrolGA== Date: Mon, 03 Jun 2024 11:51:47 -0700 Subject: [PATCH 2/3] libxfs: clean up xfs_da_unmount usage From: "Darrick J. Wong" To: djwong@kernel.org, cem@kernel.org Cc: Christoph Hellwig , linux-xfs@vger.kernel.org Message-ID: <171744038818.1443816.10604499988707562569.stgit@frogsfrogsfrogs> In-Reply-To: <171744038785.1443816.16653837642691924792.stgit@frogsfrogsfrogs> References: <171744038785.1443816.16653837642691924792.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 From: Darrick J. Wong Replace the open-coded xfs_da_unmount usage in libxfs_umount and teach libxfs_mount not to leak the dir/attr geometry structures when the mount attempt fails. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- libxfs/init.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libxfs/init.c b/libxfs/init.c index c9c61ac18..b2d7bc136 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -721,7 +721,7 @@ libxfs_mount( if (error) { fprintf(stderr, _("%s: data size check failed\n"), progname); if (!xfs_is_debugger(mp)) - return NULL; + goto out_da; } else libxfs_buf_relse(bp); @@ -735,7 +735,7 @@ libxfs_mount( fprintf(stderr, _("%s: log size checks failed\n"), progname); if (!xfs_is_debugger(mp)) - return NULL; + goto out_da; } if (bp) libxfs_buf_relse(bp); @@ -746,8 +746,8 @@ libxfs_mount( /* Initialize realtime fields in the mount structure */ if (rtmount_init(mp)) { fprintf(stderr, _("%s: realtime device init failed\n"), - progname); - return NULL; + progname); + goto out_da; } /* @@ -765,7 +765,7 @@ libxfs_mount( fprintf(stderr, _("%s: read of AG %u failed\n"), progname, sbp->sb_agcount); if (!xfs_is_debugger(mp)) - return NULL; + goto out_da; fprintf(stderr, _("%s: limiting reads to AG 0\n"), progname); sbp->sb_agcount = 1; @@ -783,6 +783,9 @@ libxfs_mount( xfs_set_perag_data_loaded(mp); return mp; +out_da: + xfs_da_unmount(mp); + return NULL; } void @@ -905,8 +908,7 @@ libxfs_umount( if (xfs_is_perag_data_loaded(mp)) libxfs_free_perag(mp); - kmem_free(mp->m_attr_geo); - kmem_free(mp->m_dir_geo); + xfs_da_unmount(mp); free(mp->m_fsname); mp->m_fsname = NULL; From patchwork Mon Jun 3 18:52:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13684082 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 CA4861386C2 for ; Mon, 3 Jun 2024 18:52:03 +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=1717440723; cv=none; b=Tr4aK4qd1ORAyj8VwjGDB1QZay//9ldEb80t+/ERdCXvToJeoiOcwUzecOCZwnlXJcBoi4sGGGYVBSPDEQN3hGxyY4YefvSGG6YP87K0Bik2sRcEfy5XFw8gRsDH80S0BkqNt2WXqishG5Y4zViHrSJJ06hfuvTlrJI22KHVfmU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717440723; c=relaxed/simple; bh=JVcBgYBeK7kQWbg0X1MZq0XDXyBoLIn9wgEiIqHhk+s=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PnbewvzoDwILUcQ0Opha28Ydf+ORo/QZcpMOcrhtA6shcFyRMf6UQFAil+3HTVe3wUEddnxF6WXjIjBXIR127I/9GembR1bJ/Q/7IitQZvH7RAEW6aUXLf0dJ6E8Kq3uvqLvW0UNDRYYvmIuoPz0+6+aL+MG6cHWPbEP99LLBXA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I/bLIsN1; 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="I/bLIsN1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D514C2BD10; Mon, 3 Jun 2024 18:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717440723; bh=JVcBgYBeK7kQWbg0X1MZq0XDXyBoLIn9wgEiIqHhk+s=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=I/bLIsN1uMrCFavav9PTw7+OS9nm3FZ40j0J0FW+qmM0LVlDAlTiqLViIL+YnClHb 6wfYpvXou+ZNOy+TK3g2/lGzYy8iMiKDZxpOVbvf4pRsSXpLV8hOU7QWz6lS84uxz9 DKb6P8Rx/arVPkBbNhFiaOPzuOx6gE9lcxuNi23mjzmrn5KpQqGPZFh2Y7ZUb0Yko2 8QHZiSexp0awxfdPxg5SRf0EeYXqmbosNNeoRIIz4ZkONP7aq6cDSqX1S98h2vb74+ dn7UonHpJ4QBZ4JKfi3pPeCUdK6/4muPm/bSSJL3WvDomUZE8J0Hg44e0lppW1+61s ZpFTg23fshkIQ== Date: Mon, 03 Jun 2024 11:52:03 -0700 Subject: [PATCH 3/3] libfrog: create a new scrub group for things requiring full inode scans From: "Darrick J. Wong" To: djwong@kernel.org, cem@kernel.org Cc: Christoph Hellwig , linux-xfs@vger.kernel.org Message-ID: <171744038833.1443816.9637216068767241485.stgit@frogsfrogsfrogs> In-Reply-To: <171744038785.1443816.16653837642691924792.stgit@frogsfrogsfrogs> References: <171744038785.1443816.16653837642691924792.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 From: Darrick J. Wong Subsequent patches will add online fsck types (quotacheck, link counts) that require us to walk every inode in the entire filesystem. This requires the AG metadata and the inodes to be in good enough shape to complete the scan without hitting corruption errors. As such, they ought to run after phases 2-4 and before phase 7, which summarizes what we've found. Phase 5 seems like a reasonable place to do this, since it already walks every xattr and directory entry in the filesystem to look for suspicious looking names. Add a new XFROG_SCRUB_GROUP, and add it to phase 5. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- io/scrub.c | 1 + libfrog/scrub.h | 1 + scrub/phase5.c | 22 ++++++++++++++++++++-- scrub/scrub.c | 33 +++++++++++++++++++++++++++++++++ scrub/scrub.h | 1 + scrub/xfs_scrub.h | 1 + 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/io/scrub.c b/io/scrub.c index 70301c067..a77cd872f 100644 --- a/io/scrub.c +++ b/io/scrub.c @@ -184,6 +184,7 @@ parse_args( case XFROG_SCRUB_GROUP_FS: case XFROG_SCRUB_GROUP_NONE: case XFROG_SCRUB_GROUP_SUMMARY: + case XFROG_SCRUB_GROUP_ISCAN: if (!parse_none(argc, optind)) { exitcode = 1; return command_usage(cmdinfo); diff --git a/libfrog/scrub.h b/libfrog/scrub.h index 68f1a9681..27230c62f 100644 --- a/libfrog/scrub.h +++ b/libfrog/scrub.h @@ -13,6 +13,7 @@ enum xfrog_scrub_group { XFROG_SCRUB_GROUP_PERAG, /* per-AG metadata */ XFROG_SCRUB_GROUP_FS, /* per-FS metadata */ XFROG_SCRUB_GROUP_INODE, /* per-inode metadata */ + XFROG_SCRUB_GROUP_ISCAN, /* metadata requiring full inode scan */ XFROG_SCRUB_GROUP_SUMMARY, /* summary metadata */ }; diff --git a/scrub/phase5.c b/scrub/phase5.c index 7e0eaca90..0a91e4f06 100644 --- a/scrub/phase5.c +++ b/scrub/phase5.c @@ -16,6 +16,8 @@ #include "list.h" #include "libfrog/paths.h" #include "libfrog/workqueue.h" +#include "libfrog/fsgeom.h" +#include "libfrog/scrub.h" #include "xfs_scrub.h" #include "common.h" #include "inodes.h" @@ -23,8 +25,9 @@ #include "scrub.h" #include "descr.h" #include "unicrash.h" +#include "repair.h" -/* Phase 5: Check directory connectivity. */ +/* Phase 5: Full inode scans and check directory connectivity. */ /* * Warn about problematic bytes in a directory/attribute name. That means @@ -386,9 +389,24 @@ int phase5_func( struct scrub_ctx *ctx) { + struct action_list alist; bool aborted = false; int ret; + /* + * Check and fix anything that requires a full inode scan. We do this + * after we've checked all inodes and repaired anything that could get + * in the way of a scan. + */ + action_list_init(&alist); + ret = scrub_iscan_metadata(ctx, &alist); + if (ret) + return ret; + ret = action_list_process(ctx, ctx->mnt.fd, &alist, + ALP_COMPLAIN_IF_UNFIXED | ALP_NOPROGRESS); + if (ret) + return ret; + if (ctx->corruptions_found || ctx->unfixable_errors) { str_info(ctx, ctx->mntpoint, _("Filesystem has errors, skipping connectivity checks.")); @@ -417,7 +435,7 @@ phase5_estimate( unsigned int *nr_threads, int *rshift) { - *items = ctx->mnt_sv.f_files - ctx->mnt_sv.f_ffree; + *items = scrub_estimate_iscan_work(ctx); *nr_threads = scrub_nproc(ctx); *rshift = 0; return 0; diff --git a/scrub/scrub.c b/scrub/scrub.c index 1c53260cc..023cc2c2c 100644 --- a/scrub/scrub.c +++ b/scrub/scrub.c @@ -47,6 +47,7 @@ format_scrub_descr( break; case XFROG_SCRUB_GROUP_FS: case XFROG_SCRUB_GROUP_SUMMARY: + case XFROG_SCRUB_GROUP_ISCAN: return snprintf(buf, buflen, _("%s"), _(sc->descr)); break; case XFROG_SCRUB_GROUP_NONE: @@ -421,6 +422,15 @@ scrub_summary_metadata( return scrub_group(ctx, XFROG_SCRUB_GROUP_SUMMARY, 0, alist); } +/* Scrub all metadata requiring a full inode scan. */ +int +scrub_iscan_metadata( + struct scrub_ctx *ctx, + struct action_list *alist) +{ + return scrub_group(ctx, XFROG_SCRUB_GROUP_ISCAN, 0, alist); +} + /* Scrub /only/ the superblock summary counters. */ int scrub_fs_counters( @@ -456,6 +466,29 @@ scrub_estimate_ag_work( return estimate; } +/* + * How many kernel calls will we make to scrub everything requiring a full + * inode scan? + */ +unsigned int +scrub_estimate_iscan_work( + struct scrub_ctx *ctx) +{ + const struct xfrog_scrub_descr *sc; + int type; + unsigned int estimate; + + estimate = ctx->mnt_sv.f_files - ctx->mnt_sv.f_ffree; + + sc = xfrog_scrubbers; + for (type = 0; type < XFS_SCRUB_TYPE_NR; type++, sc++) { + if (sc->group == XFROG_SCRUB_GROUP_ISCAN) + estimate++; + } + + return estimate; +} + /* * Scrub file metadata of some sort. If errors occur, this function will log * them and return nonzero. diff --git a/scrub/scrub.h b/scrub/scrub.h index 8a999da6a..0033fe7ed 100644 --- a/scrub/scrub.h +++ b/scrub/scrub.h @@ -24,6 +24,7 @@ int scrub_ag_metadata(struct scrub_ctx *ctx, xfs_agnumber_t agno, struct action_list *alist); int scrub_fs_metadata(struct scrub_ctx *ctx, unsigned int scrub_type, struct action_list *alist); +int scrub_iscan_metadata(struct scrub_ctx *ctx, struct action_list *alist); int scrub_summary_metadata(struct scrub_ctx *ctx, struct action_list *alist); int scrub_fs_counters(struct scrub_ctx *ctx, struct action_list *alist); diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h index 7aea79d95..34d850d8d 100644 --- a/scrub/xfs_scrub.h +++ b/scrub/xfs_scrub.h @@ -99,6 +99,7 @@ int phase7_func(struct scrub_ctx *ctx); /* Progress estimator functions */ unsigned int scrub_estimate_ag_work(struct scrub_ctx *ctx); +unsigned int scrub_estimate_iscan_work(struct scrub_ctx *ctx); int phase2_estimate(struct scrub_ctx *ctx, uint64_t *items, unsigned int *nr_threads, int *rshift); int phase3_estimate(struct scrub_ctx *ctx, uint64_t *items,