On Fri, Apr 07, 2017 at 03:56:03PM +0800, Xiong Zhou wrote:
> By tweaking SCRATCH_DEV by ndctl, only run DAX mapped
> area DIO to non-DAX area tests when pmem device is in
> "memory mode".
>
> Signed-off-by: Xiong Zhou <xzhou@xxxxxxxxxx>
> ---
> tests/generic/413 | 25 ++++++++++++++++++++++++-
> tests/xfs/260 | 25 ++++++++++++++++++++++++-
> 2 files changed, 48 insertions(+), 2 deletions(-)
>
> diff --git a/tests/generic/413 b/tests/generic/413
> index a1cc514..55a871f 100755
> --- a/tests/generic/413
> +++ b/tests/generic/413
> @@ -34,6 +34,11 @@ _cleanup()
> {
> cd /
> rm -f $tmp.*
> + _check_scratch_fs
> + # umount and restore SCRATCH_DEV to original mode
> + _scratch_unmount
> + $NDCTL_PROG create-namespace -f -e $scns -m $scmode \
> + > /dev/null 2>&1
If we are running on a system where the PMEM namespace was created with the
memmap kernel command line parameter (which is how I usually test), we don't
want to do any reconfig (our namespaces are already in "memory" mode), and
indeed the NDCTL and JSON commands will fail. Really we can even run the test
without requiring these guys to be there.
We need to detect this situation, and only do NDCTL & JSON commands if we're
running against PMEM that came from an NFIT.
Perhaps it's as easy as just grepping for "memmap" in /proc/cmdline? IMO we
don't need to worry too much about people running with both an memmap command
line *and* a valid NFIT...
This comment applies to patches 2 and 3 in this series.
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
