From patchwork Thu Apr 20 18:31:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 86005 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp538460vqo; Thu, 20 Apr 2023 11:38:06 -0700 (PDT) X-Google-Smtp-Source: AKy350YQIpA7isuHQGVXHZRDGDe2Jungn53a8qCbhnEbiTEqJi3SWBABXaoXH00k6yh8NdqgKCvq X-Received: by 2002:a05:6a00:aca:b0:63d:254a:3900 with SMTP id c10-20020a056a000aca00b0063d254a3900mr2419151pfl.5.1682015885879; Thu, 20 Apr 2023 11:38:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682015885; cv=none; d=google.com; s=arc-20160816; b=LVn1NidgXDB9NpAh/9KF6ywKwuL9oudB9p9pXdsVbMzoA9LJZ/ImWrQrx7RHJOLZen bFBXw9mX8fHS7A3KYpRNrE08z7/IXq0zuXXiX/zwhlBulndMOdiOX2BmsMm1ExneQCwa aPpcsGqkjwCpNUBMsaeOzRl6XzljmuTqXPEp+UdcOq2CM2OD2xVuVVgxrF2qrgKFZb8a ZeVjdNC7HZ5UBFv6KT3/SJOIS4Pa5nIWGAXZgdFsowAKRNArwKOl7fHEvXPFeZCNKc7c 8ghVJciy+TuuVdOHDyMc3potS/Q6pvleebGncc3XaXeP6wSsyPKBTb5MCfCZx0qzC6En neNQ== 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=xYR0Z2QWJn4Bi0GTtzD57Fk9oHuz/zDhZqF1xzlUd3w=; b=Bp5RQsd/+geSKPDkudL4PhnCggairxyAqxLIQZiB05EBU9wXA3tIDkJVzYC6argCcV HHddGodBOwyMoD2eHbMlzaDT8ozJcHBXcekAR2tly7DgZvCSwIkOqVcFClB0txYS6bx7 lkDmcADpnlfoSqHLw1d+h70P4Rz4YS0uB7oyOnGZZLYsx820LSg2f38NVsVRucADQ2TJ BDGpoN7sVrnecPWTag81FKV+gCEwLsFMwnGlrgxZO+Jw9cYnxEh2uveG+kolsYlyfdZE hGMpQo+7/ER6hDDSZD8IPkbpaj/ErF0PqDO8s19ezwSTOrj70B26l/xwGlUAE84j5cBl FWow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=EBuyM4UA; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=LMLwQoxY; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z18-20020aa79592000000b0063b716685fasi2171678pfj.235.2023.04.20.11.37.48; Thu, 20 Apr 2023 11:38:05 -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=EBuyM4UA; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=LMLwQoxY; 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 S231722AbjDTSbn (ORCPT + 99 others); Thu, 20 Apr 2023 14:31:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229567AbjDTSba (ORCPT ); Thu, 20 Apr 2023 14:31:30 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A11D30DD; Thu, 20 Apr 2023 11:31:27 -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 515551FDC6; Thu, 20 Apr 2023 18:31:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682015486; 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=xYR0Z2QWJn4Bi0GTtzD57Fk9oHuz/zDhZqF1xzlUd3w=; b=EBuyM4UAQ8iszdnC361GCeuosuHEu7jdfEWBERKaba8g/AgzCDOh0PVPKE5smoS4riUAwR rdqi9sOolsjDSTHPXRwGMY/AVVFGd90rOlhMxjpf2YqwPgZzYWu4P4oW9iw9HjjQC021y5 tfUVx8nk95zRcFnB5dBZxC6pIsUw0Rw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682015486; 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=xYR0Z2QWJn4Bi0GTtzD57Fk9oHuz/zDhZqF1xzlUd3w=; b=LMLwQoxYs9yjLXL/00uYnEfyX3SmSA0kLJMy+yuTsR+dWSp8WF8o8kGSIhzKaY6w5WJWwr tEAGpUc0TU2AFfDQ== 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 417E613584; Thu, 20 Apr 2023 18:31:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gz/4D/6EQWSlNAAAMHmgww (envelope-from ); Thu, 20 Apr 2023 18:31:26 +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 , Daniel Wagner Subject: [PATCH blktests v2 2/4] nvme: Make test image size configurable Date: Thu, 20 Apr 2023 20:31:12 +0200 Message-Id: <20230420183121.4489-4-dwagner@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230420183121.4489-1-dwagner@suse.de> References: <20230420183121.4489-1-dwagner@suse.de> MIME-Version: 1.0 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763721171304079968?= X-GMAIL-MSGID: =?utf-8?q?1763721489547259732?= 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. Signed-off-by: Daniel Wagner --- 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 | 4 ++-- tests/nvme/011 | 4 ++-- tests/nvme/012 | 4 ++-- tests/nvme/013 | 4 ++-- tests/nvme/014 | 10 ++++++++-- tests/nvme/015 | 10 ++++++++-- 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 | 4 ++-- tests/nvme/034 | 2 +- tests/nvme/035 | 4 ++-- tests/nvme/040 | 4 ++-- 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 + 38 files changed, 60 insertions(+), 46 deletions(-) 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..2f81610699d4 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,7 @@ 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 --filename="/dev/${nvmedev}n1" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/011 b/tests/nvme/011 index 4bfe9af084e4..d8504b71d7d5 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,7 @@ 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 --filename="/dev/${nvmedev}n1" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/012 b/tests/nvme/012 index e60082c2e751..1fb36e33d574 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}")" @@ -44,7 +44,7 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" - _xfs_run_fio_verify_io "/dev/${nvmedev}n1" "900m" + _xfs_run_fio_verify_io "/dev/${nvmedev}n1" "${nvme_img_size}" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/013 b/tests/nvme/013 index 9d60a7df4577..2c6e4d707d3c 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" @@ -41,7 +41,7 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" - _xfs_run_fio_verify_io "/dev/${nvmedev}n1" "900m" + _xfs_run_fio_verify_io "/dev/${nvmedev}n1" "${nvme_img_size}" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/014 b/tests/nvme/014 index d13cff7921da..3f3193bb6583 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -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,13 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" - dd if=/dev/urandom of="/dev/${nvmedev}n1" count=128000 bs=4k status=none + local sectors + local bs + sectors="$(blockdev --getss "/dev/${nvmedev}n1")" + bs="$(blockdev --getbsz "/dev/${nvmedev}n1")" + + dd if=/dev/urandom of="/dev/${nvmedev}n1" \ + count="${sectors}" bs="${bs}" status=none nvme flush "/dev/${nvmedev}" -n 1 diff --git a/tests/nvme/015 b/tests/nvme/015 index bb52ba2598db..20fe17c589e1 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -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" @@ -38,7 +38,13 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" - dd if=/dev/urandom of="/dev/${nvmedev}n1" count=128000 bs=4k status=none + local sectors + local bs + sectors="$(blockdev --getss "/dev/${nvmedev}n1")" + bs="$(blockdev --getbsz "/dev/${nvmedev}n1")" + + dd if=/dev/urandom of="/dev/${nvmedev}n1" \ + count="${sectors}" bs="${bs}" status=none nvme flush "/dev/${nvmedev}n1" -n 1 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 017d4a339971..1a467119a2ff 100755 --- a/tests/nvme/032 +++ b/tests/nvme/032 @@ -38,8 +38,8 @@ test_device() { sysfs="/sys/bus/pci/devices/${pdev}" # start fio job - _run_fio_rand_io --filename="$TEST_DEV" --size=1g \ - --group_reporting &> /dev/null & + _run_fio_rand_io --filename="$TEST_DEV" --size=256M \ + --group_reporting --time_based --runtime=1m > /dev/null & sleep 5 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 04bd726cd309..885e5ed68fe6 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -25,7 +25,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}")" @@ -37,7 +37,7 @@ test() { # start fio job echo "starting background fio" - _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size=1g \ + _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size="${nvme_img_size}" \ --group_reporting --ramp_time=5 &> /dev/null & sleep 5 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 b4ee7371eb68..08fdee16c811 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..e6075e31178f 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:-"64M"} _nvme_requires() { _have_program nvme