nvme: add udevadm settle before disconnecting
Sagi Grimberg
maintainerPATCH 1/2 nvme: add udevadm settle before disconnecting
otherwise we can see some I/O failures as udev didn't get enough time to do its thing.
--- tests/nvme/008 | 2 ++ tests/nvme/009 | 2 ++ 2 files changed, 4 insertions(+)
tests/nvme/008 +2 -0
@@ -41,6 +41,8 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" + udevadm settle + nvme disconnect -n "${subsys_name}" _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
tests/nvme/009 +2 -0
@@ -37,6 +37,8 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" + udevadm settle + nvme disconnect -n "${subsys_name}" _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
Signature · 1 line
2.17.1
Sagi Grimberg
maintainerPATCH 2/2 nvme: test out-of-range I/O access
Test that we correctly fail an out-of-range access with a proper NVMe status code.
--- tests/nvme/018 | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/018.out | 6 +++++ 2 files changed, 64 insertions(+) create mode 100755 tests/nvme/018 create mode 100755 tests/nvme/018.out
tests/nvme/018 new file +58 -0
@@ -0,0 +1,58 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2018 Sagi Grimberg +# +# Test NVMe out of range access. + +. tests/nvme/rc + +DESCRIPTION="unit test NVMe-oF out of range access" +QUICK=1 + +requires() { + _have_program nvme && _have_modules nvme-loop && _have_modules loop && \ + _have_configfs +} + +test() { + echo "Running ${TEST_NAME}" + + modprobe nvmet + modprobe nvme-loop + + local port + local nvmedev + local file_path="$TMPDIR/img" + local subsys_name="blktests-subsystem-1" + + truncate -s 1G "${file_path}" + + _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + port="$(_create_nvmet_port "loop")" + _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + + nvme connect -t loop -n "${subsys_name}" + + nvmedev="$(_find_nvme_loop_dev)" + cat "/sys/block/${nvmedev}n1/uuid" + cat "/sys/block/${nvmedev}n1/wwid" + + sectors=$(blockdev --getsz /dev/${nvmedev}n1) + bs=$(blockdev --getbsz /dev/${nvmedev}n1) + + nvme read "/dev/${nvmedev}n1" -s $sectors -c 0 -z $bs + if [[ ! $? ]]; then + echo "Sucessfully read out of device lba range" + fi + + nvme disconnect -n "${subsys_name}" + + _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" + _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_port "${port}" + + rm "${file_path}" + + echo "Test complete" +}
tests/nvme/018.out new file +6 -0
@@ -0,0 +1,6 @@ +Running nvme/018 +91fdba0d-f87b-4c25-b80f-db7be1418b9e +uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e +read:CAP_EXCEEDED: The execution of the command has caused the capacity of the namespace to be exceeded(6081) +NQN:blktests-subsystem-1 disconnected 1 controller(s) +Test complete
Signature · 1 line
2.17.1
PATCH 2/2 nvme: test out-of-range I/O access
Quoted 17 lines · Sagi Grimberg
Test that we correctly fail an out-of-range access with a proper NVMe status code.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>--- tests/nvme/018 | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/018.out | 6 +++++ 2 files changed, 64 insertions(+)create mode 100755 tests/nvme/018
create mode 100755 tests/nvme/018.outtests/nvme/018 new file +0
-0
tests/nvme/018 line 9
Quoted 9 lines
tests/nvme/018 new file +9
-0@@ -0,0 +1,58 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2018 Sagi Grimberg +# +# Test NVMe out of range access. + +. tests/nvme/rc + +DESCRIPTION="unit test NVMe-oF out of range access"
it will be great if you can specify above back-end type (bdev/file)
tests/nvme/018 line 14
Quoted 5 lines
tests/nvme/018 new file +5
-0+QUICK=1 + +requires() { + _have_program nvme && _have_modules nvme-loop && _have_modules loop && \ + _have_configfs
need to check for the blockdev.
Quoted 22 lines
tests/nvme/018 new file +22
-0+} + +test() { + echo "Running ${TEST_NAME}" + + modprobe nvmet + modprobe nvme-loop + + local port + local nvmedev + local file_path="$TMPDIR/img" + local subsys_name="blktests-subsystem-1" + + truncate -s 1G "${file_path}" + + _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + port="$(_create_nvmet_port "loop")" + _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + + nvme connect -t loop -n "${subsys_name}" +
tests/nvme/018 line 46
Quoted 10 lines
tests/nvme/018 new file +10
-0+ nvmedev="$(_find_nvme_loop_dev)" + cat "/sys/block/${nvmedev}n1/uuid" + cat "/sys/block/${nvmedev}n1/wwid" + + sectors=$(blockdev --getsz /dev/${nvmedev}n1) + bs=$(blockdev --getbsz /dev/${nvmedev}n1) + + nvme read "/dev/${nvmedev}n1" -s $sectors -c 0 -z $bs + if [[ ! $? ]]; then + echo "Sucessfully read out of device lba range"
Can we prefix this message with error as we should get an error for out of range ?
Also s/Sucessfully/Successfully/.
Quoted 25 lines
tests/nvme/018 new file +12
-0+ fi + + nvme disconnect -n "${subsys_name}" + + _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" + _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_port "${port}" + + rm "${file_path}" + + echo "Test complete" +}tests/nvme/018.out new file +6
-0@@ -0,0 +1,6 @@ +Running nvme/018 +91fdba0d-f87b-4c25-b80f-db7be1418b9e +uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e +read:CAP_EXCEEDED: The execution of the command has caused the capacity of the namespace to be exceeded(6081) +NQN:blktests-subsystem-1 disconnected 1 controller(s) +Test complete
Sagi Grimberg
maintainerPATCH 2/2 nvme: test out-of-range I/O access
Quoted 3 lines
Quoted 2 lines
+DESCRIPTION="unit test NVMe-oF out of range access"
it will be great if you can specify above back-end type (bdev/file)
OK
Quoted 7 lines
tests/nvme/018 line 14
Quoted 5 lines
tests/nvme/018 new file +5
-0+QUICK=1 + +requires() { + _have_program nvme && _have_modules nvme-loop && _have_modules loop && \ + _have_configfsneed to check for the blockdev.
Other tests use blockdev and don't check for it..
Quoted 35 lines
Quoted 22 lines
tests/nvme/018 new file +22
-0+} + +test() { + echo "Running ${TEST_NAME}" + + modprobe nvmet + modprobe nvme-loop + + local port + local nvmedev + local file_path="$TMPDIR/img" + local subsys_name="blktests-subsystem-1" + + truncate -s 1G "${file_path}" + + _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + port="$(_create_nvmet_port "loop")" + _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + + nvme connect -t loop -n "${subsys_name}" +tests/nvme/018 line 46
Quoted 10 lines
tests/nvme/018 new file +10
-0+ nvmedev="$(_find_nvme_loop_dev)" + cat "/sys/block/${nvmedev}n1/uuid" + cat "/sys/block/${nvmedev}n1/wwid" + + sectors=$(blockdev --getsz /dev/${nvmedev}n1) + bs=$(blockdev --getbsz /dev/${nvmedev}n1) + + nvme read "/dev/${nvmedev}n1" -s $sectors -c 0 -z $bs + if [[ ! $? ]]; then + echo "Sucessfully read out of device lba range"Can we prefix this message with error as we should get an error for out of range ?
Quoted 1 line
Also s/Sucessfully/Successfully/.
Will do.
PATCH 2/2 nvme: test out-of-range I/O access
Quoted 14 lines · Sagi Grimberg
Quoted 3 lines
Quoted 2 lines
+DESCRIPTION="unit test NVMe-oF out of range access"
it will be great if you can specify above back-end type (bdev/file)
OK
Quoted 7 lines
tests/nvme/018 line 14
Quoted 5 lines
tests/nvme/018 new file +5
-0+QUICK=1 + +requires() { + _have_program nvme && _have_modules nvme-loop && _have_modules loop && \ + _have_configfsneed to check for the blockdev.
Quoted 1 line
Other tests use blockdev and don't check for it..
Yes, while looking at the code, I've also observed we don't check for the truncate as well. At least for the NVMe I'll send a patch-series to fix that for all the other tests.
Quoted 40 lines
Quoted 36 lines
Quoted 23 lines
tests/nvme/018 new file +22
-0+} + +test() { + echo "Running ${TEST_NAME}" + + modprobe nvmet + modprobe nvme-loop + + local port + local nvmedev + local file_path="$TMPDIR/img" + local subsys_name="blktests-subsystem-1" + + truncate -s 1G "${file_path}" + + _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + port="$(_create_nvmet_port "loop")" + _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + + nvme connect -t loop -n "${subsys_name}" +tests/nvme/018 line 46
Quoted 10 lines
tests/nvme/018 new file +10
-0+ nvmedev="$(_find_nvme_loop_dev)" + cat "/sys/block/${nvmedev}n1/uuid" + cat "/sys/block/${nvmedev}n1/wwid" + + sectors=$(blockdev --getsz /dev/${nvmedev}n1) + bs=$(blockdev --getbsz /dev/${nvmedev}n1) + + nvme read "/dev/${nvmedev}n1" -s $sectors -c 0 -z $bs + if [[ ! $? ]]; then + echo "Sucessfully read out of device lba range"Can we prefix this message with error as we should get an error for out of range ?
Quoted 1 line
Also s/Sucessfully/Successfully/.
Will do.
PATCH 2/2 nvme: test out-of-range I/O access
Quoted 15 lines · Chaitanya Kulkarni
Quoted 14 lines · Sagi Grimberg
Quoted 3 lines
Quoted 2 lines
+DESCRIPTION="unit test NVMe-oF out of range access"
it will be great if you can specify above back-end type (bdev/file)
OK
Quoted 7 lines
tests/nvme/018 line 14
Quoted 5 lines
tests/nvme/018 new file +5
-0+QUICK=1 + +requires() { + _have_program nvme && _have_modules nvme-loop && _have_modules loop && \ + _have_configfsneed to check for the blockdev.
Quoted 5 lines
Quoted 1 line
Other tests use blockdev and don't check for it..
Yes, while looking at the code, I've also observed we don't check for the truncate as well. At least for the NVMe I'll send a patch-series to fix that for all the other tests.
Truncate is in coreutils and IIRC util-linux and coreutils are the olny dependency blktests has, so this should be ok.
Signature · 6 lines
Johannes Thumshirn SUSE Labs Filesystems jthumshirn at suse.de +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg GF: Felix Imend?rffer, Jane Smithard, Graham Norton HRB 21284 (AG N?rnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
PATCH 2/2 nvme: test out-of-range I/O access
In reply to Sagi GrimbergQuoted 17 lines · Sagi Grimberg
Test that we correctly fail an out-of-range access with a proper NVMe status code.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>--- tests/nvme/018 | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/018.out | 6 +++++ 2 files changed, 64 insertions(+) create mode 100755 tests/nvme/018 create mode 100755 tests/nvme/018.outtests/nvme/018 new file +0
-0
tests/nvme/018 line 5
Quoted 5 lines
tests/nvme/018 new file +5
-0@@ -0,0 +1,58 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2018 Sagi Grimberg +# +# Test NVMe out of range access.
Is this a test for a specific kernel commit? It fails on 5.0.
Sagi Grimberg
maintainerPATCH 2/2 nvme: test out-of-range I/O access
Quoted 12 lines
Quoted 12 lines
Test that we correctly fail an out-of-range access with a proper NVMe status code.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>--- tests/nvme/018 | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/018.out | 6 +++++ 2 files changed, 64 insertions(+)create mode 100755 tests/nvme/018
create mode 100755 tests/nvme/018.out
Quoted 13 lines
tests/nvme/018 line 5
Quoted 11 lines
tests/nvme/018 new file +5
-0@@ -0,0 +1,58 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2018 Sagi Grimberg +# +# Test NVMe out of range access.Is this a test for a specific kernel commit? It fails on 5.0.
It failed when nvmet file backend was introduced but fixed in one of the -rc cycles. Thought it'd be worth keeping the test though...
I'll send v2
PATCH 2/2 nvme: test out-of-range I/O access
Quoted 26 lines · Sagi Grimberg
Quoted 12 lines
Quoted 12 lines
Test that we correctly fail an out-of-range access with a proper NVMe status code.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>--- tests/nvme/018 | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/018.out | 6 +++++ 2 files changed, 64 insertions(+)create mode 100755 tests/nvme/018
create mode 100755 tests/nvme/018.outQuoted 13 lines
tests/nvme/018 line 5
Quoted 11 lines
tests/nvme/018 new file +5
-0@@ -0,0 +1,58 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2018 Sagi Grimberg +# +# Test NVMe out of range access.Is this a test for a specific kernel commit? It fails on 5.0.
Quoted 2 lines
It failed when nvmet file backend was introduced but fixed in one of the -rc cycles. Thought it'd be worth keeping the test though...
Do you know which patch fixed it, so I can add a reference to it in the test?
Sagi Grimberg
maintainerPATCH 2/2 nvme: test out-of-range I/O access
Quoted 3 lines
Do you know which patch fixed it, so I can add a reference to it in the test?
commit 9c891c139894ce2ec0ca585a00e0bec5e6b4ccab
Author: Sagi Grimberg <sagi at grimberg.me> Date: Wed Jul 11 16:13:04 2018 +0300
nvmet: check fileio lba range access boundaries
Fail out-of-bounds with a proper status code.
PATCH 1/2 nvme: add udevadm settle before disconnecting
In reply to Sagi GrimbergQuoted 28 lines · Sagi Grimberg
otherwise we can see some I/O failures as udev didn't get enough time to do its thing.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>--- tests/nvme/008 | 2 ++ tests/nvme/009 | 2 ++ 2 files changed, 4 insertions(+)tests/nvme/008 +2
-0@@ -41,6 +41,8 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" + udevadm settle + nvme disconnect -n "${subsys_name}" _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"tests/nvme/009 +0
-0
tests/nvme/009 test() { · line 44
Quoted 8 lines
tests/nvme/009 +2
-0@@ -37,6 +37,8 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" + udevadm settle + nvme disconnect -n "${subsys_name}" _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
Looks good.
Omar Sandoval
AppliedPATCH 1/2 nvme: add udevadm settle before disconnecting
In reply to Sagi GrimbergQuoted 2 lines · Sagi Grimberg
otherwise we can see some I/O failures as udev didn't get enough time to do its thing.
Thanks, applied this one. I'll wait for your response on patch 2.
Quoted 35 lines
Signed-off-by Sagi Grimberg <sagi at grimberg.me>--- tests/nvme/008 | 2 ++ tests/nvme/009 | 2 ++ 2 files changed, 4 insertions(+)tests/nvme/008 +2
-0@@ -41,6 +41,8 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" + udevadm settle + nvme disconnect -n "${subsys_name}" _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"tests/nvme/009 +2
-0@@ -37,6 +37,8 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" + udevadm settle + nvme disconnect -n "${subsys_name}" _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"Signature · 1 line
2.17.1