Skip to contentSkip to conversation

test-appliance: fix specifying f2fs mount options in config file

PATCH Applied Eric Biggers 2 participants 6 messages Apr 19, 2018 – May 1, 2018

lore
Share & tools
lore

Eric Biggers

author
#0 lore raw

PATCH 1/2 test-appliance: fix specifying f2fs mount options in config file

From: Eric Biggers <[email protected]>

setup_mount_opts() is supposed to prepend "-o " to the mount options, but it failed to do so in the case where mount options are specified in a config file rather than on the command line. Fix it.

Signed-off-by Eric Biggers <[email protected]>
---
 kvm-xfstests/test-appliance/files/root/fs/f2fs/config | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
kvm-xfstests/test-appliance/files/root/fs/f2fs/config +2 -5
index b0c2196..94c402b 100644
@@ -31,12 +31,9 @@ function format_filesystem()
 function setup_mount_opts()
 {
     if test -n "$MNTOPTS" ; then
-	if test -n "$F2FS_MOUNT_OPTIONS" ; then
-	    export F2FS_MOUNT_OPTIONS="$F2FS_MOUNT_OPTIONS,$MNTOPTS"
-	else
-	    export F2FS_MOUNT_OPTIONS="-o $MNTOPTS"
-	fi
+	F2FS_MOUNT_OPTIONS+="${F2FS_MOUNT_OPTIONS:+,}$MNTOPTS"
     fi
+    export F2FS_MOUNT_OPTIONS="${F2FS_MOUNT_OPTIONS:+-o }$F2FS_MOUNT_OPTIONS"
 }
 
 function get_mkfs_opts()
Signature · 1 line
2.17.0.484.g0c8726318c-goog
author
#1 lore raw

PATCH 2/2 test-appliance: add 'encrypt' config for f2fs

From: Eric Biggers <[email protected]>

Allow testing f2fs using the test_dummy_encryption mount option, available with f2fs in kernel 4.17 and later. E.g.,

gce-xfstests -c f2fs/encrypt -g auto

This is the f2fs equivalent of ext4/encrypt.

Signed-off-by Eric Biggers <[email protected]>
---
 .../test-appliance/files/root/fs/f2fs/cfg/all.list   |  1 +
 .../test-appliance/files/root/fs/f2fs/cfg/encrypt    |  5 +++++
 .../test-appliance/files/root/fs/f2fs/config         | 12 ++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt
kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list +1 -0
index 4ad96d5..bc796ff 100644
@@ -1 +1,2 @@
 default
+encrypt
kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt new file +5 -0
new file mode 100644
index 0000000..0e4e8ab
@@ -0,0 +1,5 @@
+SIZE=small
+export MKFS_OPTIONS="-O encrypt"
+export F2FS_MOUNT_OPTIONS="test_dummy_encryption"
+REQUIRE_FEATURE=encryption
+TESTNAME="F2FS encryption"
kvm-xfstests/test-appliance/files/root/fs/f2fs/config +12 -0
index 94c402b..3857d5d 100644
@@ -33,6 +33,18 @@ function setup_mount_opts()
     if test -n "$MNTOPTS" ; then
 	F2FS_MOUNT_OPTIONS+="${F2FS_MOUNT_OPTIONS:+,}$MNTOPTS"
     fi
+    if echo ",$F2FS_MOUNT_OPTIONS," | grep -q ',test_dummy_encryption,'; then
+	local mode='\x00\x00\x00\x00'
+	local raw="$(printf ""\\\\x%02x"" $(seq 0 63))"
+	if lscpu | grep "Byte Order" | grep -q Little ; then
+	    local size='\x40\x00\x00\x00'
+	else
+	    local size='\x00\x00\x00\x40'
+	fi
+	local key="${mode}${raw}${size}"
+	keyctl new_session >& /dev/null
+	echo -n -e "${key}" | keyctl padd logon fscrypt:4242424242424242 @s >& /dev/null
+    fi
     export F2FS_MOUNT_OPTIONS="${F2FS_MOUNT_OPTIONS:+-o }$F2FS_MOUNT_OPTIONS"
 }
