From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Xiao Yang <ice_yangxiao@163.com>
Cc: fstests@vger.kernel.org, ira.weiny@intel.com,
ross.zwisler@linux.intel.com, Xiao Yang <yangx.jy@cn.fujitsu.com>
Subject: Re: [PATCH v2 5/6] generic/413, xfs/260: Improve format operation for PMD fault testing
Date: Tue, 23 Jun 2020 08:28:17 -0700 [thread overview]
Message-ID: <20200623152817.GB7600@magnolia> (raw)
In-Reply-To: <20200617093204.20838-6-ice_yangxiao@163.com>
On Wed, Jun 17, 2020 at 05:32:03PM +0800, Xiao Yang wrote:
> From: Xiao Yang <yangx.jy@cn.fujitsu.com>
>
> 1) Simple code and fix the wrong value of stripe_width by _scratch_mkfs_geom().
> 2) Get hugepage size by _get_hugepagesize() and replace fixed 2M with
> hugepage size because hugepage size/PMD_SIZE is not 2M on some
> arches.(e.g. hugepage size/PMD_SIZE is 512M on arm64)
> 3) For debugging, redirect the output of mkfs to $seqres.full.
>
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
> common/rc | 7 +++++++
> tests/generic/413 | 10 ++--------
> tests/xfs/260 | 4 ++--
> 3 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index bde26010..4852b21b 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -170,6 +170,13 @@ _get_filesize()
> stat -c %s "$1"
> }
>
> +# get hugepagesize in bytes
> +_get_hugepagesize()
> +{
> + local hugepgsz=$(awk '/Hugepagesize/ {print $2}' /proc/meminfo)
> + echo $((hugepgsz * 1024))
> +}
> +
> _mount()
> {
> $MOUNT_PROG `_mount_ops_filter $*`
> diff --git a/tests/generic/413 b/tests/generic/413
> index 19e1b926..dfe2912b 100755
> --- a/tests/generic/413
> +++ b/tests/generic/413
> @@ -111,14 +111,8 @@ do_tests()
> t_mmap_dio_dax $((64 * 1024 * 1024))
> }
>
> -# make fs 2Mb aligned for PMD fault testing
> -mkfs_opts=""
> -if [ "$FSTYP" == "ext4" ]; then
> - mkfs_opts="-E stride=512,stripe_width=1"
> -elif [ "$FSTYP" == "xfs" ]; then
> - mkfs_opts="-d su=2m,sw=1"
> -fi
> -_scratch_mkfs "$mkfs_opts" > /dev/null 2>&1
> +# make fs aligned for PMD fault testing
> +_scratch_mkfs_geom $(_get_hugepagesize) 1 >> $seqres.full 2>&1
These _get_hugepagesize callsites ought to _notrun the test or something
if the relevant data cannot be extracted from /proc/meminfo.
Other than that, I like the way this looks. :)
--D
>
> # mount SCRATCH_DEV with dax option, TEST_DEV not
> export MOUNT_OPTIONS=""
> diff --git a/tests/xfs/260 b/tests/xfs/260
> index fbdc4cd8..7afc20f1 100755
> --- a/tests/xfs/260
> +++ b/tests/xfs/260
> @@ -121,8 +121,8 @@ do_tests()
> t_dax_flag_mmap_dio $((64 * 1024 * 1024))
> }
>
> -# make xfs 2Mb aligned for PMD fault testing
> -_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
> +# make xfs aligned for PMD fault testing
> +_scratch_mkfs_geom $(_get_hugepagesize) 1 >> $seqres.full 2>&1
>
> # mount with dax option
> _scratch_mount "-o dax"
> --
> 2.21.0
>
next prev parent reply other threads:[~2020-06-23 15:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 9:31 [PATCH v2 0/6] Make fstests support new behavior of DAX Xiao Yang
2020-06-17 9:31 ` [PATCH v2 1/6] common/rc: Introduce new helpers for DAX mount options and FS_XFLAG_DAX Xiao Yang
2020-06-17 20:58 ` Ira Weiny
2020-06-17 9:32 ` [PATCH v2 2/6] fstests: Use _require_scratch_dax_mountopt() and _require_scratch_dax_iflag() Xiao Yang
2020-06-17 20:58 ` Ira Weiny
2020-06-17 9:32 ` [PATCH v2 3/6] common/rc: Remove unused _require_scratch_dax() Xiao Yang
2020-06-17 20:59 ` Ira Weiny
2020-06-17 9:32 ` [PATCH v2 4/6] generic/223: Don't clear all mkfs options for _scratch_mkfs_geom() roughly Xiao Yang
2020-06-17 9:32 ` [PATCH v2 5/6] generic/413, xfs/260: Improve format operation for PMD fault testing Xiao Yang
2020-06-23 6:00 ` Xiao Yang
2020-06-23 15:28 ` Darrick J. Wong [this message]
2020-06-17 9:32 ` [PATCH v2 6/6] xfs/260: Move xfs/260 to generic Xiao Yang
2020-06-17 21:48 ` Ira Weiny
2020-06-18 15:35 ` Xiao Yang
2020-06-19 15:15 ` Ira Weiny
2020-06-23 8:51 ` Xiao Yang
2020-06-23 18:08 ` Ira Weiny
2020-06-30 7:08 ` Xiao Yang
2020-06-30 15:50 ` Ira Weiny
2020-07-01 1:07 ` Xiao Yang
2020-06-18 0:21 ` [PATCH v2 0/6] Make fstests support new behavior of DAX Ira Weiny
2020-06-18 15:04 ` Xiao Yang
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=20200623152817.GB7600@magnolia \
--to=darrick.wong@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=ice_yangxiao@163.com \
--cc=ira.weiny@intel.com \
--cc=ross.zwisler@linux.intel.com \
--cc=yangx.jy@cn.fujitsu.com \
/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).