Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp469255rwr; Wed, 3 May 2023 01:05:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7CC3iVdHeBqa4xuFmUQjDz2pS1EhzpsPMYNtXrV9LXkuGu4d3ZUf3vcsmmPF0blmThYkYT X-Received: by 2002:a17:902:ecca:b0:1a9:a3b3:f935 with SMTP id a10-20020a170902ecca00b001a9a3b3f935mr1403062plh.57.1683101130582; Wed, 03 May 2023 01:05:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683101130; cv=none; d=google.com; s=arc-20160816; b=vIO8h3VtTwPPpYhPDBMDp4MLNfAI4b6AKLyeIqYM8ifLpaz3XO87yE6EQzf3MhXUyi vAkjLUrMukVqe38lVjQiCagyLcJZxjzsEBblRV7WRArYg+lul3Pz5Xi9Cj0pCJk8/MuI 9eQ2WjC+lTy38EZzYBSTaw7QLp+k4LMY94rpilj/1oREtFIwEoSfogqJjqH8lFyPADfb jqarh7KQ9KPQ6kaWV3cd5Rfp7rjlTCnZIivDhZ8icovSaeEaWXdkJy1UaasYJBKmkSCQ XCUiDdy0e46yx1IyQQIRkrFZoAXmxeLXw2LoEWSQgU2n86VrhsEOly43bjQf+Ne3Wnse s9mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=OzuqS/q1GW99bRz+TiMRmoluWTJwGKSXphN+rPD19yw=; b=B0V1csMpZofUKj9IMcofCB7hWDffj/FFPJ0Z7TCQzOaUhq2CqW3pB/Bbk5kNPNPDNQ 0SjUqR/3qjgf+mlAVe2tRuN6KttfTQAEN3P1KIV326TTXfpM14VeYcrtxV2/gFctQiGZ 9Us7CUOalKUbP8jyufyGn3KdGhp6QpZBbWdOoA8CQcMfElf2ylZlmx9GEvs/jQAy8q5z K8q+jq0SzMopFe1mV0fGB631+Ti/ukCCxVdPaIHtGWz7ctmSumORx/st1g5NWXYMcnkP Jx3+SB2Sf/49Pe809/BKSP+XyscckcImWiCyNLty+/VTMPxqKP4yL7vaks6Ll8w0sXoW uDNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=necyGC8L; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m10-20020a170902db0a00b001a97fd670d5si23883521plx.367.2023.05.03.01.05.16; Wed, 03 May 2023 01:05:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=necyGC8L; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229836AbjECIEL (ORCPT + 99 others); Wed, 3 May 2023 04:04:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229705AbjECIDU (ORCPT ); Wed, 3 May 2023 04:03:20 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6082B44A1; Wed, 3 May 2023 01:03:15 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0CEC8200AB; Wed, 3 May 2023 08:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1683100994; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OzuqS/q1GW99bRz+TiMRmoluWTJwGKSXphN+rPD19yw=; b=necyGC8Lp3ANc59nThbk+iHT+whUB60sZSyHP1cucceZByUWse4pJcn0ACJlerLUc594pl e2HjtnvLqgeDtw6EkOCH3dQawiTfltzudwzr6xOsvXZRrhn8DGdpoR83raRes9dTw7pi9k eBPOR4iwxG87yOETVS9MIImOvjEeGns= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1683100994; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OzuqS/q1GW99bRz+TiMRmoluWTJwGKSXphN+rPD19yw=; b=EzwvqGbiI2OTo2gDqCkWbAcDMnQqFVardkYauejOJov7/K2b0HS4B8MRsnr3qHCkgRuuzO SpcbJK6Cd2pM2fAQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F04B41331F; Wed, 3 May 2023 08:03:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id NgBWOkEVUmQ9YgAAMHmgww (envelope-from ); Wed, 03 May 2023 08:03:13 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Hannes Reinecke , Daniel Wagner Subject: [PATCH blktests v3 07/12] nvme: Make test image size configurable Date: Wed, 3 May 2023 10:02:53 +0200 Message-Id: <20230503080258.14525-8-dwagner@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230503080258.14525-1-dwagner@suse.de> References: <20230503080258.14525-1-dwagner@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The reduce the overall runtime of the testsuite by making the default size of the test image small. For verification jobs, the default can be overwriten via the newly introduced nvme_img_size environment variable. Reviewed-by: Hannes Reinecke Signed-off-by: Daniel Wagner --- Documentation/running-tests.md | 3 +++ tests/nvme/004 | 2 +- tests/nvme/005 | 2 +- tests/nvme/006 | 2 +- tests/nvme/007 | 2 +- tests/nvme/008 | 2 +- tests/nvme/009 | 2 +- tests/nvme/010 | 5 +++-- tests/nvme/011 | 5 +++-- tests/nvme/012 | 2 +- tests/nvme/013 | 2 +- tests/nvme/014 | 2 +- tests/nvme/015 | 2 +- tests/nvme/017 | 2 +- tests/nvme/018 | 2 +- tests/nvme/019 | 2 +- tests/nvme/020 | 2 +- tests/nvme/021 | 2 +- tests/nvme/022 | 2 +- tests/nvme/023 | 2 +- tests/nvme/024 | 2 +- tests/nvme/025 | 2 +- tests/nvme/026 | 2 +- tests/nvme/027 | 2 +- tests/nvme/028 | 2 +- tests/nvme/029 | 3 ++- tests/nvme/031 | 2 +- tests/nvme/032 | 1 - tests/nvme/034 | 2 +- tests/nvme/035 | 4 ++-- tests/nvme/040 | 2 +- tests/nvme/041 | 2 +- tests/nvme/042 | 2 +- tests/nvme/043 | 2 +- tests/nvme/044 | 2 +- tests/nvme/045 | 2 +- tests/nvme/047 | 2 +- tests/nvme/048 | 2 +- tests/nvme/rc | 1 + 39 files changed, 46 insertions(+), 40 deletions(-) diff --git a/Documentation/running-tests.md b/Documentation/running-tests.md index 7e827fba7ac0..6b34a253fd97 100644 --- a/Documentation/running-tests.md +++ b/Documentation/running-tests.md @@ -104,6 +104,9 @@ The NVMe tests can be additionally parameterized via environment variables. - nvme_tr_type: 'loop' (default), 'tcp', 'rdma' and 'fc' Run the tests with the given transport. +- nvme_img_size: '1G' (default) + Run the tests with given image size in bytes. 'm' and 'g' postfix + are supported. ### Running nvme-rdma nvmeof-mp srp tests diff --git a/tests/nvme/004 b/tests/nvme/004 index 9dda538b1ac0..cab98ff44326 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -25,7 +25,7 @@ test() { local port port="$(_create_nvmet_port "${nvme_trtype}")" - truncate -s 1G "$TMPDIR/img" + truncate -s "${nvme_img_size}" "$TMPDIR/img" local loop_dev loop_dev="$(losetup -f --show "$TMPDIR/img")" diff --git a/tests/nvme/005 b/tests/nvme/005 index de567a74a891..8e15a13f3794 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -24,7 +24,7 @@ test() { local port port="$(_create_nvmet_port "${nvme_trtype}")" - truncate -s 1G "$TMPDIR/img" + truncate -s "${nvme_img_size}" "$TMPDIR/img" local loop_dev loop_dev="$(losetup -f --show "$TMPDIR/img")" diff --git a/tests/nvme/006 b/tests/nvme/006 index d993861c06ba..ea0db93791a7 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -24,7 +24,7 @@ test() { _setup_nvmet - truncate -s 1G "$TMPDIR/img" + truncate -s "${nvme_img_size}" "$TMPDIR/img" loop_dev="$(losetup -f --show "$TMPDIR/img")" diff --git a/tests/nvme/007 b/tests/nvme/007 index d53100f3ff7b..243a79f5a254 100755 --- a/tests/nvme/007 +++ b/tests/nvme/007 @@ -25,7 +25,7 @@ test() { file_path="${TMPDIR}/img" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/008 b/tests/nvme/008 index 5568fe46e463..5abc4240ca46 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -26,7 +26,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" diff --git a/tests/nvme/009 b/tests/nvme/009 index 2814c79164ee..491d3c809ab0 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -24,7 +24,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/010 b/tests/nvme/010 index b7b1d5188e9b..805f80d40620 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -26,7 +26,7 @@ test() { local file_path="${TMPDIR}/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" @@ -41,7 +41,8 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" - _run_fio_verify_io --size=950m --filename="/dev/${nvmedev}n1" + _run_fio_verify_io --size=${nvme_img_size} \ + --filename="/dev/${nvmedev}n1" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/011 b/tests/nvme/011 index 4bfe9af084e4..da8cbac11124 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -26,7 +26,7 @@ test() { local file_path="${TMPDIR}/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -39,7 +39,8 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" - _run_fio_verify_io --size=950m --filename="/dev/${nvmedev}n1" + _run_fio_verify_io --size="${nvme_img_size}" \ + --filename="/dev/${nvmedev}n1" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/012 b/tests/nvme/012 index c9d24388306d..ecf44fcb5a51 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -29,7 +29,7 @@ test() { local file_path="${TMPDIR}/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" diff --git a/tests/nvme/013 b/tests/nvme/013 index 265b6968fd34..e249add46295 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -28,7 +28,7 @@ test() { local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/014 b/tests/nvme/014 index 875e99eea346..55d920f2660b 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -29,7 +29,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" diff --git a/tests/nvme/015 b/tests/nvme/015 index 8cb343e1d31c..071141380e43 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -28,7 +28,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/017 b/tests/nvme/017 index f2a95cf276cb..0248aee9bc41 100755 --- a/tests/nvme/017 +++ b/tests/nvme/017 @@ -25,7 +25,7 @@ test() { file_path="${TMPDIR}/img" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/018 b/tests/nvme/018 index 315e79534348..78e9b2bb94d8 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -26,7 +26,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/019 b/tests/nvme/019 index 4cb3509a12b2..9fff8ccaac9c 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -28,7 +28,7 @@ test() { local nblk_range="10,10,10,10,10,10,10,10,10,10" local sblk_range="100,200,300,400,500,600,700,800,900,1000" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" diff --git a/tests/nvme/020 b/tests/nvme/020 index 16fdfcc94918..1966d5925213 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -26,7 +26,7 @@ test() { local nblk_range="10,10,10,10,10,10,10,10,10,10" local sblk_range="100,200,300,400,500,600,700,800,900,1000" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/021 b/tests/nvme/021 index 6ee0af1fe158..1fefc0fbca00 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -25,7 +25,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/022 b/tests/nvme/022 index 1d76ffa44178..1ff915786f86 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -25,7 +25,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/023 b/tests/nvme/023 index b65be07edc38..90316230a3d7 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -26,7 +26,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" diff --git a/tests/nvme/024 b/tests/nvme/024 index f756797d6f29..384a8266e741 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -25,7 +25,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/025 b/tests/nvme/025 index 941bf36f67fb..815223d1c28d 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -25,7 +25,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/026 b/tests/nvme/026 index c3f06c2a377c..d2203f19f026 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -25,7 +25,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/027 b/tests/nvme/027 index 0ad663ace811..97fe70e78344 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -25,7 +25,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/028 b/tests/nvme/028 index 7de977a81213..c539620bee28 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -25,7 +25,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" diff --git a/tests/nvme/029 b/tests/nvme/029 index f8b4cbbb9156..1808b7b0edf1 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -14,6 +14,7 @@ requires() { _nvme_requires _have_loop _require_nvme_trtype_is_fabrics + _require_test_dev_size 1M } test_user_io() @@ -59,7 +60,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 1G "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" diff --git a/tests/nvme/031 b/tests/nvme/031 index 4e1798246db1..e70898819a86 100755 --- a/tests/nvme/031 +++ b/tests/nvme/031 @@ -33,7 +33,7 @@ test() { _setup_nvmet - truncate -s 1G "$TMPDIR/img" + truncate -s "${nvme_img_size}" "$TMPDIR/img" loop_dev="$(losetup -f --show "$TMPDIR/img")" diff --git a/tests/nvme/032 b/tests/nvme/032 index 2e4b7f0760c7..46bbff25e70d 100755 --- a/tests/nvme/032 +++ b/tests/nvme/032 @@ -40,7 +40,6 @@ test_device() { # start fio job _run_fio_rand_io --filename="$TEST_DEV" \ --group_reporting --time_based --runtime=-1 &> /dev/null & - sleep 5 if [[ ! -d "$sysfs" ]]; then diff --git a/tests/nvme/034 b/tests/nvme/034 index f92e5e20865b..e0ede717c373 100755 --- a/tests/nvme/034 +++ b/tests/nvme/034 @@ -26,7 +26,7 @@ test_device() { port=$(_nvmet_passthru_target_setup "${subsys}") nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") - _run_fio_verify_io --size=950m --filename="${nsdev}" + _run_fio_verify_io --size="${nvme_img_size}" --filename="${nsdev}" _nvme_disconnect_subsys "${subsys}" _nvmet_passthru_target_cleanup "${port}" "${subsys}" diff --git a/tests/nvme/035 b/tests/nvme/035 index eb1024edddbf..0896f7bb578d 100755 --- a/tests/nvme/035 +++ b/tests/nvme/035 @@ -17,7 +17,7 @@ requires() { } device_requires() { - _require_test_dev_size 1024m + _require_test_dev_size "${nvme_img_size}" } test_device() { @@ -32,7 +32,7 @@ test_device() { port=$(_nvmet_passthru_target_setup "${subsys}") nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") - _xfs_run_fio_verify_io "${nsdev}" "900m" + _xfs_run_fio_verify_io "${nsdev}" "${nvme_img_size}" _nvme_disconnect_subsys "${subsys}" _nvmet_passthru_target_cleanup "${port}" "${subsys}" diff --git a/tests/nvme/040 b/tests/nvme/040 index 05b4f5472ef5..7a8742ec343d 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -26,7 +26,7 @@ test() { echo "Running ${TEST_NAME}" _setup_nvmet - truncate -s 1G "$TMPDIR/img" + truncate -s "${nvme_img_size}" "$TMPDIR/img" loop_dev="$(losetup -f --show "$TMPDIR/img")" port="$(_create_nvmet_port "${nvme_trtype}")" diff --git a/tests/nvme/041 b/tests/nvme/041 index 03e2dab25918..308655dd6090 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -44,7 +44,7 @@ test() { _setup_nvmet - truncate -s 512M "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "b92842df-a394-44b1-84a4-92ae7d112861" diff --git a/tests/nvme/042 b/tests/nvme/042 index 4ad726f72f5a..fed2efead013 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -41,7 +41,7 @@ test() { _setup_nvmet - truncate -s 512M "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" diff --git a/tests/nvme/043 b/tests/nvme/043 index c031cecf34a5..a030884aa4ed 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -42,7 +42,7 @@ test() { _setup_nvmet - truncate -s 512M "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" diff --git a/tests/nvme/044 b/tests/nvme/044 index f2406ecadf7d..9928bcc55397 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -53,7 +53,7 @@ test() { _setup_nvmet - truncate -s 512M "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" diff --git a/tests/nvme/045 b/tests/nvme/045 index 612e5f168e3c..7c51da27b5f1 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -55,7 +55,7 @@ test() { _setup_nvmet - truncate -s 512M "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" diff --git a/tests/nvme/047 b/tests/nvme/047 index d56d3be185b0..b5a8d469a983 100755 --- a/tests/nvme/047 +++ b/tests/nvme/047 @@ -28,7 +28,7 @@ test() { local file_path="$TMPDIR/img" local subsys_name="blktests-subsystem-1" - truncate -s 512M "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" diff --git a/tests/nvme/048 b/tests/nvme/048 index 09e205f69197..81084f0440c2 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -84,7 +84,7 @@ test() { fi hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" - truncate -s 512M "${file_path}" + truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ "b92842df-a394-44b1-84a4-92ae7d112861" diff --git a/tests/nvme/rc b/tests/nvme/rc index 41f196b037d6..51dde39c2966 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -17,6 +17,7 @@ def_local_wwpn="0x20001100aa000002" def_hostnqn="$(cat /etc/nvme/hostnqn 2> /dev/null)" def_hostid="$(cat /etc/nvme/hostid 2> /dev/null)" nvme_trtype=${nvme_trtype:-"loop"} +nvme_img_size=${nvme_img_size:-"1G"} _nvme_requires() { _have_program nvme -- 2.40.0