From patchwork Tue Jul 30 01:21:58 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: 13746179 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 CAE25D502 for ; Tue, 30 Jul 2024 01:21:59 +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=1722302519; cv=none; b=XrS69XOenNwiE9Yc6xltemWDRw+vIig3HtdMEz5NkIqHx7mMG5aANjU4Y0fs0oQeWv18oA7nAVNeGLQ1mIMXvnFC1jg8VnugKNWt+aQe4DRfw8mK9uOPEHMaaSy8f25C6oaUvJ+JEYu5NIOtGgGJ/IeKjfmR9RRYF3dmQlkukH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722302519; c=relaxed/simple; bh=wjFvAoBL9eK1IE5FyW0EIt204F5RPlAd4yN6PRRBwM0=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=N2FTYJ6iTaCnz+p69VWOdtXfQhDeGXpYhoOa7XujIH3ZiD8Z7Vnf6MVUPXrEiJUjSjNvmPgMpmkGBzP7FoZGDVLopHmiUbae9wxde2VmjCiLt88oFv5pzNgD0wv+D6fXTj5E6nvQSEDsRgUgzz1Et5L1LYiD/th/SIPpu/4EX5s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=II/x5BIP; 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="II/x5BIP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A82EC4AF07; Tue, 30 Jul 2024 01:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722302519; bh=wjFvAoBL9eK1IE5FyW0EIt204F5RPlAd4yN6PRRBwM0=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=II/x5BIPOJrVz9bVBompgsxDp+Kh9Xm9Aj4EXVjrJJ3lWLj5bvagE/ocv4L5XTwzc L2gE4b+NnJiC6V4TykvQ719KMn+CGsHZ13VG3DkKZ4RCqeGR+ySaqAHyjrbKTNDgDj qoHgRJtYAb64vLOIcN9B0c/8DgQ8A9H5Z/DJvpCkYS5mreEYfQJ9OBkPwtNp1CAf9q 74gRGre2o0YnA+wUiamKJ9uVWWm0p72rGdUSL1o9TYiPm3+kW+sxQUuNvYMEVliYsu J5D3IYVQ9QeQO2rjo9B+X1YA/XUo1eaGaxfBlR7CmbpWk4TVejGdp/VeF6Dhimx1tW 8R/hvydCznjsw== Date: Mon, 29 Jul 2024 18:21:58 -0700 Subject: [PATCH 12/24] xfs_scrub: use parent pointers to report lost file data From: "Darrick J. Wong" To: djwong@kernel.org, cem@kernel.org Cc: Christoph Hellwig , linux-xfs@vger.kernel.org, catherine.hoang@oracle.com, allison.henderson@oracle.com Message-ID: <172229850677.1350924.16118159715345570762.stgit@frogsfrogsfrogs> In-Reply-To: <172229850491.1350924.499207407445096350.stgit@frogsfrogsfrogs> References: <172229850491.1350924.499207407445096350.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 If parent pointers are enabled, compute the path to the file while we're doing the fsmap scan and report that, instead of walking the entire directory tree to print the paths of the (hopefully few) files that lost data. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- scrub/phase6.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/scrub/phase6.c b/scrub/phase6.c index 193d3b4e9..a61853019 100644 --- a/scrub/phase6.c +++ b/scrub/phase6.c @@ -22,6 +22,7 @@ #include "spacemap.h" #include "vfs.h" #include "common.h" +#include "libfrog/bulkstat.h" /* * Phase 6: Verify data file integrity. @@ -381,6 +382,24 @@ report_dirent_loss( return error; } +struct ioerr_filerange { + uint64_t physical; + uint64_t length; +}; + +/* + * If reverse mapping and parent pointers are enabled, we can map media errors + * directly back to a filename and a file position without needing to walk the + * directory tree. + */ +static inline bool +can_use_pptrs( + const struct scrub_ctx *ctx) +{ + return (ctx->mnt.fsgeom.flags & XFS_FSOP_GEOM_FLAGS_PARENT) && + (ctx->mnt.fsgeom.flags & XFS_FSOP_GEOM_FLAGS_RMAPBT); +} + /* Use a fsmap to report metadata lost to a media error. */ static int report_ioerr_fsmap( @@ -389,16 +408,18 @@ report_ioerr_fsmap( void *arg) { const char *type; + struct xfs_bulkstat bs = { }; char buf[DESCR_BUFSZ]; - uint64_t err_physical = *(uint64_t *)arg; + struct ioerr_filerange *fr = arg; uint64_t err_off; + int ret; /* Don't care about unwritten extents. */ if (map->fmr_flags & FMR_OF_PREALLOC) return 0; - if (err_physical > map->fmr_physical) - err_off = err_physical - map->fmr_physical; + if (fr->physical > map->fmr_physical) + err_off = fr->physical - map->fmr_physical; else err_off = 0; @@ -421,23 +442,43 @@ report_ioerr_fsmap( } } + if (can_use_pptrs(ctx)) { + ret = -xfrog_bulkstat_single(&ctx->mnt, map->fmr_owner, 0, &bs); + if (ret) + str_liberror(ctx, ret, + _("bulkstat for media error report")); + } + /* Report extent maps */ if (map->fmr_flags & FMR_OF_EXTENT_MAP) { bool attr = (map->fmr_flags & FMR_OF_ATTR_FORK); scrub_render_ino_descr(ctx, buf, DESCR_BUFSZ, - map->fmr_owner, 0, " %s", + map->fmr_owner, bs.bs_gen, " %s", attr ? _("extended attribute") : _("file data")); str_corrupt(ctx, buf, _("media error in extent map")); } /* - * XXX: If we had a getparent() call we could report IO errors - * efficiently. Until then, we'll have to scan the dir tree - * to find the bad file's pathname. + * If directory parent pointers are available, use that to find the + * pathname to a file, and report that path as having lost its + * extended attributes, or the precise offset of the lost file data. */ + if (!can_use_pptrs(ctx)) + return 0; + scrub_render_ino_descr(ctx, buf, DESCR_BUFSZ, map->fmr_owner, + bs.bs_gen, NULL); + + if (map->fmr_flags & FMR_OF_ATTR_FORK) { + str_corrupt(ctx, buf, _("media error in extended attributes")); + return 0; + } + + str_unfixable_error(ctx, buf, + _("media error at data offset %llu length %llu."), + err_off, fr->length); return 0; } @@ -452,6 +493,10 @@ report_ioerr( void *arg) { struct fsmap keys[2]; + struct ioerr_filerange fr = { + .physical = start, + .length = length, + }; struct disk_ioerr_report *dioerr = arg; dev_t dev; @@ -467,7 +512,7 @@ report_ioerr( (keys + 1)->fmr_offset = ULLONG_MAX; (keys + 1)->fmr_flags = UINT_MAX; return -scrub_iterate_fsmap(dioerr->ctx, keys, report_ioerr_fsmap, - &start); + &fr); } /* Report all the media errors found on a disk. */ @@ -511,10 +556,16 @@ report_all_media_errors( return ret; } - /* Scan the directory tree to get file paths. */ - ret = scan_fs_tree(ctx, report_dir_loss, report_dirent_loss, vs); - if (ret) - return ret; + /* + * Scan the directory tree to get file paths if we didn't already use + * directory parent pointers to report the loss. + */ + if (!can_use_pptrs(ctx)) { + ret = scan_fs_tree(ctx, report_dir_loss, report_dirent_loss, + vs); + if (ret) + return ret; + } /* Scan for unlinked files. */ return scrub_scan_all_inodes(ctx, report_inode_loss, vs);