From patchwork Thu Apr 11 11:12:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 13625755 Received: from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73149148319 for ; Thu, 11 Apr 2024 11:12:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.153.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712833962; cv=none; b=pPXG/zs4KYyivzdewDMPjbMcKdUhe2uocqEsQwTYk+dPOopPAU0XCuf0bQNlu33rUcKfeFwl37v7HjySZFyyr7/kILMArM6JnejFjIuVbY2BSXwVW0CXdyJWM10A56efvxHh7GMIcJ62jrUKKiiuOIHyk0brds1gqSXjpN+bSGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712833962; c=relaxed/simple; bh=xgvR0GKIV7o3R7lb/vi7v0gK/JTihRSWYckV0hgZ1YE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oiEme3y6zW4mxr2HpMzRRDRpCTurxXTR1ce21jAobxxyQCeLGzb1HlsJ+I8APIgELUpMGLMr2t+bS9UCscOKdV8/I0LV7dsE/WBVitlSK2FI3rc7vG7h2JTyu+z4TXtkyVedWw/E57MnZ/x9rSNLogorOWVUg/9ZIQh1ShikymA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=Jkw7MMBJ; arc=none smtp.client-ip=216.71.153.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="Jkw7MMBJ" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1712833960; x=1744369960; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xgvR0GKIV7o3R7lb/vi7v0gK/JTihRSWYckV0hgZ1YE=; b=Jkw7MMBJhymd/eft3epANi5y5NAHIl0t/eZDqcUVBf/G7mCimN3lLhl0 XXUowpa2aIhNmA4eUEJz8ifdpaahVELbFKS3tBcH6nNY/H0XEDnXqb2LY rCqv97bGeNltoJ8GJvQu6PiuG3xiTMCM8+LK68HGHG1CndL6zLp91weNR ZjVgQ9VKyzGzsUFAMXbYMb2NCLti3Ic34xXSHJdYMES6cj2mb1Ps0KNuy hDO10RbfanZsTkXQQvo8aN6UQjgAZ7PEqgY+WD8ANmX7LSY2W/HbNQl/5 /bNArt9eIjzNiBAAd4oG41I8fg5ksdlMVsrrnq+RPef/KEgogHZEDSBD0 A==; X-CSE-ConnectionGUID: 44mX/QCDQ0eN8m284tHC0g== X-CSE-MsgGUID: h55x2PYeTuCf2UzQSJGjpA== X-IronPort-AV: E=Sophos;i="6.07,193,1708358400"; d="scan'208";a="13579879" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 11 Apr 2024 19:12:37 +0800 IronPort-SDR: zwsXkk/ZTrUbbVwc+rZD8URRlZ/gAPYjIIzIH9Z5b26CmZimwcbVkSUYmnguH/oGfSmFZNblho rX+zjZ03EF6A== 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; 11 Apr 2024 03:15:22 -0700 IronPort-SDR: +yeKmO0zfSjAsJ9NUSgeLzRdLWyLawKV4QW3/pywGNCPB7S8udwsMci9LlC/Pv74niN7btAZAq B6V69VaICwAg== WDCIronportException: Internal Received: from unknown (HELO shindev.ssa.fujisawa.hgst.com) ([10.149.66.30]) by uls-op-cesaip02.wdc.com with ESMTP; 11 Apr 2024 04:12:37 -0700 From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org Cc: linux-nvme@lists.infradead.org, Daniel Wagner , Chaitanya Kulkarni Subject: [PATCH blktests 08/11] nvme/{002-031,033-038,040-045,047,048}: support NMVET_TR_TYPES Date: Thu, 11 Apr 2024 20:12:25 +0900 Message-ID: <20240411111228.2290407-9-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411111228.2290407-1-shinichiro.kawasaki@wdc.com> References: <20240411111228.2290407-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 Add set_conditions() hook and call _set_nvme_trtype() so that the test cases are repeated for NMVET_TR_TYPES. Signed-off-by: Shin'ichiro Kawasaki --- tests/nvme/002 | 4 ++++ tests/nvme/003 | 4 ++++ tests/nvme/004 | 4 ++++ tests/nvme/005 | 4 ++++ tests/nvme/006 | 4 ++++ tests/nvme/007 | 4 ++++ tests/nvme/008 | 4 ++++ tests/nvme/009 | 4 ++++ tests/nvme/010 | 4 ++++ tests/nvme/011 | 4 ++++ tests/nvme/012 | 4 ++++ tests/nvme/013 | 4 ++++ tests/nvme/014 | 4 ++++ tests/nvme/015 | 4 ++++ tests/nvme/016 | 4 ++++ tests/nvme/017 | 4 ++++ tests/nvme/018 | 4 ++++ tests/nvme/019 | 4 ++++ tests/nvme/020 | 4 ++++ tests/nvme/021 | 4 ++++ tests/nvme/022 | 4 ++++ tests/nvme/023 | 4 ++++ tests/nvme/024 | 4 ++++ tests/nvme/025 | 4 ++++ tests/nvme/026 | 4 ++++ tests/nvme/027 | 4 ++++ tests/nvme/028 | 4 ++++ tests/nvme/029 | 4 ++++ tests/nvme/030 | 4 ++++ tests/nvme/031 | 4 ++++ tests/nvme/033 | 4 ++++ tests/nvme/034 | 4 ++++ tests/nvme/035 | 4 ++++ tests/nvme/036 | 4 ++++ tests/nvme/037 | 4 ++++ tests/nvme/038 | 4 ++++ tests/nvme/040 | 4 ++++ tests/nvme/041 | 3 +++ tests/nvme/042 | 3 +++ tests/nvme/043 | 3 +++ tests/nvme/044 | 3 +++ tests/nvme/045 | 3 +++ tests/nvme/047 | 4 ++++ tests/nvme/048 | 4 ++++ 44 files changed, 171 insertions(+) diff --git a/tests/nvme/002 b/tests/nvme/002 index 6b84848..f613c78 100755 --- a/tests/nvme/002 +++ b/tests/nvme/002 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_loop } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/003 b/tests/nvme/003 index be6b4e1..b70f46a 100755 --- a/tests/nvme/003 +++ b/tests/nvme/003 @@ -17,6 +17,10 @@ requires() { _have_writeable_kmsg } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/004 b/tests/nvme/004 index b751746..a6b4949 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -17,6 +17,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/005 b/tests/nvme/005 index f17174d..66c12fd 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -16,6 +16,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/006 b/tests/nvme/006 index d85f64b..a0c4096 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/007 b/tests/nvme/007 index b142435..3b16d5f 100755 --- a/tests/nvme/007 +++ b/tests/nvme/007 @@ -14,6 +14,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/008 b/tests/nvme/008 index a5d0681..1877d8a 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/009 b/tests/nvme/009 index a1655d4..d7b1307 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -14,6 +14,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/010 b/tests/nvme/010 index 6feb391..34914a7 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/011 b/tests/nvme/011 index 4810459..bd29129 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/012 b/tests/nvme/012 index 64cb6ec..e06bf8d 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -19,6 +19,10 @@ requires() { _require_nvme_test_img_size 350m } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/013 b/tests/nvme/013 index 24fc910..91da498 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -18,6 +18,10 @@ requires() { _require_nvme_test_img_size 350m } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/014 b/tests/nvme/014 index 839b91f..ff0ebfb 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/015 b/tests/nvme/015 index f0621da..b5ec10c 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/016 b/tests/nvme/016 index 908abbd..a65cffd 100755 --- a/tests/nvme/016 +++ b/tests/nvme/016 @@ -13,6 +13,10 @@ requires() { _require_nvme_trtype_is_loop } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/017 b/tests/nvme/017 index c8d9b32..9410cdc 100755 --- a/tests/nvme/017 +++ b/tests/nvme/017 @@ -13,6 +13,10 @@ requires() { _require_nvme_trtype_is_loop } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/018 b/tests/nvme/018 index b8c1635..5b0f57b 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -16,6 +16,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/019 b/tests/nvme/019 index 1cd5378..31020d9 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/020 b/tests/nvme/020 index 0364c4e..4993e36 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -14,6 +14,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/021 b/tests/nvme/021 index 7ee1f07..270d90e 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/022 b/tests/nvme/022 index 7ce33dd..adaa765 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/023 b/tests/nvme/023 index d8f17ae..da99406 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/024 b/tests/nvme/024 index a512194..cab1818 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/025 b/tests/nvme/025 index 3f9a615..224492b 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/026 b/tests/nvme/026 index 28fd151..6ee6a51 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/027 b/tests/nvme/027 index 053fd58..a63e42b 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/028 b/tests/nvme/028 index 9f4a905..65c52a9 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/029 b/tests/nvme/029 index 559c0b4..10acc58 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -16,6 +16,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test_user_io() { local disk="$1" diff --git a/tests/nvme/030 b/tests/nvme/030 index 9251e17..b1ed8bc 100755 --- a/tests/nvme/030 +++ b/tests/nvme/030 @@ -15,6 +15,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/031 b/tests/nvme/031 index 0bf823d..b98630a 100755 --- a/tests/nvme/031 +++ b/tests/nvme/031 @@ -23,6 +23,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/033 b/tests/nvme/033 index 70a73b8..7a69b94 100755 --- a/tests/nvme/033 +++ b/tests/nvme/033 @@ -13,6 +13,10 @@ requires() { _have_kernel_option NVME_TARGET_PASSTHRU } +set_conditions() { + _set_nvme_trtype "$@" +} + nvme_info() { local ns=$1 diff --git a/tests/nvme/034 b/tests/nvme/034 index 409324a..522ffe3 100755 --- a/tests/nvme/034 +++ b/tests/nvme/034 @@ -14,6 +14,10 @@ requires() { _have_fio } +set_conditions() { + _set_nvme_trtype "$@" +} + test_device() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/035 b/tests/nvme/035 index ecf6b72..cfca5fd 100755 --- a/tests/nvme/035 +++ b/tests/nvme/035 @@ -20,6 +20,10 @@ device_requires() { _require_test_dev_size "${nvme_img_size}" } +set_conditions() { + _set_nvme_trtype "$@" +} + test_device() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/036 b/tests/nvme/036 index 36ea792..ef6c29d 100755 --- a/tests/nvme/036 +++ b/tests/nvme/036 @@ -13,6 +13,10 @@ requires() { _have_kernel_option NVME_TARGET_PASSTHRU } +set_conditions() { + _set_nvme_trtype "$@" +} + test_device() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/037 b/tests/nvme/037 index 66d6656..ef7ac59 100755 --- a/tests/nvme/037 +++ b/tests/nvme/037 @@ -12,6 +12,10 @@ requires() { _have_kernel_option NVME_TARGET_PASSTHRU } +set_conditions() { + _set_nvme_trtype "$@" +} + test_device() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/038 b/tests/nvme/038 index 007b5f4..8435415 100755 --- a/tests/nvme/038 +++ b/tests/nvme/038 @@ -18,6 +18,10 @@ requires() { _nvme_requires } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/040 b/tests/nvme/040 index bb9ed5e..9536f35 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -16,6 +16,10 @@ requires() { _require_nvme_trtype_is_fabrics } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/041 b/tests/nvme/041 index f1fa00c..aa44f04 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -19,6 +19,9 @@ requires() { _require_nvme_cli_auth } +set_conditions() { + _set_nvme_trtype "$@" +} test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/042 b/tests/nvme/042 index a9e79c6..70c9056 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -19,6 +19,9 @@ requires() { _require_nvme_cli_auth } +set_conditions() { + _set_nvme_trtype "$@" +} test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/043 b/tests/nvme/043 index 4589423..cf99865 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -20,6 +20,9 @@ requires() { _have_driver dh_generic } +set_conditions() { + _set_nvme_trtype "$@" +} test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/044 b/tests/nvme/044 index 8b88590..9ed46c9 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -20,6 +20,9 @@ requires() { _have_driver dh_generic } +set_conditions() { + _set_nvme_trtype "$@" +} test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/045 b/tests/nvme/045 index f387ead..be81316 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -21,6 +21,9 @@ requires() { _have_driver dh_generic } +set_conditions() { + _set_nvme_trtype "$@" +} test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/047 b/tests/nvme/047 index 9bbe84d..1ab68f8 100755 --- a/tests/nvme/047 +++ b/tests/nvme/047 @@ -17,6 +17,10 @@ requires() { _have_kver 4 21 } +set_conditions() { + _set_nvme_trtype "$@" +} + test() { echo "Running ${TEST_NAME}" diff --git a/tests/nvme/048 b/tests/nvme/048 index 0b299a9..bd41fae 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -15,6 +15,10 @@ requires() { _require_min_cpus 2 } +set_conditions() { + _set_nvme_trtype "$@" +} + nvmf_wait_for_state() { local def_state_timeout=5 local subsys_name="$1"