From 8e8864f27e8065bbcff4d796ed476b92ecb9c84a Mon Sep 17 00:00:00 2001
From: Karol Latecki <karol.latecki@intel.com>
Date: Tue, 23 Jun 2020 08:37:57 +0200
Subject: [PATCH] test/cuse: use 512B block size on namespace revert

Use 512B block size when running nvme_namespace_revert
routine. Need to use this block size because of
vhost_boot.sh test case.

Fixes #1452

Change-Id: I5f41cf2bf9d63b811849a99de6cba9b7b5a1d97d
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3003
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 test/common/autotest_common.sh        | 6 ++++--
 test/nvme/cuse/nvme_ns_manage_cuse.sh | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 866d4b493..14995624d 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -1232,7 +1232,9 @@ function nvme_namespace_revert() {
 
 		if [[ "$oacs_ns_manage" -ne 0 ]]; then
 			# This assumes every NVMe controller contains single namespace,
-			# encompassing Total NVM Capacity and formatted as 4k block size.
+			# encompassing Total NVM Capacity and formatted as 512 block size.
+			# 512 block size is needed for test/vhost/vhost_boot.sh to
+			# succesfully run.
 
 			unvmcap=$(nvme id-ctrl ${nvme_ctrlr} | grep unvmcap | cut -d: -f2)
 			if [[ "$unvmcap" -eq 0 ]]; then
@@ -1240,7 +1242,7 @@ function nvme_namespace_revert() {
 				continue
 			fi
 			tnvmcap=$(nvme id-ctrl ${nvme_ctrlr} | grep tnvmcap | cut -d: -f2)
-			blksize=4096
+			blksize=512
 
 			size=$((tnvmcap / blksize))
 
diff --git a/test/nvme/cuse/nvme_ns_manage_cuse.sh b/test/nvme/cuse/nvme_ns_manage_cuse.sh
index dae0baee0..fb390f34e 100755
--- a/test/nvme/cuse/nvme_ns_manage_cuse.sh
+++ b/test/nvme/cuse/nvme_ns_manage_cuse.sh
@@ -56,10 +56,12 @@ function clean_up() {
 	$rootdir/scripts/setup.sh reset
 
 	# This assumes every NVMe controller contains single namespace,
-	# encompassing Total NVM Capacity and formatted as 4k block size.
+	# encompassing Total NVM Capacity and formatted as 512 block size.
+	# 512 block size is needed for test/vhost/vhost_boot.sh to
+	# succesfully run.
 
 	tnvmcap=$($NVME_CMD id-ctrl ${nvme_dev} | grep tnvmcap | cut -d: -f2)
-	blksize=4096
+	blksize=512
 
 	size=$((tnvmcap / blksize))