[ndctl] ndctl: test memmap location

Commit Message

Dan Williams Jan. 30, 2016, 7:10 p.m. UTC

Add tests to validate placing the memmap in ram vs pmem.

Reported-by: Jeff Moyer <[e-mail]>
Signed-off-by: Dan Williams <[e-mail]>
---
 test/dax.sh |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 8 deletions(-)

Patch

diff --git a/test/dax.sh b/test/dax.sh
index c5fce475afce..9d2c27225653 100755
--- a/test/dax.sh
+++ b/test/dax.sh
@@ -1,13 +1,15 @@ 
 #!/bin/bash
 MNT=test_dax_mnt
 FILE=image
-DEV=""
+NDCTL="./ndctl"
+json2var="s/[{}\",]//g; s/:/=/g"
+blockdev=""
 
 err() {
 	rc=1
 	echo "test-dax: failed at line $1"
-	if [ -n "$DEV" ]; then
-		umount $DEV
+	if [ -n "$blockdev" ]; then
+		umount /dev/$blockdev
 	else
 		rc=77
 	fi
@@ -19,16 +21,51 @@  set -e
 mkdir -p $MNT
 trap 'err $LINENO' ERR
 
-DEV=$(test/dax-dev)
+blockdev=$(basename $(test/dax-dev))
+dev=$(basename $(readlink -f /sys/block/$(basename $blockdev)/device))
 
-mkfs.ext4 $DEV
-mount $DEV $MNT -o dax
+mkfs.ext4 /dev/$blockdev
+mount /dev/$blockdev $MNT -o dax
 fallocate -l 1GiB $MNT/$FILE
 test/dax-pmd $MNT/$FILE
 umount $MNT
 
-mkfs.xfs -f $DEV
-mount $DEV $MNT -o dax
+# convert pmem to put the memmap on the device
+json=$($NDCTL create-namespace -m memory -M dev -f -e $dev)
+eval $(echo $json | sed -e "$json2var")
+[ $mode != "memory" ] && echo "fail: $LINENO" &&  exit 1
+
+#note the blockdev returned from ndctl create-namespace lacks the /dev prefix
+mkfs.ext4 /dev/$blockdev
+mount /dev/$blockdev $MNT -o dax
 fallocate -l 1GiB $MNT/$FILE
 test/dax-pmd $MNT/$FILE
 umount $MNT
+
+json=$($NDCTL create-namespace -m raw -f -e $dev)
+eval $(echo $json | sed -e "$json2var")
+[ $mode != "memory" ] && echo "fail: $LINENO" &&  exit 1
+
+mkfs.xfs -f /dev/$blockdev
+mount /dev/$blockdev $MNT -o dax
+fallocate -l 1GiB $MNT/$FILE
+test/dax-pmd $MNT/$FILE
+umount $MNT
+
+# convert pmem to put the memmap on the device
+json=$($NDCTL create-namespace -m memory -M dev -f -e $dev)
+eval $(echo $json | sed -e "$json2var")
+[ $mode != "memory" ] && echo "fail: $LINENO" &&  exit 1
+
+mkfs.xfs -f /dev/$blockdev
+mount /dev/$blockdev $MNT -o dax
+fallocate -l 1GiB $MNT/$FILE
+test/dax-pmd $MNT/$FILE
+umount $MNT
+
+# revert namespace to raw mode
+json=$($NDCTL create-namespace -m raw -f -e $dev)
+eval $(echo $json | sed -e "$json2var")
+[ $mode != "memory" ] && echo "fail: $LINENO" &&  exit 1
+
+exit 0