From: Eric Biggers <ebiggers3@gmail.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net,
Eric Biggers <ebiggers@google.com>
Subject: [xfstests-bld PATCH 2/2] test-appliance: add 'encrypt' config for f2fs
Date: Thu, 19 Apr 2018 13:50:20 -0700 [thread overview]
Message-ID: <20180419205020.16868-2-ebiggers3@gmail.com> (raw)
In-Reply-To: <20180419205020.16868-1-ebiggers3@gmail.com>
From: Eric Biggers <ebiggers@google.com>
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 <ebiggers@google.com>
---
.../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
diff --git a/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list b/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list
index 4ad96d5..bc796ff 100644
--- a/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list
+++ b/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list
@@ -1 +1,2 @@
default
+encrypt
diff --git a/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt b/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt
new file mode 100644
index 0000000..0e4e8ab
--- /dev/null
+++ b/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt
@@ -0,0 +1,5 @@
+SIZE=small
+export MKFS_OPTIONS="-O encrypt"
+export F2FS_MOUNT_OPTIONS="test_dummy_encryption"
+REQUIRE_FEATURE=encryption
+TESTNAME="F2FS encryption"
diff --git a/kvm-xfstests/test-appliance/files/root/fs/f2fs/config b/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
index 94c402b..3857d5d 100644
--- a/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
+++ b/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
@@ -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"
}
--
2.17.0.484.g0c8726318c-goog
WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers3@gmail.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: Eric Biggers <ebiggers@google.com>,
fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net
Subject: [xfstests-bld PATCH 2/2] test-appliance: add 'encrypt' config for f2fs
Date: Thu, 19 Apr 2018 13:50:20 -0700 [thread overview]
Message-ID: <20180419205020.16868-2-ebiggers3@gmail.com> (raw)
In-Reply-To: <20180419205020.16868-1-ebiggers3@gmail.com>
From: Eric Biggers <ebiggers@google.com>
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 <ebiggers@google.com>
---
.../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
diff --git a/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list b/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list
index 4ad96d5..bc796ff 100644
--- a/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list
+++ b/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/all.list
@@ -1 +1,2 @@
default
+encrypt
diff --git a/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt b/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt
new file mode 100644
index 0000000..0e4e8ab
--- /dev/null
+++ b/kvm-xfstests/test-appliance/files/root/fs/f2fs/cfg/encrypt
@@ -0,0 +1,5 @@
+SIZE=small
+export MKFS_OPTIONS="-O encrypt"
+export F2FS_MOUNT_OPTIONS="test_dummy_encryption"
+REQUIRE_FEATURE=encryption
+TESTNAME="F2FS encryption"
diff --git a/kvm-xfstests/test-appliance/files/root/fs/f2fs/config b/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
index 94c402b..3857d5d 100644
--- a/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
+++ b/kvm-xfstests/test-appliance/files/root/fs/f2fs/config
@@ -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"
}
--
2.17.0.484.g0c8726318c-goog
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
next prev parent reply other threads:[~2018-04-19 20:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 20:50 [xfstests-bld PATCH 1/2] test-appliance: fix specifying f2fs mount options in config file Eric Biggers
2018-04-19 20:50 ` Eric Biggers
2018-04-19 20:50 ` Eric Biggers [this message]
2018-04-19 20:50 ` [xfstests-bld PATCH 2/2] test-appliance: add 'encrypt' config for f2fs Eric Biggers
2018-04-30 19:13 ` Eric Biggers
2018-04-30 19:13 ` Eric Biggers
2018-05-01 2:17 ` Theodore Y. Ts'o
2018-05-01 2:17 ` Theodore Y. Ts'o
2018-04-30 19:13 ` [xfstests-bld PATCH 1/2] test-appliance: fix specifying f2fs mount options in config file Eric Biggers
2018-04-30 19:13 ` Eric Biggers
2018-05-01 2:17 ` Theodore Y. Ts'o
2018-05-01 2:17 ` Theodore Y. Ts'o
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=20180419205020.16868-2-ebiggers3@gmail.com \
--to=ebiggers3@gmail.com \
--cc=ebiggers@google.com \
--cc=fstests@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=tytso@mit.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.