From patchwork Fri Apr 21 06:05:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 86142 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp848723vqo; Thu, 20 Apr 2023 23:08:47 -0700 (PDT) X-Google-Smtp-Source: AKy350aHIYAyaKfBTCnblikZvRy93daT07WieYnTK5/WOjECeCRWxTsN1X/pV66Mx47ZaRdd0/E+ X-Received: by 2002:a17:90b:3a88:b0:247:6023:f884 with SMTP id om8-20020a17090b3a8800b002476023f884mr4306929pjb.15.1682057326919; Thu, 20 Apr 2023 23:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682057326; cv=none; d=google.com; s=arc-20160816; b=rE+WwmNa9/QZfQfp5cmAIBigh+v08xIGEhg1KkZwhspewt+GJ6WgKJGmQYC2G5ob6d gbg1D99xZ/k+h4OStQ7ZwIqxPRvw6I/d+jX11VDb6YZNiKD5N/HEB2SwHC8ApTFNxfLq 5/e2VfFWigYFVIT8Qnj/NVA1WchRJvgNUot/rbYR+vJyl01s+8y7HOE+JLsub/Lcr7dQ WEKcSCaZaEfh2+qhRE1ZXKZbPyUgTSZN+E545g7Ya3r1FhcmDFvfB6FChY/uKi+PckQh 3zc6neKZqwunVF4WJub6P+m2Xy8We+HdCW51l7gkcB8TqMLNHCDfYR063KCqmXXccdyw 1Ilw== 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=vYu2UT5lDEOdiTT1ESF8e0PH0sTJl298MdWvcXc3Wac=; b=Ejlya6roc/uGBCa0lSorRj3JSY9T/mhV0YxLFFUcQv4Ot0ZImvxOCr4rjSetTJ5NVq z8D996ayRgPgRgZaDz7h9zk5hvW1EATH/UMlgV+lki9rSoru8YN3TsUvHCtrUB+yfNQD GH6Ls+4IdUl8YVN0ya4MsUERHVUeKIsa/dYQ3F2JWo4KnygvCR42zlY3TMPGgljdpgOw W0N9VagzyugSQQ760zH9fd76IFtnl7kRHxe4I5aOTHcWLE81pDk/BUwpO3fY0Ug/3fq0 6qg6RRmjCixWwZ3ajQtoTuyEd6hN6uqB7Yd7zzY7De8juRc2cBp2uVXQF8SgOusbPAFR mGSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=p6u++3CH; dkim=neutral (no key) header.i=@suse.de header.b=KfNXzzFn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org ([23.128.96.18]) by mx.google.com with ESMTP id p5-20020a170902780500b0019ad97d72cfsi3529310pll.590.2023.04.20.23.08.08; Thu, 20 Apr 2023 23:08:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=p6u++3CH; dkim=neutral (no key) header.i=@suse.de header.b=KfNXzzFn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S233696AbjDUGFe (ORCPT + 99 others); Fri, 21 Apr 2023 02:05:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233668AbjDUGFX (ORCPT ); Fri, 21 Apr 2023 02:05:23 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1A696EB9; Thu, 20 Apr 2023 23:05:20 -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-out1.suse.de (Postfix) with ESMTPS id ADBC421A4E; Fri, 21 Apr 2023 06:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682057119; 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=vYu2UT5lDEOdiTT1ESF8e0PH0sTJl298MdWvcXc3Wac=; b=p6u++3CHSwU3MNSFcTHurF97m6nBH526u0j922WFgkW6pvp/zyS5Sqw8wT+FagGPFoDjfy QUjVHgmazpGSU+dSJOkw8l5qEII+gH/NcOZLkKcvmDsdAcpbrynAL4cOtt1WJ+yqcJmXdp 3rTfIrg/D62AQxel0ELy3qymRBwDHLM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682057119; 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=vYu2UT5lDEOdiTT1ESF8e0PH0sTJl298MdWvcXc3Wac=; b=KfNXzzFnZOA3xFgdwB15075xXXVCzurRNe3ta/GM769yXJICifFz0k/K+35p8jW917I6DZ 3bREVO7CCWOEgxCQ== 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 9ED7A1390E; Fri, 21 Apr 2023 06:05:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Bq/EJp8nQmR0ZgAAMHmgww (envelope-from ); Fri, 21 Apr 2023 06:05:19 +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 REPOST blktests v2 6/9] nvme-rc: Add minimal test image size requirement Date: Fri, 21 Apr 2023 08:05:02 +0200 Message-Id: <20230421060505.10132-7-dwagner@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421060505.10132-1-dwagner@suse.de> References: <20230421060505.10132-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,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763764943350974542?= X-GMAIL-MSGID: =?utf-8?q?1763764943350974542?= Some tests need a minimal test image size to work correctly. Thus add a helper to check the size and update these tests accordingly. The image minimum is 4M because some of the test have hard coded values. All tests which use the xfs fio verification job have a minimum requirement of 350M impossed by the xfs filesystem. Signed-off-by: Daniel Wagner Reviewed-by: Hannes Reinecke --- tests/nvme/012 | 1 + tests/nvme/013 | 1 + tests/nvme/029 | 1 - tests/nvme/045 | 2 +- tests/nvme/rc | 15 +++++++++++++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/nvme/012 b/tests/nvme/012 index ecf44fcb5a51..efe227538c57 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -16,6 +16,7 @@ requires() { _have_fio _have_loop _require_nvme_trtype_is_fabrics + _require_nvme_test_img_size 350m } test() { diff --git a/tests/nvme/013 b/tests/nvme/013 index e249add46295..14e646a19c47 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -15,6 +15,7 @@ requires() { _have_xfs _have_fio _require_nvme_trtype_is_fabrics + _require_nvme_test_img_size 350m } test() { diff --git a/tests/nvme/029 b/tests/nvme/029 index 1808b7b0edf1..c6d38b42af70 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -14,7 +14,6 @@ requires() { _nvme_requires _have_loop _require_nvme_trtype_is_fabrics - _require_test_dev_size 1M } test_user_io() diff --git a/tests/nvme/045 b/tests/nvme/045 index 7c51da27b5f1..99012f6bed8f 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -120,7 +120,7 @@ test() { nvmedev=$(_find_nvme_dev "${subsys_name}") - _run_fio_rand_io --size=8m --filename="/dev/${nvmedev}n1" + _run_fio_rand_io --size=4m --filename="/dev/${nvmedev}n1" _nvme_disconnect_subsys "${subsys_name}" diff --git a/tests/nvme/rc b/tests/nvme/rc index e5ba9a6d5f54..b1f2dacae125 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -21,6 +21,7 @@ nvme_img_size=${nvme_img_size:-"350M"} _nvme_requires() { _have_program nvme + _require_nvme_test_img_size 4m case ${nvme_trtype} in loop) _have_driver nvme-loop @@ -94,6 +95,20 @@ _require_test_dev_is_nvme() { return 0 } +_require_nvme_test_img_size() { + local require_sz_mb + local nvme_img_size_mb + + require_sz_mb="$(convert_to_mb "$1")" + nvme_img_size_mb="$(convert_to_mb "${nvme_img_size}")" + + if (( "${nvme_img_size_mb}" < "$require_sz_mb" )); then + SKIP_REASONS+=("nvme_img_size must be at least ${require_sz_mb}m") + return 1 + fi + return 0 +} + _require_nvme_trtype() { local trtype for trtype in "$@"; do