From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, Ian Kent <raven@themaw.net>
Subject: Re: [PATCH 07/12] xfs: simplify parsing of allocsize mount option
Date: Mon, 28 Oct 2019 10:11:37 -0700 [thread overview]
Message-ID: <20191028171137.GP15222@magnolia> (raw)
In-Reply-To: <20191027145547.25157-8-hch@lst.de>
On Sun, Oct 27, 2019 at 03:55:42PM +0100, Christoph Hellwig wrote:
> Rework xfs_parseargs to fill out the default value and then parse the
> option directly into the mount structure, similar to what we do for
> other updates, and open code the now trivial updates based on on the
> on-disk superblock directly into xfs_mountfs.
>
> Note that this change rejects the allocsize=0 mount option that has been
> documented as invalid for a long time instead of just ignoring it.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_mount.c | 31 +++++--------------------------
> fs/xfs/xfs_mount.h | 6 ------
> fs/xfs/xfs_super.c | 26 +++++++++++---------------
> 3 files changed, 16 insertions(+), 47 deletions(-)
>
> diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
> index 1853797ea938..3e8eedf01eb2 100644
> --- a/fs/xfs/xfs_mount.c
> +++ b/fs/xfs/xfs_mount.c
> @@ -425,30 +425,6 @@ xfs_update_alignment(xfs_mount_t *mp)
> return 0;
> }
>
> -/*
> - * Set the default minimum read and write sizes unless
> - * already specified in a mount option.
> - * We use smaller I/O sizes when the file system
> - * is being used for NFS service (wsync mount option).
> - */
> -STATIC void
> -xfs_set_rw_sizes(xfs_mount_t *mp)
> -{
> - xfs_sb_t *sbp = &(mp->m_sb);
> - int readio_log, writeio_log;
> -
> - if (!(mp->m_flags & XFS_MOUNT_DFLT_IOSIZE))
> - writeio_log = XFS_WRITEIO_LOG_LARGE;
> - else
> - writeio_log = mp->m_allocsize_log;
> -
> - if (sbp->sb_blocklog > writeio_log)
> - mp->m_allocsize_log = sbp->sb_blocklog;
> - } else
> - mp->m_allocsize_log = writeio_log;
> - mp->m_allocsize_blocks = 1 << (mp->m_allocsize_log - sbp->sb_blocklog);
> -}
> -
> /*
> * precalculate the low space thresholds for dynamic speculative preallocation.
> */
> @@ -713,9 +689,12 @@ xfs_mountfs(
> goto out_remove_errortag;
>
> /*
> - * Set the minimum read and write sizes
> + * Update the preferred write size based on the information from the
> + * on-disk superblock.
> */
> - xfs_set_rw_sizes(mp);
> + mp->m_allocsize_log =
> + max_t(uint32_t, sbp->sb_blocklog, mp->m_allocsize_log);
> + mp->m_allocsize_blocks = 1U << (mp->m_allocsize_log - sbp->sb_blocklog);
>
> /* set the low space thresholds for dynamic preallocation */
> xfs_set_low_space_thresholds(mp);
> diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
> index 109081c16a07..712dbb2039cd 100644
> --- a/fs/xfs/xfs_mount.h
> +++ b/fs/xfs/xfs_mount.h
> @@ -244,12 +244,6 @@ typedef struct xfs_mount {
>
> #define XFS_MOUNT_DAX (1ULL << 62) /* TEST ONLY! */
>
> -
> -/*
> - * Default write size.
> - */
> -#define XFS_WRITEIO_LOG_LARGE 16
> -
> /*
> * Max and min values for mount-option defined I/O
> * preallocation sizes.
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index d1a0958f336d..3e5002d2a79e 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -159,8 +159,7 @@ xfs_parseargs(
> const struct super_block *sb = mp->m_super;
> char *p;
> substring_t args[MAX_OPT_ARGS];
> - int iosize = 0;
> - uint8_t iosizelog = 0;
> + int size = 0;
>
> /*
> * set up the mount name first so all the errors will refer to the
> @@ -192,6 +191,7 @@ xfs_parseargs(
> */
> mp->m_logbufs = -1;
> mp->m_logbsize = -1;
> + mp->m_allocsize_log = 16; /* 64k */
>
> if (!options)
> goto done;
> @@ -225,9 +225,10 @@ xfs_parseargs(
> return -ENOMEM;
> break;
> case Opt_allocsize:
> - if (suffix_kstrtoint(args, 10, &iosize))
> + if (suffix_kstrtoint(args, 10, &size))
> return -EINVAL;
> - iosizelog = ffs(iosize) - 1;
> + mp->m_allocsize_log = ffs(size) - 1;
> + mp->m_flags |= XFS_MOUNT_DFLT_IOSIZE;
> break;
> case Opt_grpid:
> case Opt_bsdgroups:
> @@ -395,17 +396,12 @@ xfs_parseargs(
> return -EINVAL;
> }
>
> - if (iosizelog) {
> - if (iosizelog > XFS_MAX_IO_LOG ||
> - iosizelog < XFS_MIN_IO_LOG) {
> - xfs_warn(mp, "invalid log iosize: %d [not %d-%d]",
> - iosizelog, XFS_MIN_IO_LOG,
> - XFS_MAX_IO_LOG);
> - return -EINVAL;
> - }
> -
> - mp->m_flags |= XFS_MOUNT_DFLT_IOSIZE;
> - mp->m_allocsize_log = iosizelog;
> + if ((mp->m_flags & XFS_MOUNT_DFLT_IOSIZE) &&
> + (mp->m_allocsize_log > XFS_MAX_IO_LOG ||
> + mp->m_allocsize_log < XFS_MIN_IO_LOG)) {
> + xfs_warn(mp, "invalid log iosize: %d [not %d-%d]",
> + mp->m_allocsize_log, XFS_MIN_IO_LOG, XFS_MAX_IO_LOG);
> + return -EINVAL;
> }
>
> return 0;
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-10-28 17:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 14:55 decruft misc mount related code v2 Christoph Hellwig
2019-10-27 14:55 ` [PATCH 01/12] xfs: remove the biosize mount option Christoph Hellwig
2019-10-27 14:55 ` [PATCH 02/12] xfs: remove the dsunit and dswidth variables in xfs_parseargs Christoph Hellwig
2019-10-28 16:50 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 03/12] xfs: cleanup calculating the stat optimal I/O size Christoph Hellwig
2019-10-28 16:50 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 04/12] xfs: don't use a different allocsice for -o wsync mounts Christoph Hellwig
2019-10-28 17:05 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 05/12] xfs: remove the m_readio_* fields in struct xfs_mount Christoph Hellwig
2019-10-28 17:06 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 06/12] xfs: rename the m_writeio_* " Christoph Hellwig
2019-10-28 17:07 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 07/12] xfs: simplify parsing of allocsize mount option Christoph Hellwig
2019-10-28 17:11 ` Darrick J. Wong [this message]
2019-10-27 14:55 ` [PATCH 08/12] xfs: rename the XFS_MOUNT_DFLT_IOSIZE option to XFS_MOUNT_ALLOCISZE Christoph Hellwig
2019-10-28 17:12 ` Darrick J. Wong
2019-10-29 7:50 ` Christoph Hellwig
2019-10-27 14:55 ` [PATCH 09/12] xfs: reverse the polarity of XFS_MOUNT_COMPAT_IOSIZE Christoph Hellwig
2019-10-28 17:13 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 10/12] xfs: clean up printing the allocsize option in xfs_showargs Christoph Hellwig
2019-10-28 17:13 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 11/12] xfs: clean up printing inode32/64 " Christoph Hellwig
2019-10-28 17:14 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 12/12] xfs: merge xfs_showargs into xfs_fs_show_options Christoph Hellwig
2019-10-28 17:14 ` Darrick J. Wong
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=20191028171137.GP15222@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
--cc=raven@themaw.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