From patchwork Wed Sep 11 08:53:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 11140673 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 66FDC14ED for ; Wed, 11 Sep 2019 08:54:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FEDD21D7D for ; Wed, 11 Sep 2019 08:54:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726765AbfIKIyD (ORCPT ); Wed, 11 Sep 2019 04:54:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45416 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbfIKIyD (ORCPT ); Wed, 11 Sep 2019 04:54:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5009491761; Wed, 11 Sep 2019 08:54:03 +0000 (UTC) Received: from dhcp-12-105.nay.redhat.com (dhcp-12-105.nay.redhat.com [10.66.12.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id D35EE5DD78; Wed, 11 Sep 2019 08:53:58 +0000 (UTC) From: Yi Zhang To: linux-block@vger.kernel.org Cc: osandov@osandov.com, Chaitanya.Kulkarni@wdc.com, ming.lei@redhat.com Subject: [PATCH V3 blktests] nvme: Add new test case about nvme rescan/reset/remove during IO Date: Wed, 11 Sep 2019 16:53:43 +0800 Message-Id: <20190911085343.32355-1-yi.zhang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 11 Sep 2019 08:54:03 +0000 (UTC) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Add one test to cover NVMe SSD rescan/reset/remove operation during IO, the steps found several issues during my previous testing, check them here: http://lists.infradead.org/pipermail/linux-nvme/2017-February/008358.html http://lists.infradead.org/pipermail/linux-nvme/2017-May/010259.html Signed-off-by: Yi Zhang Reviewed-by: Chaitanya Kulkarni Reviewed-by: Ming Lei --- changes from v2: - add check_sysfs function for rescan/reset/remove operation - declare all local variables at the start - alignment fix - add udevadm settle - change to QUICK=1 changes from v1: - add variable for "/sys/bus/pci/devices/${pdev}" - add kill $!; wait; for background fio - add rescan/reset/remove sysfs node check - add loop checking for nvme reinitialized --- --- tests/nvme/031 | 75 ++++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/031.out | 2 ++ 2 files changed, 77 insertions(+) create mode 100755 tests/nvme/031 create mode 100644 tests/nvme/031.out diff --git a/tests/nvme/031 b/tests/nvme/031 new file mode 100755 index 0000000..31db8a5 --- /dev/null +++ b/tests/nvme/031 @@ -0,0 +1,75 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2019 Yi Zhang +# +# Test nvme pci adapter rescan/reset/remove operation during I/O +# +# Regression test for bellow two commits: +# http://lists.infradead.org/pipermail/linux-nvme/2017-May/010367.html +# 986f75c876db nvme: avoid to use blk_mq_abort_requeue_list() +# 806f026f9b90 nvme: use blk_mq_start_hw_queues() in nvme_kill_queues() + +. tests/nvme/rc + +DESCRIPTION="test nvme pci adapter rescan/reset/remove during I/O" +QUICK=1 + +requires() { + _have_fio +} + +device_requires() { + _test_dev_is_nvme +} + +check_sysfs() +{ + local sysfs_attr="$sysfs/$1" + + if [[ -f "$sysfs_attr" ]]; then + echo 1 > "${sysfs_attr}" + else + # QEMU VM doesn't have the "reset" attribute, skip it + [[ "$sysfs_attr" == *reset ]] && return + echo "${sysfs_attr} doesn't exist!" + fi +} + +test_device() { + echo "Running ${TEST_NAME}" + + local sysfs + local m + + pdev="$(_get_pci_dev_from_blkdev)" + sysfs="/sys/bus/pci/devices/${pdev}" + + # start fio job + _run_fio_rand_io --filename="$TEST_DEV" --size=1g \ + --group_reporting &> /dev/null & + + sleep 5 + + # do rescan/reset/remove operation + for i in rescan reset remove; do + check_sysfs $i + done + + { kill $!; wait; } &> /dev/null + + echo 1 > /sys/bus/pci/rescan + + # wait nvme reinitialized + for ((m = 0; m < 10; m++)); do + if [[ -b "${TEST_DEV}" ]]; then + break + fi + sleep 0.5 + done + if (( m > 9 )); then + echo "nvme still not reinitialized after 5 seconds!" + fi + udevadm settle + + echo "Test complete" +} diff --git a/tests/nvme/031.out b/tests/nvme/031.out new file mode 100644 index 0000000..ae902bd --- /dev/null +++ b/tests/nvme/031.out @@ -0,0 +1,2 @@ +Running nvme/031 +Test complete