[28/50] xfs_db: support dumping realtime group data and superblocks

Message ID	173352752373.126362.17848531751610324154.stgit@frogsfrogsfrogs (mailing list archive)
State	Not Applicable, archived
Headers	show 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 9B82C4A07 for <linux-xfs@vger.kernel.org>; Sat, 7 Dec 2024 00:12:16 +0000 (UTC) Date: Fri, 06 Dec 2024 16:12:13 -0800 Subject: [PATCH 28/50] xfs_db: support dumping realtime group data and superblocks From: "Darrick J. Wong" <djwong@kernel.org> To: aalbersh@kernel.org, djwong@kernel.org Cc: hch@lst.de, linux-xfs@vger.kernel.org Message-ID: <173352752373.126362.17848531751610324154.stgit@frogsfrogsfrogs> In-Reply-To: <173352751867.126362.1763344829761562977.stgit@frogsfrogsfrogs> References: <173352751867.126362.1763344829761562977.stgit@frogsfrogsfrogs> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit
Series	[01/50] libxfs: remove XFS_ILOCK_RT* \| expand [01/50] libxfs: remove XFS_ILOCK_RT* [02/50] libxfs: adjust xfs_fsb_to_db to handle segmented rtblocks [03/50] xfs_repair,mkfs: port to libxfs_rt{bitmap,summary}_create [04/50] libxfs: use correct rtx count to block count conversion [05/50] libfrog: scrub the realtime group superblock [06/50] man: document the rt group geometry ioctl [07/50] libxfs: port userspace deferred log item to handle rtgroups [08/50] libxfs: implement some sanity checking for enormous rgcount [09/50] libfrog: support scrubbing rtgroup metadata paths [10/50] libfrog: report rt groups in output [11/50] libfrog: add bitmap_clear [12/50] xfs_logprint: report realtime EFIs [13/50] xfs_repair: adjust rtbitmap/rtsummary word updates to handle big endian values [14/50] xfs_repair: refactor phase4 [15/50] xfs_repair: refactor offsetof+sizeof to offsetofend [16/50] xfs_repair: improve rtbitmap discrepancy reporting [17/50] xfs_repair: simplify rt_lock handling [18/50] xfs_repair: add a real per-AG bitmap abstraction [19/50] xfs_repair: support realtime groups [20/50] repair: use a separate bmaps array for real time groups [21/50] xfs_repair: find and clobber rtgroup bitmap and summary files [22/50] xfs_repair: support realtime superblocks [23/50] xfs_repair: repair rtbitmap and rtsummary block headers [24/50] xfs_repair: stop tracking duplicate RT extents with rtgroups [25/50] xfs_db: fix the rtblock and rtextent commands for segmented rt block numbers [26/50] xfs_db: fix rtconvert to handle segmented rtblocks [27/50] xfs_db: listify the definition of enum typnm [28/50] xfs_db: support dumping realtime group data and superblocks [29/50] xfs_db: support changing the label and uuid of rt superblocks [30/50] xfs_db: enable conversion of rt space units [31/50] xfs_db: metadump metadir rt bitmap and summary files [32/50] xfs_db: metadump realtime devices [33/50] xfs_db: dump rt bitmap blocks [34/50] xfs_db: dump rt summary blocks [35/50] xfs_db: report rt group and block number in the bmap command [36/50] xfs_mdrestore: restore rt group superblocks to realtime device [37/50] xfs_io: support scrubbing rtgroup metadata [38/50] xfs_io: support scrubbing rtgroup metadata paths [39/50] xfs_io: add a command to display allocation group information [40/50] xfs_io: add a command to display realtime group information [41/50] xfs_io: display rt group in verbose bmap output [42/50] xfs_io: display rt group in verbose fsmap output [43/50] xfs_spaceman: report on realtime group health [44/50] xfs_scrub: scrub realtime allocation group metadata [45/50] xfs_scrub: check rtgroup metadata directory connections [46/50] xfs_scrub: call GETFSMAP for each rt group in parallel [47/50] xfs_scrub: trim realtime volumes too [48/50] xfs_scrub: use histograms to speed up phase 8 on the realtime volume [49/50] mkfs: add headers to realtime bitmap blocks [50/50] mkfs: format realtime groups

