From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH v2 19/36] mkfs: validate extent size hint parameters
Date: Fri, 12 Apr 2019 12:31:26 -0700 [thread overview]
Message-ID: <20190412193126.GJ1019523@magnolia> (raw)
In-Reply-To: <155259754740.31886.13886644609473939892.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Validate extent and cow extent size hints that are passed to mkfs so
that we avoid formatting a filesystem that will never mount.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
v2: simulate extsize hint validation on a directory
---
mkfs/xfs_mkfs.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index d1387ddf..d7951faa 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2202,6 +2202,85 @@ validate_rtextsize(
ASSERT(cfg->rtextblocks);
}
+/* Validate the incoming extsize hint. */
+static void
+validate_extsize_hint(
+ struct xfs_mount *mp,
+ struct cli_params *cli)
+{
+ xfs_failaddr_t fa;
+ uint16_t flags = 0;
+
+ /*
+ * First we validate the extent size inherit hint on a directory so
+ * that we know that we'll be propagating a correct hint and flag to
+ * new files on the data device.
+ */
+ if (cli->fsx.fsx_xflags & FS_XFLAG_EXTSZINHERIT)
+ flags |= XFS_DIFLAG_EXTSZINHERIT;
+
+ fa = libxfs_inode_validate_extsize(mp, cli->fsx.fsx_extsize, S_IFDIR,
+ flags);
+ if (fa) {
+ fprintf(stderr,
+_("illegal extent size hint %lld, must be less than %u.\n"),
+ (long long)cli->fsx.fsx_extsize,
+ min(MAXEXTLEN, mp->m_sb.sb_agblocks / 2));
+ usage();
+ }
+
+ /*
+ * Now we do it again with a realtime file so that we know the hint and
+ * flag that get passed on to realtime files will be correct.
+ */
+ if (mp->m_sb.sb_rextsize == 0)
+ return;
+
+ flags = XFS_DIFLAG_REALTIME;
+ if (cli->fsx.fsx_xflags & FS_XFLAG_EXTSZINHERIT)
+ flags |= XFS_DIFLAG_EXTSIZE;
+
+ fa = libxfs_inode_validate_extsize(mp, cli->fsx.fsx_extsize, S_IFREG,
+ flags);
+
+ if (fa) {
+ fprintf(stderr,
+_("illegal extent size hint %lld, must be less than %u and a multiple of %u.\n"),
+ (long long)cli->fsx.fsx_extsize,
+ min(MAXEXTLEN, mp->m_sb.sb_agblocks / 2),
+ mp->m_sb.sb_rextsize);
+ usage();
+ }
+}
+
+/* Validate the incoming CoW extsize hint. */
+static void
+validate_cowextsize_hint(
+ struct xfs_mount *mp,
+ struct cli_params *cli)
+{
+ xfs_failaddr_t fa;
+ uint64_t flags2 = 0;
+
+ /*
+ * Validate the copy on write extent size inherit hint on a directory
+ * so that we know that we'll be propagating a correct hint and flag to
+ * new files on the data device.
+ */
+ if (cli->fsx.fsx_xflags & FS_XFLAG_COWEXTSIZE)
+ flags2 |= XFS_DIFLAG2_COWEXTSIZE;
+
+ fa = libxfs_inode_validate_cowextsize(mp, cli->fsx.fsx_cowextsize,
+ S_IFDIR, 0, flags2);
+ if (fa) {
+ fprintf(stderr,
+_("illegal CoW extent size hint %lld, must be less than %u.\n"),
+ (long long)cli->fsx.fsx_cowextsize,
+ min(MAXEXTLEN, mp->m_sb.sb_agblocks / 2));
+ usage();
+ }
+}
+
/*
* Validate the configured stripe geometry, or is none is specified, pull
* the configuration from the underlying device.
@@ -3945,6 +4024,10 @@ main(
finish_superblock_setup(&cfg, mp, sbp);
+ /* Validate the extent size hints now that @mp is fully set up. */
+ validate_extsize_hint(mp, &cli);
+ validate_cowextsize_hint(mp, &cli);
+
/* Print the intended geometry of the fs. */
if (!quiet || dry_run) {
struct xfs_fsop_geom geo;
next prev parent reply other threads:[~2019-04-12 19:31 UTC|newest]
Thread overview: 135+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-14 21:03 [PATCH v2 00/36] xfsprogs-5.0: fix various problems Darrick J. Wong
2019-03-14 21:03 ` [PATCH 01/36] libxfs: fix repair deadlock due to failed inode flushes Darrick J. Wong
2019-03-15 22:01 ` Allison Henderson
2019-03-14 21:03 ` [PATCH 02/36] configure: use sys/xattr.h for fsetxattr detection Darrick J. Wong
2019-03-15 22:01 ` Allison Henderson
2019-03-14 21:04 ` [PATCH 03/36] configure.ac: fix alignment of features Darrick J. Wong
2019-03-14 23:46 ` Eric Sandeen
2019-03-15 22:02 ` Allison Henderson
2019-03-14 21:04 ` [PATCH 04/36] debian: drop dangling libhandle.a symlinks in xfslibs-dev Darrick J. Wong
2019-03-15 0:14 ` Nathan Scott
2019-03-15 22:02 ` Allison Henderson
2019-03-14 21:04 ` [PATCH 05/36] debian: don't bypass top level Makefile when building subdirs Darrick J. Wong
2019-03-15 0:16 ` Nathan Scott
2019-03-15 22:02 ` Allison Henderson
2019-03-14 21:04 ` [PATCH 06/36] debian: enable parallel make Darrick J. Wong
2019-03-15 0:18 ` Nathan Scott
2019-03-15 1:01 ` Darrick J. Wong
2019-03-15 5:30 ` Darrick J. Wong
2019-03-14 21:04 ` [PATCH 07/36] xfs_io: actually check copy file range helper return values Darrick J. Wong
2019-03-15 2:12 ` Eric Sandeen
2019-03-15 2:56 ` Darrick J. Wong
2019-03-15 16:51 ` Eric Sandeen
2019-03-17 22:45 ` Dave Chinner
2019-03-14 21:04 ` [PATCH 08/36] xfs_io: statx -r should print attributes_mask Darrick J. Wong
2019-04-03 16:31 ` Eric Sandeen
2019-03-14 21:04 ` [PATCH 09/36] xfs_io: don't walk off the end of argv in fzero_f Darrick J. Wong
2019-03-15 0:25 ` [PATCH 09.5/36] xfs_io: document fzero_f -k option in manpage Eric Sandeen
2019-03-15 0:31 ` Darrick J. Wong
2019-03-15 3:06 ` [PATCH 09/36] xfs_io: don't walk off the end of argv in fzero_f Eric Sandeen
2019-03-14 21:04 ` [PATCH 10/36] xfs_scrub_all: walk the lsblk device/fs hierarchy correctly Darrick J. Wong
2019-03-15 2:46 ` Eric Sandeen
2019-03-15 2:55 ` Darrick J. Wong
2019-03-14 21:04 ` [PATCH 11/36] xfs_scrub_all.timer: activate after most of the system is up Darrick J. Wong
2019-03-15 2:56 ` Eric Sandeen
2019-03-15 2:59 ` Darrick J. Wong
2019-03-15 3:02 ` Eric Sandeen
2019-03-14 21:05 ` [PATCH 12/36] xfs_scrub: rename the global nr_threads Darrick J. Wong
2019-03-15 3:09 ` Eric Sandeen
2019-03-14 21:05 ` [PATCH 13/36] xfs_scrub: use datadev parallelization estimates for thread count Darrick J. Wong
2019-03-15 17:36 ` Eric Sandeen
2019-03-15 17:41 ` Darrick J. Wong
2019-03-14 21:05 ` [PATCH 14/36] xfs_scrub: don't expose internal pool state Darrick J. Wong
2019-03-15 17:49 ` Eric Sandeen
2019-03-14 21:05 ` [PATCH 15/36] xfs_scrub: one read/verify pool per disk Darrick J. Wong
2019-03-20 20:03 ` Eric Sandeen
2019-03-20 20:06 ` [PATCH v2 " Darrick J. Wong
2019-03-28 22:57 ` Eric Sandeen
2019-03-14 21:05 ` [PATCH 16/36] xfs_scrub: don't close mnt_fd when mnt_fd open fails Darrick J. Wong
2019-03-20 20:06 ` Eric Sandeen
2019-03-14 21:05 ` [PATCH 17/36] xfs_scrub: check label for misleading characters Darrick J. Wong
2019-03-20 20:09 ` Eric Sandeen
2019-03-20 20:13 ` Darrick J. Wong
2019-03-28 23:00 ` Eric Sandeen
2019-03-14 21:05 ` [PATCH 18/36] scrub: fix Makefile targets which depend on builddefs Darrick J. Wong
2019-03-20 20:23 ` Eric Sandeen
2019-03-21 20:39 ` Darrick J. Wong
2019-03-14 21:05 ` [PATCH 19/36] mkfs: validate extent size hint parameters Darrick J. Wong
2019-03-26 16:59 ` Eric Sandeen
2019-03-26 17:56 ` Darrick J. Wong
2019-04-12 19:31 ` Darrick J. Wong [this message]
2019-03-14 21:05 ` [PATCH 20/36] xfs_db: fix finobt record decoding when sparse inodes enabled Darrick J. Wong
2019-03-26 17:05 ` Eric Sandeen
2019-03-26 17:08 ` Darrick J. Wong
2019-03-14 21:05 ` [PATCH 21/36] xfs_db: use TYP_FINOBT for finobt metadump Darrick J. Wong
2019-03-26 17:11 ` Eric Sandeen
2019-03-14 21:06 ` [PATCH 22/36] xfs_info: use findmnt to handle mounted block devices Darrick J. Wong
2019-03-26 17:28 ` Eric Sandeen
2019-04-18 19:12 ` Darrick J. Wong
2019-03-14 21:06 ` [PATCH 23/36] xfs_repair: reinitialize the root directory nlink correctly Darrick J. Wong
2019-04-09 20:44 ` Eric Sandeen
2019-03-14 21:06 ` [PATCH 24/36] xfs_repair: bump the irec on-disk nlink when adding lost+found Darrick J. Wong
2019-04-09 20:46 ` Eric Sandeen
2019-03-14 21:06 ` [PATCH 25/36] xfs_repair: fix uninitialized variable warnings Darrick J. Wong
2019-03-26 19:56 ` Eric Sandeen
2019-03-26 21:21 ` Darrick J. Wong
2019-04-09 20:40 ` Eric Sandeen
2019-03-14 21:06 ` [PATCH 26/36] xfs_repair: refactor buffer ops assignments during phase 5 Darrick J. Wong
2019-04-09 21:11 ` Eric Sandeen
2019-04-10 15:25 ` [PATCH v2 " Darrick J. Wong
2019-04-12 20:29 ` Eric Sandeen
2019-03-14 21:06 ` [PATCH 27/36] xfs_repair: pass ops through during scan Darrick J. Wong
2019-04-12 20:30 ` Eric Sandeen
2019-03-14 21:06 ` [PATCH 28/36] libfrog: hoist bitmap out of scrub Darrick J. Wong
2019-04-03 18:33 ` Eric Sandeen
2019-03-14 21:06 ` [PATCH 29/36] xfs_repair: correctly account for free space btree shrinks when fixing freelist Darrick J. Wong
2019-03-14 21:06 ` [PATCH 30/36] libxfs: retain ifork_ops when flushing inode Darrick J. Wong
2019-04-05 18:17 ` Eric Sandeen
2019-04-05 18:19 ` Eric Sandeen
2019-04-05 20:06 ` Darrick J. Wong
2019-03-14 21:07 ` [PATCH 31/36] libxfs: refactor the open-coded libxfs_trans_bjoin calls Darrick J. Wong
2019-04-05 18:39 ` Eric Sandeen
2019-03-14 21:07 ` [PATCH 32/36] libxfs: refactor buffer item release code Darrick J. Wong
2019-03-14 21:07 ` [PATCH 33/36] libxfs: don't touch buffer log item pointer when flushing inode log item Darrick J. Wong
2019-03-14 21:07 ` [PATCH 34/36] libxfs: fix buffer log item lifetime weirdness Darrick J. Wong
2019-03-14 21:07 ` [PATCH 35/36] libxfs: shorten inode item lifetime Darrick J. Wong
2019-03-14 21:07 ` [PATCH 36/36] libxfs: remove libxfs_trans_iget Darrick J. Wong
2019-04-05 19:28 ` Eric Sandeen
2019-03-20 19:34 ` [PATCH 37/36] xfs_scrub: include unicrash.h in unicrash.c Darrick J. Wong
2019-04-04 21:07 ` Eric Sandeen
2019-03-20 19:34 ` [PATCH 38/36] xfs_io: don't read garbage stack contents if INUMBERS goes nuts Darrick J. Wong
2019-04-04 21:12 ` Eric Sandeen
2019-04-04 21:39 ` Darrick J. Wong
2019-03-20 19:35 ` [PATCH 39/36] misc: fix strncpy length complaints Darrick J. Wong
2019-04-04 21:30 ` Eric Sandeen
2019-04-18 18:51 ` Darrick J. Wong
2019-03-20 19:36 ` [PATCH 40/36] xfs_io: fix label parsing and validation Darrick J. Wong
2019-04-04 21:51 ` Eric Sandeen
2019-03-20 19:36 ` [PATCH 41/36] xfs_repair: better cli option parameter checking Darrick J. Wong
2019-04-04 22:08 ` Eric Sandeen
2019-03-20 19:36 ` [PATCH 42/36] xfs_db: refactor metadump handling of multi-fsb objects Darrick J. Wong
2019-04-04 22:17 ` Eric Sandeen
2019-03-20 19:37 ` [PATCH 43/36] xfs_db: refactor multi-fsb object detection decision making Darrick J. Wong
2019-04-04 23:49 ` Eric Sandeen
2019-04-05 0:01 ` Darrick J. Wong
2019-04-05 0:09 ` [PATCH v2 " Darrick J. Wong
2019-04-05 20:31 ` Eric Sandeen
2019-03-20 19:37 ` [PATCH 44/36] xfs_db: metadump should handle symlinks properly Darrick J. Wong
2019-04-05 14:18 ` Eric Sandeen
2019-04-05 14:44 ` Darrick J. Wong
2019-03-20 20:03 ` [PATCH 45/36] xfs_scrub: rename confusing structure Darrick J. Wong
2019-04-04 16:40 ` Eric Sandeen
2019-04-04 16:56 ` Darrick J. Wong
2019-04-04 17:10 ` [PATCH v2 " Darrick J. Wong
2019-04-12 19:22 ` Eric Sandeen
2019-03-20 20:04 ` [PATCH 46/36] xfs_scrub: remove pointless xfs_verify_error_info struct Darrick J. Wong
2019-04-04 16:47 ` Eric Sandeen
2019-04-04 17:10 ` [PATCH v2 " Darrick J. Wong
2019-04-12 19:23 ` Eric Sandeen
2019-04-12 19:32 ` Darrick J. Wong
2019-03-20 20:05 ` [PATCH 47/36] xfs_scrub: remove xfs_ prefixes from structure names Darrick J. Wong
2019-04-04 16:49 ` Eric Sandeen
2019-03-26 17:18 ` [PATCH 48/36] mkfs: don't use DIFLAG values for fsx_xflags Darrick J. Wong
2019-04-04 16:38 ` Eric Sandeen
2019-04-01 16:43 ` [PATCH 49/36] xfs_scrub: remove redundant function declarations Darrick J. Wong
2019-04-04 16:33 ` Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190412193126.GJ1019523@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).