From patchwork Fri Nov 17 12:05:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinichiro Kawasaki X-Patchwork-Id: 13458897 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="LC8XQvxq" Received: from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F2A4C4 for ; Fri, 17 Nov 2023 04:05:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1700222754; x=1731758754; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NoDdgE4bhMmuho+xy7QlTB3wwCTEc4zFfqdlizVAqtg=; b=LC8XQvxqRkCLloBIFtaMC5g1vLqmZsopOMhSetSK127w6ZuXWtQMv8De Yy4e9MKY+xIPu0Zx8Eyd8EmKQec360qa+XcLimJUikVcECNb9Kbz+8dbv I1tHskZYWr0rqFUq2fHUyN8XocuPdTXidJ831lsRO/+oyDCnjqPCTZRVd EQClwkfGgtFnHf8h5aa9ACNEW/sIbMYSuDVphu/RZ3fOdOnkxUwSMV4/v gTaAEni6lJI9MIl3xTkcMbx8ZB4jQPlZ44Jmz8UUDgI9HtnqdP2ytAl0y xCXA4B21gpbK/XCRAJvy45b9DbSyoKFhArxitCureNYJiUO+Y2HooQtuQ g==; X-CSE-ConnectionGUID: +k10jL8vR6ebJR+UmNzJzA== X-CSE-MsgGUID: Lu7qY24AQcOaN5u6arc23Q== X-IronPort-AV: E=Sophos;i="6.04,206,1695657600"; d="scan'208";a="2575196" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 17 Nov 2023 20:05:53 +0800 IronPort-SDR: pe6jyZYStSzebSe6SeKVt7Ljvw9FUkv9qNw6MyzI0U6jTt4CToufnu6a5tl8RLX3+1b+405H6t gL/AkC+t+OX5WjJJavAcHRNtol/YAru47qeOjKr/WFTyFXSThEJykUT2WZaIwol15oOVgmH1Jx 7FLGTl+CeL2IRh9mrk8U7h94hH07iKDLvUqQWjVll4hVX5vczzkVa6xyOytBXsm/w0ctG42MBG DvAketsOmPaJIl9kIdvldw/UdGlsbewMq2SRa+tu7AAYeRSmCE5tXf+qCXi4YHhObulZ7lPSUg tGk= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 17 Nov 2023 03:11:36 -0800 IronPort-SDR: nYGy4+6WL4QNZPq3VVdR8swCdRY+/UogRvf0sP05xx8cPeP0CZL/De4IxfPdWOusbwprlwnA87 ZOOzMkiDsEaNkqqutOdlVhn017XDDaanMiW0lF/yOYgRbif5rSNVhZcJSVLXfywzszQJas813i 7V1kWJGpz42jEvHBT45ISR1ZAgq872CaxQXL5nmCdRrU8pjW4qNvg0Zn8OU0/n/3x/PI75RR1t G4Pm69X6zPqtGO4e7sOoESE4VCxm5srSpp5YmMuqp4G7MHGN5/93PuLb/3vINVm0T4PGG+YWmk hS4= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.53.55]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Nov 2023 04:05:52 -0800 From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org Cc: Hannes Reinecke , Daniel Wagner , Shin'ichiro Kawasaki Subject: [PATCH blktests v2 1/2] nvme: do not print UUID to log files Date: Fri, 17 Nov 2023 21:05:49 +0900 Message-ID: <20231117120550.2993743-2-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231117120550.2993743-1-shinichiro.kawasaki@wdc.com> References: <20231117120550.2993743-1-shinichiro.kawasaki@wdc.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hannes Reinecke The UUID/wwid of a namespace might be assigned externally, so we shouldn't register it in the 'out' files. The current checks for UUID/wwid are just there to ensure that if a UUID is present is should match the wwid setting. So rather add a function _check_uuid() which does exactly that and don't register the actual UUID in the 'out' files. [Shin'ichiro: added check against def_subsys_uuid in _check_uuid()] Signed-off-by: Hannes Reinecke Reviewed-by: Daniel Wagner Signed-off-by: Shin'ichiro Kawasaki --- tests/nvme/004 | 3 +-- tests/nvme/004.out | 2 -- tests/nvme/008 | 3 +-- tests/nvme/008.out | 2 -- tests/nvme/009 | 3 +-- tests/nvme/009.out | 2 -- tests/nvme/010 | 3 +-- tests/nvme/010.out | 2 -- tests/nvme/011 | 3 +-- tests/nvme/011.out | 2 -- tests/nvme/012 | 3 +-- tests/nvme/012.out | 2 -- tests/nvme/013 | 3 +-- tests/nvme/013.out | 2 -- tests/nvme/014 | 3 +-- tests/nvme/014.out | 2 -- tests/nvme/015 | 3 +-- tests/nvme/015.out | 2 -- tests/nvme/018 | 3 +-- tests/nvme/018.out | 2 -- tests/nvme/019 | 3 +-- tests/nvme/019.out | 2 -- tests/nvme/020 | 3 +-- tests/nvme/020.out | 2 -- tests/nvme/021 | 3 +-- tests/nvme/021.out | 2 -- tests/nvme/022 | 3 +-- tests/nvme/022.out | 2 -- tests/nvme/023 | 3 +-- tests/nvme/023.out | 2 -- tests/nvme/024 | 3 +-- tests/nvme/024.out | 2 -- tests/nvme/025 | 3 +-- tests/nvme/025.out | 2 -- tests/nvme/026 | 3 +-- tests/nvme/026.out | 2 -- tests/nvme/027 | 3 +-- tests/nvme/027.out | 2 -- tests/nvme/028 | 3 +-- tests/nvme/028.out | 2 -- tests/nvme/029 | 3 +-- tests/nvme/029.out | 2 -- tests/nvme/rc | 24 ++++++++++++++++++++++++ 43 files changed, 45 insertions(+), 84 deletions(-) diff --git a/tests/nvme/004 b/tests/nvme/004 index 31af873..cc5310e 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -29,8 +29,7 @@ test() { local nvmedev nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" _nvme_disconnect_subsys ${def_subsysnqn} diff --git a/tests/nvme/004.out b/tests/nvme/004.out index 51f6052..2559905 100644 --- a/tests/nvme/004.out +++ b/tests/nvme/004.out @@ -1,5 +1,3 @@ Running nvme/004 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/008 b/tests/nvme/008 index f4b45b2..6ff3362 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" _nvme_disconnect_subsys "${def_subsysnqn}" diff --git a/tests/nvme/008.out b/tests/nvme/008.out index b05b46d..62342e7 100644 --- a/tests/nvme/008.out +++ b/tests/nvme/008.out @@ -1,5 +1,3 @@ Running nvme/008 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/009 b/tests/nvme/009 index 905de03..4ea0063 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -26,8 +26,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" _nvme_disconnect_subsys "${def_subsysnqn}" diff --git a/tests/nvme/009.out b/tests/nvme/009.out index 7fd27ff..853663f 100644 --- a/tests/nvme/009.out +++ b/tests/nvme/009.out @@ -1,5 +1,3 @@ Running nvme/009 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/010 b/tests/nvme/010 index e782a9b..5ed6cb5 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" _run_fio_verify_io --size="${nvme_img_size}" \ --filename="/dev/${nvmedev}n1" diff --git a/tests/nvme/010.out b/tests/nvme/010.out index 788ea96..90468f5 100644 --- a/tests/nvme/010.out +++ b/tests/nvme/010.out @@ -1,5 +1,3 @@ Running nvme/010 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/011 b/tests/nvme/011 index 56658f4..f9150e0 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" _run_fio_verify_io --size="${nvme_img_size}" \ --filename="/dev/${nvmedev}n1" diff --git a/tests/nvme/011.out b/tests/nvme/011.out index ab29fa2..a780def 100644 --- a/tests/nvme/011.out +++ b/tests/nvme/011.out @@ -1,5 +1,3 @@ Running nvme/011 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/012 b/tests/nvme/012 index 6072eed..c5e0eb9 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -31,8 +31,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" _xfs_run_fio_verify_io "/dev/${nvmedev}n1" diff --git a/tests/nvme/012.out b/tests/nvme/012.out index 581e686..ec4bea8 100644 --- a/tests/nvme/012.out +++ b/tests/nvme/012.out @@ -1,5 +1,3 @@ Running nvme/012 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/013 b/tests/nvme/013 index 60441ca..3ec280f 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -30,8 +30,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" _xfs_run_fio_verify_io "/dev/${nvmedev}n1" diff --git a/tests/nvme/013.out b/tests/nvme/013.out index f7285a9..10b78ec 100644 --- a/tests/nvme/013.out +++ b/tests/nvme/013.out @@ -1,5 +1,3 @@ Running nvme/013 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/014 b/tests/nvme/014 index d49e8f3..31bfeb7 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -30,8 +30,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" size="$(blockdev --getsize64 "/dev/${nvmedev}n1")" bs="$(blockdev --getbsz "/dev/${nvmedev}n1")" diff --git a/tests/nvme/014.out b/tests/nvme/014.out index 0285826..c431864 100644 --- a/tests/nvme/014.out +++ b/tests/nvme/014.out @@ -1,6 +1,4 @@ Running nvme/014 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NVMe Flush: success NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/015 b/tests/nvme/015 index 0813bcf..4315ffa 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -30,8 +30,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" size="$(blockdev --getsize64 "/dev/${nvmedev}n1")" bs="$(blockdev --getbsz "/dev/${nvmedev}n1")" diff --git a/tests/nvme/015.out b/tests/nvme/015.out index 23763f1..829cf40 100644 --- a/tests/nvme/015.out +++ b/tests/nvme/015.out @@ -1,6 +1,4 @@ Running nvme/015 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NVMe Flush: success NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/018 b/tests/nvme/018 index 00531cf..e901730 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -28,8 +28,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" local sectors local bs diff --git a/tests/nvme/018.out b/tests/nvme/018.out index 68a0194..6b0e814 100644 --- a/tests/nvme/018.out +++ b/tests/nvme/018.out @@ -1,5 +1,3 @@ Running nvme/018 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/019 b/tests/nvme/019 index 15e98c4..a1035ff 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -29,8 +29,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}" diff --git a/tests/nvme/019.out b/tests/nvme/019.out index 3e649a4..a52325f 100644 --- a/tests/nvme/019.out +++ b/tests/nvme/019.out @@ -1,6 +1,4 @@ Running nvme/019 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NVMe DSM: success NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/020 b/tests/nvme/020 index 59c1179..ba3f4c8 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -28,8 +28,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}" diff --git a/tests/nvme/020.out b/tests/nvme/020.out index 113c177..9e293ab 100644 --- a/tests/nvme/020.out +++ b/tests/nvme/020.out @@ -1,6 +1,4 @@ Running nvme/020 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e NVMe DSM: success NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete diff --git a/tests/nvme/021 b/tests/nvme/021 index 2277fe5..7dc6a41 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" if ! nvme list 2>> "$FULL" | grep -q "${nvmedev}n1"; then echo "ERROR: device not listed" diff --git a/tests/nvme/021.out b/tests/nvme/021.out index b6b1a7c..c86ee74 100644 --- a/tests/nvme/021.out +++ b/tests/nvme/021.out @@ -1,4 +1,2 @@ Running nvme/021 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/022 b/tests/nvme/022 index a74eba3..c70fbba 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" if ! nvme reset "/dev/${nvmedev}" >> "$FULL" 2>&1; then echo "ERROR: reset failed" diff --git a/tests/nvme/022.out b/tests/nvme/022.out index 1d393db..dace761 100644 --- a/tests/nvme/022.out +++ b/tests/nvme/022.out @@ -1,4 +1,2 @@ Running nvme/022 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/023 b/tests/nvme/023 index c8d1e46..4e4d838 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then echo "ERROR: smart-log bdev-ns failed" diff --git a/tests/nvme/023.out b/tests/nvme/023.out index 47c99ca..aa5d290 100644 --- a/tests/nvme/023.out +++ b/tests/nvme/023.out @@ -1,4 +1,2 @@ Running nvme/023 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/024 b/tests/nvme/024 index d21bcce..2535a9a 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then echo "ERROR: smart-log file-ns failed" diff --git a/tests/nvme/024.out b/tests/nvme/024.out index 0b1a350..76c3e29 100644 --- a/tests/nvme/024.out +++ b/tests/nvme/024.out @@ -1,4 +1,2 @@ Running nvme/024 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/025 b/tests/nvme/025 index 5912e5d..46f6197 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" if ! nvme effects-log "/dev/${nvmedev}" >> "$FULL" 2>&1; then echo "ERROR: effects-log failed" diff --git a/tests/nvme/025.out b/tests/nvme/025.out index f15ff2f..66d646e 100644 --- a/tests/nvme/025.out +++ b/tests/nvme/025.out @@ -1,4 +1,2 @@ Running nvme/025 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/026 b/tests/nvme/026 index b6bc779..5a7d992 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" if ! nvme ns-descs "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then echo "ERROR: ns-desc failed" diff --git a/tests/nvme/026.out b/tests/nvme/026.out index c934cac..69a05de 100644 --- a/tests/nvme/026.out +++ b/tests/nvme/026.out @@ -1,4 +1,2 @@ Running nvme/026 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/027 b/tests/nvme/027 index 3993fb5..82b77a9 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" if ! nvme ns-rescan "/dev/${nvmedev}" >> "$FULL" 2>&1; then echo "ERROR: ns-rescan failed" diff --git a/tests/nvme/027.out b/tests/nvme/027.out index 5c6ed26..621a404 100644 --- a/tests/nvme/027.out +++ b/tests/nvme/027.out @@ -1,4 +1,2 @@ Running nvme/027 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/028 b/tests/nvme/028 index e522381..0b49e20 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -27,8 +27,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" if ! nvme list-subsys 2>> "$FULL" | grep -q "${nvme_trtype}"; then echo "ERROR: list-subsys" diff --git a/tests/nvme/028.out b/tests/nvme/028.out index 536067f..7cfd2d3 100644 --- a/tests/nvme/028.out +++ b/tests/nvme/028.out @@ -1,4 +1,2 @@ Running nvme/028 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/029 b/tests/nvme/029 index bbc4814..caed0f7 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -60,8 +60,7 @@ test() { _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") - cat "/sys/block/${nvmedev}n1/uuid" - cat "/sys/block/${nvmedev}n1/wwid" + _check_uuid "${nvmedev}" local dev="/dev/${nvmedev}n1" test_user_io "$dev" 1 512 > "$FULL" 2>&1 || echo FAIL diff --git a/tests/nvme/029.out b/tests/nvme/029.out index 0021003..745f142 100644 --- a/tests/nvme/029.out +++ b/tests/nvme/029.out @@ -1,4 +1,2 @@ Running nvme/029 -91fdba0d-f87b-4c25-b80f-db7be1418b9e -uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e Test complete diff --git a/tests/nvme/rc b/tests/nvme/rc index 1cff522..4452274 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -959,6 +959,30 @@ _check_genctr() { echo "${genctr}" } +_check_uuid() { + local nvmedev=$1 + local nr_nsid=0 + + for ns in "/sys/block/${nvmedev}n"* ; do + [ -e "${ns}/wwid" ] || continue + nr_nsid=$((nr_nsid + 1)) + [ -e "${ns}/uuid" ] || continue + uuid=$(cat "${ns}/uuid") + wwid=$(cat "${ns}/wwid") + if [ "${uuid}" != "${wwid#uuid.}" ]; then + echo "UUID ${uuid} mismatch (wwid ${wwid})" + return 1 + elif [ "${uuid}" != "${def_subsys_uuid}" ]; then + echo "UUID ${uuid} mismatch with ${def_subsys_uuid})" + return 1 + fi + done + if [ $nr_nsid -eq 0 ] ; then + echo "No namespaces found" + return 1 + fi +} + declare -A NS_DEV_FAULT_INJECT_SAVE declare -A CTRL_DEV_FAULT_INJECT_SAVE From patchwork Fri Nov 17 12:05:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinichiro Kawasaki X-Patchwork-Id: 13458898 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="CwoaKeiJ" Received: from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AD01CE for ; Fri, 17 Nov 2023 04:05:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1700222755; x=1731758755; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iuYnZZ5x+m52xnq562/ihVwo+5QcU88vr1++Wc5eE8A=; b=CwoaKeiJgqVeKHwbr2uv0zeeUBX3+WSI14X8x9Tl9eNl6YfL+yDXuRJ7 khiwKtJAUWhFxPfNED95R4rcugn2n0ZaFY8GC6WAFQyVL2rDos/ELhKRH oxXgEomxi99VhcQGqyuEQAaT7PZ06QpWK67N7i4a3CtPD0Rom7gJgLXXe DL+ecCL3DnHp6jRLcLXWZ2aKg79Hd1+Z6FBAjCEHo/S04gYOyYcLyAsZn +psL9Fg18yCj7G4aoAGFANKqJNwhxYrDLVWKsmnpk3tZ23cCPaRFZJNo6 xecoAWybKFOJM7NhJMc1BsQtTjn7vBlnQIUEERP2HqfRKixBqVg69hRNa w==; X-CSE-ConnectionGUID: MptpsSehQdSdGyaEjF/0Bg== X-CSE-MsgGUID: KXXijhnOQ/qChinN8Zgh/w== X-IronPort-AV: E=Sophos;i="6.04,206,1695657600"; d="scan'208";a="2575197" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 17 Nov 2023 20:05:54 +0800 IronPort-SDR: LSWF7VLeAQZwGsOADn4BUe6tKzzQ8uatTQlWAE7ZNL5hvPvFgGLLTAAB5Mrhl9UI1mrTzU/ukG E+gJTQksYbhiaadulmrkiAsdpm72VKrsVda8bhi2IJ3S81u9JTgMGhjzrcnAYadG9pg2PPcO8l 3GpHOMI3eenDvxJmYbiUKgA9G5Ytdfs2jjBUS6MPeoLlNgQtEsT3EBaYDZwlU8V9gVVay/aHNq INCbSA83yd4Dn7XrO3WlRf1VaGCUyhMkOs6fxxUjmeTlCdgpJH5wTO4upCIL8Uh1v2Mf7GeKod 9tU= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 17 Nov 2023 03:11:37 -0800 IronPort-SDR: prqoUH4AvALcF4lMZkLMwcFKpQaWkFwN21HEk+/klmxiCSWabMz+BYYe72NQqlvX8nBBvNZOAp /tSoLON524UujyOgf320zNorcaaI8DqHBiwvqM6YArILOCU8MryjXUZ4YX5243CtI0yp758Sqw xSx6J9xvvlqgGU5dFSPdB/q6M8BM1lXEExhY87ff8IeMsKZM951cP0tQBdur85KNMtWVN03HTZ ehcG8BLsKZURqisV5b3jMx6fFx4PcnG/CEoH5anCguV/zl75V2im1PvvPPDdc6651lbx43+MgA GJM= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.53.55]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Nov 2023 04:05:53 -0800 From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org Cc: Hannes Reinecke , Daniel Wagner , Shin'ichiro Kawasaki Subject: [PATCH blktests v2 2/2] nvme: do not print subsystem NQN to stdout Date: Fri, 17 Nov 2023 21:05:50 +0900 Message-ID: <20231117120550.2993743-3-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231117120550.2993743-1-shinichiro.kawasaki@wdc.com> References: <20231117120550.2993743-1-shinichiro.kawasaki@wdc.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hannes Reinecke The subsystem NQN might be changed from the default value, but that shouldn't cause the tests to fail. So don't register the subsystem NQN in the 'out' files to avoid a false positive. Signed-off-by: Hannes Reinecke [Shin'ichiro: remove only subsystem NQN from nvme disconnect message] Signed-off-by: Shin'ichiro Kawasaki --- tests/nvme/003.out | 2 +- tests/nvme/004.out | 2 +- tests/nvme/008.out | 2 +- tests/nvme/009.out | 2 +- tests/nvme/010.out | 2 +- tests/nvme/011.out | 2 +- tests/nvme/012.out | 2 +- tests/nvme/013.out | 2 +- tests/nvme/014.out | 2 +- tests/nvme/015.out | 2 +- tests/nvme/018.out | 2 +- tests/nvme/019.out | 2 +- tests/nvme/020.out | 2 +- tests/nvme/033.out | 2 +- tests/nvme/034.out | 2 +- tests/nvme/035.out | 2 +- tests/nvme/036.out | 2 +- tests/nvme/041.out | 4 ++-- tests/nvme/042.out | 14 +++++++------- tests/nvme/043.out | 16 ++++++++-------- tests/nvme/044.out | 8 ++++---- tests/nvme/045.out | 2 +- tests/nvme/048.out | 2 +- tests/nvme/rc | 3 ++- 24 files changed, 42 insertions(+), 41 deletions(-) diff --git a/tests/nvme/003.out b/tests/nvme/003.out index beb3561..dc45bc4 100644 --- a/tests/nvme/003.out +++ b/tests/nvme/003.out @@ -1,3 +1,3 @@ Running nvme/003 -NQN:nqn.2014-08.org.nvmexpress.discovery disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/004.out b/tests/nvme/004.out index 2559905..177185d 100644 --- a/tests/nvme/004.out +++ b/tests/nvme/004.out @@ -1,3 +1,3 @@ Running nvme/004 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/008.out b/tests/nvme/008.out index 62342e7..f7411f8 100644 --- a/tests/nvme/008.out +++ b/tests/nvme/008.out @@ -1,3 +1,3 @@ Running nvme/008 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/009.out b/tests/nvme/009.out index 853663f..4d53a8e 100644 --- a/tests/nvme/009.out +++ b/tests/nvme/009.out @@ -1,3 +1,3 @@ Running nvme/009 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/010.out b/tests/nvme/010.out index 90468f5..18b52d8 100644 --- a/tests/nvme/010.out +++ b/tests/nvme/010.out @@ -1,3 +1,3 @@ Running nvme/010 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/011.out b/tests/nvme/011.out index a780def..ebbb4f7 100644 --- a/tests/nvme/011.out +++ b/tests/nvme/011.out @@ -1,3 +1,3 @@ Running nvme/011 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/012.out b/tests/nvme/012.out index ec4bea8..5074d3b 100644 --- a/tests/nvme/012.out +++ b/tests/nvme/012.out @@ -1,3 +1,3 @@ Running nvme/012 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/013.out b/tests/nvme/013.out index 10b78ec..a727170 100644 --- a/tests/nvme/013.out +++ b/tests/nvme/013.out @@ -1,3 +1,3 @@ Running nvme/013 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/014.out b/tests/nvme/014.out index c431864..a6f98a3 100644 --- a/tests/nvme/014.out +++ b/tests/nvme/014.out @@ -1,4 +1,4 @@ Running nvme/014 NVMe Flush: success -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/015.out b/tests/nvme/015.out index 829cf40..f854f0b 100644 --- a/tests/nvme/015.out +++ b/tests/nvme/015.out @@ -1,4 +1,4 @@ Running nvme/015 NVMe Flush: success -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/018.out b/tests/nvme/018.out index 6b0e814..94b937a 100644 --- a/tests/nvme/018.out +++ b/tests/nvme/018.out @@ -1,3 +1,3 @@ Running nvme/018 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/019.out b/tests/nvme/019.out index a52325f..710f15a 100644 --- a/tests/nvme/019.out +++ b/tests/nvme/019.out @@ -1,4 +1,4 @@ Running nvme/019 NVMe DSM: success -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/020.out b/tests/nvme/020.out index 9e293ab..61be280 100644 --- a/tests/nvme/020.out +++ b/tests/nvme/020.out @@ -1,4 +1,4 @@ Running nvme/020 NVMe DSM: success -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/033.out b/tests/nvme/033.out index eb508be..c9614cc 100644 --- a/tests/nvme/033.out +++ b/tests/nvme/033.out @@ -1,3 +1,3 @@ Running nvme/033 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/034.out b/tests/nvme/034.out index 0a7bd2f..e342d97 100644 --- a/tests/nvme/034.out +++ b/tests/nvme/034.out @@ -1,3 +1,3 @@ Running nvme/034 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/035.out b/tests/nvme/035.out index a602713..8cbdea4 100644 --- a/tests/nvme/035.out +++ b/tests/nvme/035.out @@ -1,3 +1,3 @@ Running nvme/035 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/036.out b/tests/nvme/036.out index d294f86..c14b0e1 100644 --- a/tests/nvme/036.out +++ b/tests/nvme/036.out @@ -1,3 +1,3 @@ Running nvme/036 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/041.out b/tests/nvme/041.out index efee74c..1d0a5cd 100644 --- a/tests/nvme/041.out +++ b/tests/nvme/041.out @@ -1,6 +1,6 @@ Running nvme/041 Test unauthenticated connection (should fail) -NQN:blktests-subsystem-1 disconnected 0 controller(s) +disconnected 0 controller(s) Test authenticated connection -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/042.out b/tests/nvme/042.out index 7d3d21a..e042095 100644 --- a/tests/nvme/042.out +++ b/tests/nvme/042.out @@ -1,16 +1,16 @@ Running nvme/042 Testing hmac 0 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing hmac 1 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing hmac 2 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing hmac 3 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing key length 32 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing key length 48 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing key length 64 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/043.out b/tests/nvme/043.out index 7419f91..a4a9a66 100644 --- a/tests/nvme/043.out +++ b/tests/nvme/043.out @@ -1,18 +1,18 @@ Running nvme/043 Testing hash hmac(sha256) -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing hash hmac(sha384) -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing hash hmac(sha512) -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing DH group ffdhe2048 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing DH group ffdhe3072 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing DH group ffdhe4096 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing DH group ffdhe6144 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Testing DH group ffdhe8192 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/044.out b/tests/nvme/044.out index 53fdbe1..58f296d 100644 --- a/tests/nvme/044.out +++ b/tests/nvme/044.out @@ -1,10 +1,10 @@ Running nvme/044 Test host authentication -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test invalid ctrl authentication (should fail) -NQN:blktests-subsystem-1 disconnected 0 controller(s) +disconnected 0 controller(s) Test valid ctrl authentication -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test invalid ctrl key (should fail) -NQN:blktests-subsystem-1 disconnected 0 controller(s) +disconnected 0 controller(s) Test complete diff --git a/tests/nvme/045.out b/tests/nvme/045.out index 48f7e6b..84a69ef 100644 --- a/tests/nvme/045.out +++ b/tests/nvme/045.out @@ -8,5 +8,5 @@ Change DH group to ffdhe8192 Re-authenticate with changed DH group Change hash to hmac(sha512) Re-authenticate with changed hash -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/048.out b/tests/nvme/048.out index 7f986ef..c1c0979 100644 --- a/tests/nvme/048.out +++ b/tests/nvme/048.out @@ -1,3 +1,3 @@ Running nvme/048 -NQN:blktests-subsystem-1 disconnected 1 controller(s) +disconnected 1 controller(s) Test complete diff --git a/tests/nvme/rc b/tests/nvme/rc index 4452274..34a144f 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -430,7 +430,8 @@ _nvme_disconnect_ctrl() { _nvme_disconnect_subsys() { local subsysnqn="$1" - nvme disconnect -n "${subsysnqn}" + nvme disconnect -n "${subsysnqn}" |& tee -a "$FULL" | + grep -o "disconnected.*" } _nvme_connect_subsys() {