From patchwork Wed Nov 2 02:57:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 13027696 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A0EDC43217 for ; Wed, 2 Nov 2022 02:58:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231208AbiKBC6h (ORCPT ); Tue, 1 Nov 2022 22:58:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231206AbiKBC6g (ORCPT ); Tue, 1 Nov 2022 22:58:36 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E75822531 for ; Tue, 1 Nov 2022 19:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667357854; h=from:from:reply-to:subject:subject: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=RswB510iQnL61XzrmzYzoOFaNhqJWXGUpuiXL9j46Jc=; b=hxW3Dt796idJCOGfdPjyEYcCzQ7wMInXAuC6tmCUpxyo/CWzKfdjcwHQERMt75IAZrVTxe haS9NVLerjZB7oTA02YvJSZYGVRWjyWHBjinyimvq8es6n0szxKG7Zr+qyZATUvEPnpJgV tEpEcdTSnL48I+Ck4inwzrJBZzUnDU8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-13-ZY5VsYX6N3qs7UEWKgd6zQ-1; Tue, 01 Nov 2022 22:57:31 -0400 X-MC-Unique: ZY5VsYX6N3qs7UEWKgd6zQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F228B1C068D1; Wed, 2 Nov 2022 02:57:30 +0000 (UTC) Received: from fedora34.. (unknown [10.66.146.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62BFF422A9; Wed, 2 Nov 2022 02:57:29 +0000 (UTC) From: Yi Zhang To: shinichiro.kawasaki@wdc.com Cc: chaitanyak@nvidia.com, linux-block@vger.kernel.org Subject: [PATCH V2 blktests 1/3] common/xfs: set the minimal log size 64m during mkfs.xfs Date: Wed, 2 Nov 2022 10:57:00 +0800 Message-Id: <20221102025702.1664101-2-yi.zhang@redhat.com> In-Reply-To: <20221102025702.1664101-1-yi.zhang@redhat.com> References: <20221102025702.1664101-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Update to use the new minimum xfs log size 64MB which introudced from xfsprogs v5.19.0: $ mkfs.xfs -l size=32m -f /dev/nvme0n1 Log size must be at least 64MB. Usage: mkfs.xfs /* blocksize */ [-b size=num] /* config file */ [-c options=xxx] /* metadata */ [-m crc=0|1,finobt=0|1,uuid=xxx,rmapbt=0|1,reflink=0|1, inobtcount=0|1,bigtime=0|1] /* data subvol */ [-d agcount=n,agsize=n,file,name=xxx,size=num, (sunit=value,swidth=value|su=num,sw=num|noalign), sectsize=num /* force overwrite */ [-f] /* inode size */ [-i perblock=n|size=num,maxpct=n,attr=0|1|2, projid32bit=0|1,sparse=0|1,nrext64=0|1] /* no discard */ [-K] /* log subvol */ [-l agnum=n,internal,size=num,logdev=xxx,version=n sunit=value|su=num,sectsize=num,lazy-count=0|1] /* label */ [-L label (maximum 12 characters)] /* naming */ [-n size=num,version=2|ci,ftype=0|1] /* no-op info only */ [-N] /* prototype file */ [-p fname] /* quiet */ [-q] /* realtime subvol */ [-r extsize=num,size=num,rtdev=xxx] /* sectorsize */ [-s size=num] /* version */ [-V] devicename is required unless -d name=xxx is given. is xxx (bytes), xxxs (sectors), xxxb (fs blocks), xxxk (xxx KiB), xxxm (xxx MiB), xxxg (xxx GiB), xxxt (xxx TiB) or xxxp (xxx PiB). is xxx (512 byte blocks). Signed-off-by: Yi Zhang --- common/xfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/xfs b/common/xfs index 210c924..846a5ef 100644 --- a/common/xfs +++ b/common/xfs @@ -16,7 +16,7 @@ _xfs_mkfs_and_mount() { mkdir -p "${mount_dir}" umount "${mount_dir}" - mkfs.xfs -l size=32m -f "${bdev}" + mkfs.xfs -l size=64m -f "${bdev}" mount "${bdev}" "${mount_dir}" } From patchwork Wed Nov 2 02:57:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 13027697 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BA06C4332F for ; Wed, 2 Nov 2022 02:58:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231214AbiKBC6r (ORCPT ); Tue, 1 Nov 2022 22:58:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231210AbiKBC6q (ORCPT ); Tue, 1 Nov 2022 22:58:46 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3B0822535 for ; Tue, 1 Nov 2022 19:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667357865; h=from:from:reply-to:subject:subject: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=hPUqyTphJbcj2xxsFqvjVhKPi20MUf82RhN84b01TZs=; b=KDFGFC3hiQwwuv2Pr6FGmz0tTo87O3Zs/VKN5mv7TU/pw5fvEgudlA8Bw168qvdPSrYncw YbpZnxgm587peYBesQ1w9dt70KlA/cQOlVlqvQDvTC2+rW4mKyQ6ZasO5ovM4j0jvvhEWO wI9PVu5L+L1v8jlUfrUfz1SlSxsLmwg= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-335-tRdl9fRAOeWVVDI4hF1X0g-1; Tue, 01 Nov 2022 22:57:44 -0400 X-MC-Unique: tRdl9fRAOeWVVDI4hF1X0g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3F7951C068CB; Wed, 2 Nov 2022 02:57:44 +0000 (UTC) Received: from fedora34.. (unknown [10.66.146.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id A34AC422A9; Wed, 2 Nov 2022 02:57:42 +0000 (UTC) From: Yi Zhang To: shinichiro.kawasaki@wdc.com Cc: chaitanyak@nvidia.com, linux-block@vger.kernel.org Subject: [PATCH V2 blktests 2/3] common/rc: add one function to check required dev size for TEST_DEV Date: Wed, 2 Nov 2022 10:57:01 +0800 Message-Id: <20221102025702.1664101-3-yi.zhang@redhat.com> In-Reply-To: <20221102025702.1664101-1-yi.zhang@redhat.com> References: <20221102025702.1664101-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org nvme/035 has minimum TEST_DEV size requirement, add a helper function to check it Signed-off-by: Yi Zhang --- common/rc | 10 ++++++++++ tests/nvme/035 | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/common/rc b/common/rc index e490041..7987ac3 100644 --- a/common/rc +++ b/common/rc @@ -324,6 +324,16 @@ _get_pci_parent_from_blkdev() { tail -2 | head -1 } +_require_test_dev_size_mb() { + local require_sz_mb=$1 + local test_dev_sz_mb=$(($(blockdev --getsize64 "$TEST_DEV")/1024/1024)) + + if (( "$test_dev_sz_mb" < "$require_sz_mb" )); then + SKIP_REASONS+=("${TEST_DEV} required at least ${require_sz_mb}m") + return 1 + fi +} + _require_test_dev_in_hotplug_slot() { local parent parent="$(_get_pci_parent_from_blkdev)" diff --git a/tests/nvme/035 b/tests/nvme/035 index ee78a75..e8581ef 100755 --- a/tests/nvme/035 +++ b/tests/nvme/035 @@ -16,6 +16,10 @@ requires() { _have_fio } +device_requires() { + _require_test_dev_size_mb 1024 +} + test_device() { local subsys="blktests-subsystem-1" local ctrldev From patchwork Wed Nov 2 02:57:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 13027698 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57B89C433FE for ; Wed, 2 Nov 2022 02:58:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231215AbiKBC6w (ORCPT ); Tue, 1 Nov 2022 22:58:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231211AbiKBC6v (ORCPT ); Tue, 1 Nov 2022 22:58:51 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 708CB22B0D for ; Tue, 1 Nov 2022 19:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667357874; h=from:from:reply-to:subject:subject: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=C9JpiXbhyFkNGKhMyn02ZG+LNY6lgQjj9R+rEZcAN+U=; b=XB2Y45EfXRrS51kpgb7OHVEgzkDk5V7xo6Tu4wrbSEi91/8+d8VCx00ntb6WOkVY4rQ8+d RSGZMRR8L8oei59OUDGMr56POvct+5FbYNTKArsGII6rc/5kfaoQFFT9Ent5kJ/+NRHFSg lZr/gkpBr3j89hO5vTDN341kdTZqMCY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-571-eL_0t7YDMCm8obpFB8VBuQ-1; Tue, 01 Nov 2022 22:57:53 -0400 X-MC-Unique: eL_0t7YDMCm8obpFB8VBuQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0C919101A52A; Wed, 2 Nov 2022 02:57:53 +0000 (UTC) Received: from fedora34.. (unknown [10.66.146.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7084C422A9; Wed, 2 Nov 2022 02:57:51 +0000 (UTC) From: Yi Zhang To: shinichiro.kawasaki@wdc.com Cc: chaitanyak@nvidia.com, linux-block@vger.kernel.org Subject: [PATCH V2 blktests 3/3] nvme/012,013,035: change fio I/O size and move size definition place Date: Wed, 2 Nov 2022 10:57:02 +0800 Message-Id: <20221102025702.1664101-4-yi.zhang@redhat.com> In-Reply-To: <20221102025702.1664101-1-yi.zhang@redhat.com> References: <20221102025702.1664101-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Change fio I/O size of nvme/012,013,035 from 950m to 900m, since recent change increased the xfs log size and it caused fio failure with I/O size 950m. Also add size parameter to _run_fio_verify_io. This allows to move the fio I/O size definition from common/xfs to the test case, so that device size and fio I/O size are both defined at single place. Link: https://lore.kernel.org/linux-block/20221019051244.810755-1-yi.zhang@redhat.com/ Signed-off-by: Yi Zhang --- common/xfs | 3 ++- tests/nvme/012 | 2 +- tests/nvme/013 | 2 +- tests/nvme/035 | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/xfs b/common/xfs index 846a5ef..2c5d961 100644 --- a/common/xfs +++ b/common/xfs @@ -23,10 +23,11 @@ _xfs_mkfs_and_mount() { _xfs_run_fio_verify_io() { local mount_dir="/mnt/blktests" local bdev=$1 + local sz=$2 _xfs_mkfs_and_mount "${bdev}" "${mount_dir}" >> "${FULL}" 2>&1 - _run_fio_verify_io --size=950m --directory="${mount_dir}/" + _run_fio_verify_io --size="$sz" --directory="${mount_dir}/" umount "${mount_dir}" >> "${FULL}" 2>&1 rm -fr "${mount_dir}" diff --git a/tests/nvme/012 b/tests/nvme/012 index c9d2438..e60082c 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -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" + _xfs_run_fio_verify_io "/dev/${nvmedev}n1" "900m" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/013 b/tests/nvme/013 index 265b696..9d60a7d 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -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" + _xfs_run_fio_verify_io "/dev/${nvmedev}n1" "900m" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/035 b/tests/nvme/035 index e8581ef..d169e35 100755 --- a/tests/nvme/035 +++ b/tests/nvme/035 @@ -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}" + _xfs_run_fio_verify_io "${nsdev}" "900m" _nvme_disconnect_subsys "${subsys}" _nvmet_passthru_target_cleanup "${port}" "${subsys}"