diff --git a/db/Makefile b/db/Makefile index 83389376c36c46..02eeead25b49d0 100644 --- a/db/Makefile +++ b/db/Makefile @@ -49,6 +49,7 @@ HFILES = \ output.h \ print.h \ quit.h \ + rtgroup.h \ sb.h \ sig.h \ strvec.h \ diff --git a/db/command.c b/db/command.c index 6cda03e9856d84..1b46c3fec08a0e 100644 --- a/db/command.c +++ b/db/command.c @@ -39,6 +39,7 @@ #include "fsmap.h" #include "crc.h" #include "fuzz.h" +#include "rtgroup.h" cmdinfo_t *cmdtab; int ncmds; @@ -135,6 +136,7 @@ init_commands(void) output_init(); print_init(); quit_init(); + rtsb_init(); sb_init(); type_init(); write_init(); diff --git a/db/field.c b/db/field.c index 946684415f65d3..f70955ef57a323 100644 --- a/db/field.c +++ b/db/field.c @@ -23,6 +23,7 @@ #include "dir2.h" #include "dir2sf.h" #include "symlink.h" +#include "rtgroup.h" #define PPOFF(f) bitize(offsetof(struct xfs_parent_rec, f)) const field_t parent_flds[] = { @@ -52,6 +53,13 @@ const ftattr_t ftattrtab[] = { { FLDT_AGNUMBER, "agnumber", fp_num, "%u", SI(bitsz(xfs_agnumber_t)), FTARG_DONULL, NULL, NULL }, + { FLDT_RGBLOCK, "rgblock", fp_num, "%u", SI(bitsz(xfs_rgblock_t)), + FTARG_DONULL, NULL, NULL }, + { FLDT_RTXLEN, "rtxlen", fp_num, "%u", SI(bitsz(xfs_rtxlen_t)), + FTARG_DONULL, NULL, NULL }, + { FLDT_RGNUMBER, "rgnumber", fp_num, "%u", SI(bitsz(xfs_rgnumber_t)), + FTARG_DONULL, NULL, NULL }, + /* attr fields */ { FLDT_ATTR, "attr", NULL, (char *)attr_flds, attr_size, FTARG_SIZE, NULL, attr_flds }, @@ -357,6 +365,8 @@ const ftattr_t ftattrtab[] = { NULL, NULL }, { FLDT_SB, "sb", NULL, (char *)sb_flds, sb_size, FTARG_SIZE, NULL, sb_flds }, + { FLDT_RTSB, "rtsb", NULL, (char *)rtsb_flds, rtsb_size, FTARG_SIZE, + NULL, rtsb_flds }, /* CRC enabled symlink */ { FLDT_SYMLINK_CRC, "symlink", NULL, (char *)symlink_crc_flds, diff --git a/db/field.h b/db/field.h index 9746676a6c7ac9..8797a75f669246 100644 --- a/db/field.h +++ b/db/field.h @@ -15,6 +15,10 @@ typedef enum fldt { FLDT_AGINONN, FLDT_AGNUMBER, + FLDT_RGBLOCK, + FLDT_RTXLEN, + FLDT_RGNUMBER, + /* attr fields */ FLDT_ATTR, FLDT_ATTR_BLKINFO, @@ -167,6 +171,7 @@ typedef enum fldt { FLDT_QCNT, FLDT_QWARNCNT, FLDT_SB, + FLDT_RTSB, /* CRC enabled symlink */ FLDT_SYMLINK_CRC, diff --git a/db/rtgroup.c b/db/rtgroup.c new file mode 100644 index 00000000000000..5cda1a4f35efb6 --- /dev/null +++ b/db/rtgroup.c @@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2022-2024 Oracle. All Rights Reserved. + * Author: Darrick J. Wong <djwong@kernel.org> + */ +#include "libxfs.h" +#include "libxlog.h" +#include "command.h" +#include "type.h" +#include "faddr.h" +#include "fprint.h" +#include "field.h" +#include "io.h" +#include "sb.h" +#include "bit.h" +#include "output.h" +#include "init.h" +#include "rtgroup.h" + +#define uuid_equal(s,d) (platform_uuid_compare((s),(d)) == 0) + +static int rtsb_f(int argc, char **argv); +static void rtsb_help(void); + +static const cmdinfo_t rtsb_cmd = + { "rtsb", NULL, rtsb_f, 0, 0, 1, "", + N_("set current address to realtime sb header"), rtsb_help }; + +void +rtsb_init(void) +{ + if (xfs_has_rtgroups(mp)) + add_command(&rtsb_cmd); +} + +#define OFF(f) bitize(offsetof(struct xfs_rtsb, rsb_ ## f)) +#define SZC(f) szcount(struct xfs_rtsb, rsb_ ## f) +const field_t rtsb_flds[] = { + { "magicnum", FLDT_UINT32X, OI(OFF(magicnum)), C1, 0, TYP_NONE }, + { "crc", FLDT_CRC, OI(OFF(crc)), C1, 0, TYP_NONE }, + { "pad", FLDT_UINT32X, OI(OFF(pad)), C1, 0, TYP_NONE }, + { "fname", FLDT_CHARNS, OI(OFF(fname)), CI(SZC(fname)), 0, TYP_NONE }, + { "uuid", FLDT_UUID, OI(OFF(uuid)), C1, 0, TYP_NONE }, + { "meta_uuid", FLDT_UUID, OI(OFF(meta_uuid)), C1, 0, TYP_NONE }, + { NULL } +}; + +const field_t rtsb_hfld[] = { + { "", FLDT_RTSB, OI(0), C1, 0, TYP_NONE }, + { NULL } +}; + +static void +rtsb_help(void) +{ + dbprintf(_( +"\n" +" seek to realtime superblock\n" +"\n" +" Example:\n" +"\n" +" 'rtsb - set location to realtime superblock, set type to 'rtsb'\n" +"\n" +" Located in the first block of the realtime volume, the rt superblock\n" +" contains the base information for the realtime section of a filesystem.\n" +"\n" +)); +} + +static int +rtsb_f( + int argc, + char **argv) +{ + int c; + + while ((c = getopt(argc, argv, "")) != -1) { + switch (c) { + default: + rtsb_help(); + return 0; + } + } + + cur_agno = NULLAGNUMBER; + + ASSERT(typtab[TYP_RTSB].typnm == TYP_RTSB); + set_rt_cur(&typtab[TYP_RTSB], XFS_RTSB_DADDR, XFS_FSB_TO_BB(mp, 1), + DB_RING_ADD, NULL); + return 0; +} + +int +rtsb_size( + void *obj, + int startoff, + int idx) +{ + return bitize(mp->m_sb.sb_blocksize); +} diff --git a/db/rtgroup.h b/db/rtgroup.h new file mode 100644 index 00000000000000..85960a3fb9f5c9 --- /dev/null +++ b/db/rtgroup.h @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2022-2024 Oracle. All Rights Reserved. + * Author: Darrick J. Wong <djwong@kernel.org> + */ +#ifndef DB_RTGROUP_H_ +#define DB_RTGROUP_H_ + +extern const struct field rtsb_flds[]; +extern const struct field rtsb_hfld[]; + +extern void rtsb_init(void); +extern int rtsb_size(void *obj, int startoff, int idx); + +#endif /* DB_RTGROUP_H_ */ diff --git a/db/sb.c b/db/sb.c index fa15b429ecbefa..de248c10cb27f5 100644 --- a/db/sb.c +++ b/db/sb.c @@ -127,6 +127,14 @@ const field_t sb_flds[] = { { "meta_uuid", FLDT_UUID, OI(OFF(meta_uuid)), C1, 0, TYP_NONE }, { "metadirino", FLDT_INO, OI(OFF(metadirino)), metadirfld_count, FLD_COUNT, TYP_INODE }, + { "rgcount", FLDT_RGNUMBER, OI(OFF(rgcount)), metadirfld_count, + FLD_COUNT, TYP_NONE }, + { "rgextents", FLDT_RTXLEN, OI(OFF(rgextents)), metadirfld_count, + FLD_COUNT, TYP_NONE }, + { "rgblklog", FLDT_UINT8D, OI(OFF(rgblklog)), metadirfld_count, + FLD_COUNT, TYP_NONE }, + { "pad", FLDT_UINT8X, OI(OFF(pad)), metadirfld_count, + FLD_COUNT, TYP_NONE }, { NULL } }; diff --git a/db/type.c b/db/type.c index efe7044569d357..d875c0c636553b 100644 --- a/db/type.c +++ b/db/type.c @@ -28,6 +28,7 @@ #include "text.h" #include "symlink.h" #include "fuzz.h" +#include "rtgroup.h" static const typ_t *findtyp(char *name); static int type_f(int argc, char **argv); @@ -60,6 +61,7 @@ static const typ_t __typtab[] = { { TYP_LOG, "log", NULL, NULL, NULL, TYP_F_NO_CRC_OFF }, { TYP_RTBITMAP, "rtbitmap", handle_text, NULL, NULL, TYP_F_NO_CRC_OFF }, { TYP_RTSUMMARY, "rtsummary", handle_text, NULL, NULL, TYP_F_NO_CRC_OFF }, + { TYP_RTSB, "rtsb", handle_struct, rtsb_hfld, NULL, TYP_F_NO_CRC_OFF }, { TYP_SB, "sb", handle_struct, sb_hfld, NULL, TYP_F_NO_CRC_OFF }, { TYP_SYMLINK, "symlink", handle_string, NULL, NULL, TYP_F_NO_CRC_OFF }, { TYP_TEXT, "text", handle_text, NULL, NULL, TYP_F_NO_CRC_OFF }, @@ -102,6 +104,8 @@ static const typ_t __typtab_crc[] = { { TYP_LOG, "log", NULL, NULL, NULL, TYP_F_NO_CRC_OFF }, { TYP_RTBITMAP, "rtbitmap", handle_text, NULL, NULL, TYP_F_NO_CRC_OFF }, { TYP_RTSUMMARY, "rtsummary", handle_text, NULL, NULL, TYP_F_NO_CRC_OFF }, + { TYP_RTSB, "rtsb", handle_struct, rtsb_hfld, &xfs_rtsb_buf_ops, + XFS_SB_CRC_OFF }, { TYP_SB, "sb", handle_struct, sb_hfld, &xfs_sb_buf_ops, XFS_SB_CRC_OFF }, { TYP_SYMLINK, "symlink", handle_struct, symlink_crc_hfld, @@ -146,6 +150,8 @@ static const typ_t __typtab_spcrc[] = { { TYP_LOG, "log", NULL, NULL, NULL, TYP_F_NO_CRC_OFF }, { TYP_RTBITMAP, "rtbitmap", handle_text, NULL, NULL, TYP_F_NO_CRC_OFF }, { TYP_RTSUMMARY, "rtsummary", handle_text, NULL, NULL, TYP_F_NO_CRC_OFF }, + { TYP_RTSB, "rtsb", handle_struct, rtsb_hfld, &xfs_rtsb_buf_ops, + XFS_SB_CRC_OFF }, { TYP_SB, "sb", handle_struct, sb_hfld, &xfs_sb_buf_ops, XFS_SB_CRC_OFF }, { TYP_SYMLINK, "symlink", handle_struct, symlink_crc_hfld, diff --git a/db/type.h b/db/type.h index 397dcf5464c6c8..d4efa4b0fab541 100644 --- a/db/type.h +++ b/db/type.h @@ -30,6 +30,7 @@ typedef enum typnm TYP_LOG, TYP_RTBITMAP, TYP_RTSUMMARY, + TYP_RTSB, TYP_SB, TYP_SYMLINK, TYP_TEXT,

[28/50] xfs_db: support dumping realtime group data and superblocks

Commit Message

Comments

Patch