From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 36/42] mkfs: factor AG alignment
Date: Wed, 30 Aug 2017 09:50:46 +1000 [thread overview]
Message-ID: <20170829235052.21050-37-david@fromorbit.com> (raw)
In-Reply-To: <20170829235052.21050-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Signed-Off-By: Dave Chinner <dchinner@redhat.com>
---
mkfs/xfs_mkfs.c | 246 +++++++++++++++++++++++++++-----------------------------
1 file changed, 117 insertions(+), 129 deletions(-)
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index a0dcea2609a6..1ab9e98b8b02 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2750,6 +2750,121 @@ _("agsize (%s) not a multiple of fs blk size (%d)\n"),
}
}
+/*
+ * Align the AG size to stripe geometry. If this fails and we are using
+ * discovered stripe geometry, tell the caller to clear the stripe geometry.
+ * Otherwise, set the aligned geometry (valid or invalid!) so that the
+ * validation call will fail and exit.
+ */
+static void
+align_ag_geometry(
+ struct mkfs_params *cfg)
+{
+ uint64_t tmp_agsize;
+ int dsunit = cfg->dsunit;
+
+ if (!dsunit)
+ return;
+
+ /*
+ * agsize is not a multiple of dsunit
+ */
+ if ((cfg->agsize % dsunit) != 0) {
+ /*
+ * Round up to stripe unit boundary. Also make sure
+ * that agsize is still larger than
+ * XFS_AG_MIN_BLOCKS(blocklog)
+ */
+ tmp_agsize = ((cfg->agsize + dsunit - 1) / dsunit) * dsunit;
+ /*
+ * Round down to stripe unit boundary if rounding up
+ * created an AG size that is larger than the AG max.
+ */
+ if (tmp_agsize > XFS_AG_MAX_BLOCKS(cfg->blocklog))
+ tmp_agsize = (cfg->agsize / dsunit) * dsunit;
+
+ if (tmp_agsize < XFS_AG_MIN_BLOCKS(cfg->blocklog) &&
+ tmp_agsize > XFS_AG_MAX_BLOCKS(cfg->blocklog)) {
+
+ /*
+ * If the AG size is invalid and we are using device
+ * probed stripe alignment, just clear the alignment
+ * and continue on.
+ */
+ if (!cli_opt_set(&dopts, D_SUNIT) &&
+ !cli_opt_set(&dopts, D_SU)) {
+ cfg->dsunit = 0;
+ cfg->dswidth = 0;
+ goto validate;
+ }
+ /*
+ * set the agsize to the invalid value so the following
+ * validation of the ag will fail and print a nice error
+ * and exit.
+ */
+ cfg->agsize = tmp_agsize;
+ goto validate;
+ }
+
+ /* update geometry to be stripe unit aligned */
+ cfg->agsize = tmp_agsize;
+ if (!cli_opt_set(&dopts, D_AGCOUNT))
+ cfg->agcount = cfg->dblocks / cfg->agsize +
+ (cfg->dblocks % cfg->agsize != 0);
+ if (cli_opt_set(&dopts, D_AGSIZE))
+ fprintf(stderr,
+_("agsize rounded to %lld, sunit = %d\n"),
+ (long long)cfg->agsize, dsunit);
+ }
+
+ if ((cfg->agsize % cfg->dswidth) == 0 && cfg->agcount > 1) {
+
+ if (cli_opt_set(&dopts, D_AGCOUNT) ||
+ cli_opt_set(&dopts, D_AGSIZE)) {
+ fprintf(stderr, _(
+"Warning: AG size is a multiple of stripe width. This can cause performance\n\
+problems by aligning all AGs on the same disk. To avoid this, run mkfs with\n\
+an AG size that is one stripe unit smaller or larger, for example %llu.\n"),
+ (unsigned long long)cfg->agsize - dsunit);
+ goto validate;
+ }
+
+ /*
+ * This is a non-optimal configuration because all AGs start on
+ * the same disk in the stripe. Changing the AG size by one
+ * sunit will guarantee that this does not happen.
+ */
+ tmp_agsize = cfg->agsize - dsunit;
+ if (tmp_agsize < XFS_AG_MIN_BLOCKS(cfg->blocklog)) {
+ tmp_agsize = cfg->agsize + dsunit;
+ if (cfg->dblocks < cfg->agsize) {
+ /* oh well, nothing to do */
+ tmp_agsize = cfg->agsize;
+ }
+ }
+
+ cfg->agsize = tmp_agsize;
+ cfg->agcount = cfg->dblocks / cfg->agsize +
+ (cfg->dblocks % cfg->agsize != 0);
+ }
+
+ /*
+ * If the last AG is too small, reduce the filesystem size
+ * and drop the blocks.
+ */
+ if (cfg->dblocks % cfg->agsize != 0 &&
+ (cfg->dblocks % cfg->agsize < XFS_AG_MIN_BLOCKS(cfg->blocklog))) {
+ ASSERT(!cli_opt_set(&dopts, D_AGCOUNT));
+ cfg->dblocks = (xfs_rfsblock_t)((cfg->agcount - 1) * cfg->agsize);
+ cfg->agcount--;
+ ASSERT(cfg->agcount != 0);
+ }
+
+validate:
+ validate_ag_geometry(cfg->blocklog, cfg->dblocks,
+ cfg->agsize, cfg->agcount);
+}
+
static void
print_mkfs_cfg(
struct mkfs_params *cfg,
@@ -3381,8 +3496,6 @@ main(
int blocklog;
xfs_buf_t *buf;
int c;
- int daflag;
- int dasize;
xfs_rfsblock_t dblocks;
char *dfile;
int dirblocklog;
@@ -3413,7 +3526,6 @@ main(
xfs_mount_t *mp;
xfs_mount_t mbuf;
xfs_extlen_t nbmblocks;
- int nodsflag;
int dry_run = 0;
int discard = 1;
char *protofile;
@@ -3425,7 +3537,6 @@ main(
char *rtfile;
xfs_sb_t *sbp;
int sectorlog;
- uint64_t tmp_agsize;
uuid_t uuid;
int worst_freelist;
libxfs_init_t xi;
@@ -3489,7 +3600,7 @@ main(
*/
cli.loginternal = 1; /* internal by default */
- agsize = daflag = dasize = dblocks = 0;
+ agsize = dblocks = 0;
imflag = 0;
laflag = lsflag = 0;
loginternal = 1;
@@ -3498,7 +3609,6 @@ main(
dfile = logfile = rtfile = NULL;
logsize = protofile = NULL;
dsunit = dswidth = lalign = lsunit = 0;
- nodsflag = 0;
force_overwrite = 0;
worst_freelist = 0;
memset(&fsx, 0, sizeof(fsx));
@@ -3523,13 +3633,6 @@ main(
parse_subopts(c, optarg, &cli);
/* temp don't break code */
- agcount = cli.agcount;
- if (cli_opt_set(&dopts, D_AGSIZE)) {
- agsize = getnum(cli.agsize, &dopts, D_AGSIZE);
- dasize = 1;
- }
- daflag = cli_opt_set(&dopts, D_AGCOUNT);
-
fsx.fsx_xflags |= cli.fsx.fsx_xflags;
fsx.fsx_projid = cli.fsx.fsx_projid;
fsx.fsx_extsize = cli.fsx.fsx_extsize;
@@ -3641,6 +3744,7 @@ main(
* aligns to device geometry correctly.
*/
calculate_initial_ag_geometry(&cfg, &cli);
+ align_ag_geometry(&cfg);
/* temp don't break code */
sectorsize = cfg.sectorsize;
@@ -3665,127 +3769,11 @@ main(
dsunit = cfg.dsunit;
dswidth = cfg.dswidth;
lsunit = cfg.lsunit;
- nodsflag = cfg.sb_feat.nodalign;
agsize = cfg.agsize;
agcount = cfg.agcount;
/* end temp don't break code */
- /*
- * If dsunit is a multiple of fs blocksize, then check that is a
- * multiple of the agsize too
- */
- if (dsunit && !(BBTOB(dsunit) % blocksize) &&
- dswidth && !(BBTOB(dswidth) % blocksize)) {
-
- /* convert from 512 byte blocks to fs blocksize */
- dsunit = DTOBT(dsunit, blocklog);
- dswidth = DTOBT(dswidth, blocklog);
-
- /*
- * agsize is not a multiple of dsunit
- */
- if ((agsize % dsunit) != 0) {
- /*
- * Round up to stripe unit boundary. Also make sure
- * that agsize is still larger than
- * XFS_AG_MIN_BLOCKS(blocklog)
- */
- tmp_agsize = ((agsize + (dsunit - 1))/ dsunit) * dsunit;
- /*
- * Round down to stripe unit boundary if rounding up
- * created an AG size that is larger than the AG max.
- */
- if (tmp_agsize > XFS_AG_MAX_BLOCKS(blocklog))
- tmp_agsize = ((agsize) / dsunit) * dsunit;
-
- if ((tmp_agsize >= XFS_AG_MIN_BLOCKS(blocklog)) &&
- (tmp_agsize <= XFS_AG_MAX_BLOCKS(blocklog))) {
- agsize = tmp_agsize;
- if (!daflag)
- agcount = dblocks/agsize +
- (dblocks % agsize != 0);
- if (dasize)
- fprintf(stderr,
- _("agsize rounded to %lld, swidth = %d\n"),
- (long long)agsize, dswidth);
- } else {
- if (nodsflag) {
- dsunit = dswidth = 0;
- } else {
- /*
- * agsize is out of bounds, this will
- * print nice details & exit.
- */
- validate_ag_geometry(blocklog, dblocks,
- agsize, agcount);
- exit(1);
- }
- }
- }
- if (dswidth && ((agsize % dswidth) == 0) && (agcount > 1)) {
- /* This is a non-optimal configuration because all AGs
- * start on the same disk in the stripe. Changing
- * the AG size by one sunit will guarantee that this
- * does not happen.
- */
- tmp_agsize = agsize - dsunit;
- if (tmp_agsize < XFS_AG_MIN_BLOCKS(blocklog)) {
- tmp_agsize = agsize + dsunit;
- if (dblocks < agsize) {
- /* oh well, nothing to do */
- tmp_agsize = agsize;
- }
- }
- if (daflag || dasize) {
- fprintf(stderr, _(
-"Warning: AG size is a multiple of stripe width. This can cause performance\n\
-problems by aligning all AGs on the same disk. To avoid this, run mkfs with\n\
-an AG size that is one stripe unit smaller, for example %llu.\n"),
- (unsigned long long)tmp_agsize);
- } else {
- agsize = tmp_agsize;
- agcount = dblocks/agsize + (dblocks % agsize != 0);
- /*
- * If the last AG is too small, reduce the
- * filesystem size and drop the blocks.
- */
- if ( dblocks % agsize != 0 &&
- (dblocks % agsize <
- XFS_AG_MIN_BLOCKS(blocklog))) {
- dblocks = (xfs_rfsblock_t)((agcount - 1) * agsize);
- agcount--;
- ASSERT(agcount != 0);
- }
- }
- }
- } else {
- if (nodsflag)
- dsunit = dswidth = 0;
- else {
- fprintf(stderr,
- _("%s: Stripe unit(%d) or stripe width(%d) is "
- "not a multiple of the block size(%d)\n"),
- progname, BBTOB(dsunit), BBTOB(dswidth),
- blocksize);
- exit(1);
- }
- }
-
- /*
- * If the last AG is too small, reduce the filesystem size
- * and drop the blocks.
- */
- if ( dblocks % agsize != 0 &&
- (dblocks % agsize < XFS_AG_MIN_BLOCKS(blocklog))) {
- ASSERT(!daflag);
- dblocks = (xfs_rfsblock_t)((agcount - 1) * agsize);
- agcount--;
- ASSERT(agcount != 0);
- }
-
- validate_ag_geometry(blocklog, dblocks, agsize, agcount);
-
if (!imflag)
imaxpct = calc_default_imaxpct(blocklog, dblocks);
--
2.13.3
next prev parent reply other threads:[~2017-08-29 23:51 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-29 23:50 [PATCH 00/42] mkfs: factor the crap out of the code Dave Chinner
2017-08-29 23:50 ` [PATCH 01/42] mkfs: can't specify sector size of internal log Dave Chinner
2017-08-29 23:50 ` [PATCH 02/42] mkfs: make subopt table const Dave Chinner
2017-08-29 23:50 ` [PATCH 03/42] mkfs: introduce a structure to hold CLI options Dave Chinner
2017-08-29 23:50 ` [PATCH 04/42] mkfs: add generic subopt parsing table Dave Chinner
2017-08-29 23:50 ` [PATCH 05/42] mkfs: factor block subopts parser Dave Chinner
2017-08-29 23:50 ` [PATCH 06/42] mkfs: factor data " Dave Chinner
2017-08-29 23:50 ` [PATCH 07/42] mkfs: factor inode " Dave Chinner
2017-08-29 23:50 ` [PATCH 08/42] mkfs: factor log " Dave Chinner
2017-08-29 23:50 ` [PATCH 09/42] mkfs: factor meta " Dave Chinner
2017-08-29 23:50 ` [PATCH 10/42] mkfs: factor naming " Dave Chinner
2017-08-29 23:50 ` [PATCH 11/42] mkfs: factor rt " Dave Chinner
2017-08-29 23:50 ` [PATCH 12/42] mkfs: factor sector " Dave Chinner
2017-08-29 23:50 ` [PATCH 13/42] mkfs: Introduce mkfs configuration structure Dave Chinner
2017-08-29 23:50 ` [PATCH 14/42] mkfs: factor printing of mkfs config Dave Chinner
2017-08-29 23:50 ` [PATCH 15/42] mkfs: factor in memory superblock setup Dave Chinner
2017-08-29 23:50 ` [PATCH 16/42] mkfs: factor out device preparation Dave Chinner
2017-08-29 23:50 ` [PATCH 17/42] mkfs: factor writing AG headers Dave Chinner
2017-08-29 23:50 ` [PATCH 18/42] mkfs: factor secondary superblock updates Dave Chinner
2017-08-29 23:50 ` [PATCH 19/42] mkfs: introduce default configuration structure Dave Chinner
2017-08-29 23:50 ` [PATCH 20/42] mkfs: rename top level CLI parameters Dave Chinner
2017-08-29 23:50 ` [PATCH 21/42] mkfs: factor sectorsize validation Dave Chinner
2017-08-29 23:50 ` [PATCH 22/42] mkfs: factor blocksize validation Dave Chinner
2017-08-29 23:50 ` [PATCH 23/42] mkfs: factor log sector size validation Dave Chinner
2017-08-29 23:50 ` [PATCH 24/42] mkfs: factor superblock feature validation Dave Chinner
2017-08-29 23:50 ` [PATCH 25/42] mkfs: factor directory blocksize validation Dave Chinner
2017-08-29 23:50 ` [PATCH 26/42] mkfs: factor inode size validation Dave Chinner
2017-08-29 23:50 ` [PATCH 27/42] mkfs: factor out device size calculations Dave Chinner
2017-08-29 23:50 ` [PATCH 28/42] mkfs: fix hidden parameter in DTOBT() Dave Chinner
2017-08-29 23:50 ` [PATCH 29/42] mkfs: factor rtdev extent size validation Dave Chinner
2017-08-29 23:50 ` [PATCH 30/42] mkfs: rework stripe calculations Dave Chinner
2017-08-29 23:50 ` [PATCH 31/42] mkfs: factor device opening Dave Chinner
2017-08-29 23:50 ` [PATCH 32/42] mkfs: factor data device validation Dave Chinner
2017-08-29 23:50 ` [PATCH 33/42] mkfs: factor log " Dave Chinner
2017-08-29 23:50 ` [PATCH 34/42] mkfs: factor rt " Dave Chinner
2017-08-29 23:50 ` [PATCH 35/42] mkfs: factor AG geometry calculations Dave Chinner
2017-08-29 23:50 ` Dave Chinner [this message]
2017-08-30 23:44 ` [PATCH 36/42] mkfs: factor AG alignment Dave Chinner
2017-08-29 23:50 ` [PATCH 37/42] mkfs: rework imaxpct calculation Dave Chinner
2017-08-29 23:50 ` [PATCH 38/42] mkfs: factor initial mount setup Dave Chinner
2017-08-29 23:50 ` [PATCH 39/42] mkfs: factor log size calculations Dave Chinner
2017-09-05 5:23 ` Dave Chinner
2017-08-29 23:50 ` [PATCH 40/42] mkfs: cleanup redundant temporary code Dave Chinner
2017-08-29 23:50 ` [PATCH 41/42] mkfs: move error functions Dave Chinner
2017-08-29 23:50 ` [PATCH 42/42] mkfs: tidy up definitions Dave Chinner
2017-08-30 1:23 ` [PATCH 00/42] mkfs: factor the crap out of the code Darrick J. Wong
2017-08-30 1:57 ` Dave Chinner
2017-08-30 4:16 ` Luis R. Rodriguez
2017-08-30 5:44 ` Dave Chinner
2017-08-30 22:10 ` Luis R. Rodriguez
2017-08-30 23:22 ` Dave Chinner
2017-08-31 0:05 ` Luis R. Rodriguez
2017-08-31 16:23 ` Jan Tulak
2017-08-30 7:44 ` Martin Steigerwald
2017-09-04 12:31 ` Chandan Rajendra
2017-09-04 15:34 ` Eric Sandeen
2017-09-04 22:40 ` Dave Chinner
2017-09-07 10:31 ` Chandan Rajendra
2017-09-07 23:38 ` Dave Chinner
2017-09-09 10:24 ` Chandan Rajendra
2017-09-15 9:42 ` Jan Tulak
2017-09-16 11:29 ` Dave Chinner
2017-10-24 3:00 ` Eric Sandeen
2017-10-25 0:59 ` Dave Chinner
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=20170829235052.21050-37-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.