|
 |
0bd263 |
From 4862e22cd0ac9ed8395003c209d048889a009969 Mon Sep 17 00:00:00 2001
|
|
|
0bd263 |
From: Ondrej Kozina <okozina@redhat.com>
|
|
|
0bd263 |
Date: Fri, 23 Aug 2019 16:34:33 +0200
|
|
|
0bd263 |
Subject: [PATCH 2/5] Add opt-io size parameter to LUKS2 reencrypt test device.
|
|
|
0bd263 |
|
|
|
0bd263 |
So that we can test recovery is not broken for optimal io size
|
|
|
0bd263 |
optimization added to reencryption code.
|
|
|
0bd263 |
---
|
|
|
0bd263 |
tests/luks2-reencryption-test | 21 ++++++++++++---------
|
|
|
0bd263 |
1 file changed, 12 insertions(+), 9 deletions(-)
|
|
|
0bd263 |
|
|
|
0bd263 |
diff --git a/tests/luks2-reencryption-test b/tests/luks2-reencryption-test
|
|
|
0bd263 |
index f88e7f1..558b8dd 100755
|
|
|
0bd263 |
--- a/tests/luks2-reencryption-test
|
|
|
0bd263 |
+++ b/tests/luks2-reencryption-test
|
|
|
0bd263 |
@@ -244,15 +244,16 @@ function fix_writes() { # $1 dmdev, $2 data dev
|
|
|
0bd263 |
}
|
|
|
0bd263 |
|
|
|
0bd263 |
function prepare_linear_dev() {
|
|
|
0bd263 |
- if [ "$1" -gt 32 ]; then
|
|
|
0bd263 |
- preparebig $1
|
|
|
0bd263 |
+ local _sizemb=$1
|
|
|
0bd263 |
+ shift
|
|
|
0bd263 |
+
|
|
|
0bd263 |
+ if [ "$_sizemb" -gt 32 ]; then
|
|
|
0bd263 |
+ preparebig $_sizemb
|
|
|
0bd263 |
else
|
|
|
0bd263 |
- prepare dev_size_mb=$1
|
|
|
0bd263 |
+ prepare dev_size_mb=$_sizemb $@
|
|
|
0bd263 |
fi
|
|
|
0bd263 |
|
|
|
0bd263 |
- local _size=$(blockdev --getsz $DEV)
|
|
|
0bd263 |
-
|
|
|
0bd263 |
- dmsetup create $OVRDEV --table "0 $_size linear $DEV 0" || fail
|
|
|
0bd263 |
+ dmsetup create $OVRDEV --table "0 $((_sizemb*1024*2)) linear $DEV 0" || fail
|
|
|
0bd263 |
|
|
|
0bd263 |
OLD_DEV=$DEV
|
|
|
0bd263 |
DEV=/dev/mapper/$OVRDEV
|
|
|
0bd263 |
@@ -875,7 +876,9 @@ if ! dm_delay_features; then
|
|
|
0bd263 |
fi
|
|
|
0bd263 |
|
|
|
0bd263 |
echo "[6] Reencryption recovery"
|
|
|
0bd263 |
-prepare_linear_dev 32
|
|
|
0bd263 |
+# (check opt-io size optimization in reencryption code does not affect recovery)
|
|
|
0bd263 |
+# device with opt-io size 32k
|
|
|
0bd263 |
+prepare_linear_dev 32 opt_blks=64 opt_xferlen_exp=6
|
|
|
0bd263 |
OFFSET=8192
|
|
|
0bd263 |
|
|
|
0bd263 |
echo "sector size 512->512"
|
|
|
0bd263 |
@@ -957,7 +960,7 @@ if [ -n "$DM_SECTOR_SIZE" ]; then
|
|
|
0bd263 |
fi
|
|
|
0bd263 |
|
|
|
0bd263 |
echo "[8] Reencryption with detached header recovery"
|
|
|
0bd263 |
-prepare_linear_dev 31
|
|
|
0bd263 |
+prepare_linear_dev 31 opt_blks=64 opt_xferlen_exp=6
|
|
|
0bd263 |
|
|
|
0bd263 |
echo "sector size 512->512"
|
|
|
0bd263 |
|
|
|
0bd263 |
@@ -1076,7 +1079,7 @@ if [ -n "$DM_SECTOR_SIZE" ]; then
|
|
|
0bd263 |
fi
|
|
|
0bd263 |
|
|
|
0bd263 |
echo "[12] Encryption with detached header recovery"
|
|
|
0bd263 |
-prepare_linear_dev 31
|
|
|
0bd263 |
+prepare_linear_dev 31 opt_blks=64 opt_xferlen_exp=6
|
|
|
0bd263 |
|
|
|
0bd263 |
get_error_offsets 31 0
|
|
|
0bd263 |
|
|
|
0bd263 |
--
|
|
|
0bd263 |
1.8.3.1
|
|
|
0bd263 |
|