Signature · 1 line
2.17.0.484.g0c8726318c-goog
author
#2 lore raw

Re: [xfstests-bld PATCH 2/2] test-appliance: add 'encrypt' config for f2fs

Quoted 61 lines · Eric Biggers

From: Eric Biggers <[email protected]>

Allow testing f2fs using the test_dummy_encryption mount option, available with f2fs in kernel 4.17 and later. E.g.,

gce-xfstests -c f2fs/encrypt -g auto

This is the f2fs equivalent of ext4/encrypt.

Signed-off-by Eric Biggers <[email protected]>
---
 .../test-appliance/files/root/fs/f2fs/cfg/all.list   |  1 +
 .../test-appliance/files/root/fs/f2fs/cfg/encrypt    |  5 +++++
 .../test-appliance/files/root/fs/f2fs/config         | 12 ++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt
kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list +1 -0
index 4ad96d5..bc796ff 100644
@@ -1 +1,2 @@
 default
+encrypt
kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt new file +5 -0
new file mode 100644
index 0000000..0e4e8ab
@@ -0,0 +1,5 @@
+SIZE=small
+export MKFS_OPTIONS="-O encrypt"
+export F2FS_MOUNT_OPTIONS="test_dummy_encryption"
+REQUIRE_FEATURE=encryption
+TESTNAME="F2FS encryption"
kvm-xfstests/test-appliance/files/root/fs/f2fs/config +12 -0
index 94c402b..3857d5d 100644
@@ -33,6 +33,18 @@ function setup_mount_opts()
     if test -n "$MNTOPTS" ; then
 	F2FS_MOUNT_OPTIONS+="${F2FS_MOUNT_OPTIONS:+,}$MNTOPTS"
     fi
+    if echo ",$F2FS_MOUNT_OPTIONS," | grep -q ',test_dummy_encryption,'; then
+	local mode='\x00\x00\x00\x00'
+	local raw="$(printf ""\\\\x%02x"" $(seq 0 63))"
+	if lscpu | grep "Byte Order" | grep -q Little ; then
+	    local size='\x40\x00\x00\x00'
+	else
+	    local size='\x00\x00\x00\x40'
+	fi
+	local key="${mode}${raw}${size}"
+	keyctl new_session >& /dev/null
+	echo -n -e "${key}" | keyctl padd logon fscrypt:4242424242424242 @s >& /dev/null
+    fi
     export F2FS_MOUNT_OPTIONS="${F2FS_MOUNT_OPTIONS:+-o }$F2FS_MOUNT_OPTIONS"
 }
Signature · 1 line
2.17.0.484.g0c8726318c-goog

Ping.

author
#4 lore raw
In reply to Eric Biggers
Quoted 33 lines · Eric Biggers

From: Eric Biggers <[email protected]>

setup_mount_opts() is supposed to prepend "-o " to the mount options, but it failed to do so in the case where mount options are specified in a config file rather than on the command line. Fix it.

Signed-off-by Eric Biggers <[email protected]>
---
 kvm-xfstests/test-appliance/files/root/fs/f2fs/config | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
kvm-xfstests/test-appliance/files/root/fs/f2fs/config +2 -5
index b0c2196..94c402b 100644
@@ -31,12 +31,9 @@ function format_filesystem()
 function setup_mount_opts()
 {
     if test -n "$MNTOPTS" ; then
-	if test -n "$F2FS_MOUNT_OPTIONS" ; then
-	    export F2FS_MOUNT_OPTIONS="$F2FS_MOUNT_OPTIONS,$MNTOPTS"
-	else
-	    export F2FS_MOUNT_OPTIONS="-o $MNTOPTS"
-	fi
+	F2FS_MOUNT_OPTIONS+="${F2FS_MOUNT_OPTIONS:+,}$MNTOPTS"
     fi
+    export F2FS_MOUNT_OPTIONS="${F2FS_MOUNT_OPTIONS:+-o }$F2FS_MOUNT_OPTIONS"
 }
 
 function get_mkfs_opts()
Signature · 1 line
2.17.0.484.g0c8726318c-goog

Ping.