From patchwork Thu May 11 14:09:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 92639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp4472105rwl; Thu, 11 May 2023 07:18:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ611qv1J5LN+jkFIXbFofWmX8/p2nFnhWGsCj6f5rDS1gDQnD1jOh12HGiFjmPvhXiSqGfO X-Received: by 2002:a17:90b:4ac8:b0:24e:507:7408 with SMTP id mh8-20020a17090b4ac800b0024e05077408mr21191636pjb.37.1683814721973; Thu, 11 May 2023 07:18:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683814721; cv=none; d=google.com; s=arc-20160816; b=F0QhobyrtKirBnRVzvhBvJnTXMLMmRSeSMsO8k6OOnqAWCLtnQLPnDhrtxVnHi2Y1q tVOsPHga1R0E5fqq0TLRt4WewYOrGsLmcxqCvk1anp8WxDR4Llv4bWaqLcQ42Lfyk3bj oJiAIqBurNS16pkO5iarr87DmakH4R9AFNIwHXgUqrqA3MMGGMD3u/l9iwLGJ3XFEMCI W8MUhad1zEJgmLu5Y9cd2I8PFen3+wuw9JWg1vZQLBFq+np8WC7nnOZyMkRV0zOmijNP j4RdP4hTqrX0TNxiRdJ+FrnBg90iVozC/fUCWLTvqvopk108kprCKiwBNcf9MijFtX4K 81pA== 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=ohCWniQhLy1JmPaSZJVICMhqHrQzKwUuV5HUXtssSws=; b=jXo33zsSnh6cNi/T7cxB2GnJggpXocRsbjW6hbFwutui+Xtf7hvl0gQEbJ1dfC9Nxd b5idS42vTv3rK1VfX6qCA3x2+dwZq9cGrFZyL+LrvBXeftLigqZWgkU1ldg9iwMUi5j7 HqXiCzNBeOkHE0sOkby3wkaZiAFhcBG3hHeixY0DB/DCVpRtNZbGrM2sPPM1gIocT4IZ 8LssyRuxISh6OsFxW2Seb8GNfg0SXrKEV9zHZANp3foblFcfGtU8iuN+ShnPiis7yLTC EqztQo265VP/YiaqQ5VpomYLzUReysQasAW1h/j/AOK+w5FIOQH4xfP6L4BA3I4zDX0m Rs5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=o1LamY2j; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=0W6dyMkb; 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 z28-20020a63b91c000000b0051b631334f1si7051313pge.764.2023.05.11.07.18.28; Thu, 11 May 2023 07:18:41 -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=o1LamY2j; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=0W6dyMkb; 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 S238156AbjEKOKt (ORCPT + 99 others); Thu, 11 May 2023 10:10:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238411AbjEKOKk (ORCPT ); Thu, 11 May 2023 10:10:40 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E00BF100EF; Thu, 11 May 2023 07:10:18 -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 0A89221D0E; Thu, 11 May 2023 14:10:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1683814217; 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=ohCWniQhLy1JmPaSZJVICMhqHrQzKwUuV5HUXtssSws=; b=o1LamY2jBs1RbEKKa9AYnDOjUNo9M8Y2Mde0JuNwpYetC0hAXLN+qPSIGaBISu1zu0lIhp s9Tutch0R/2UgHvrf5FoPCnvYbbv50PpzcfKTKtNvOkpu7EncCJ5G7fNkvpunuTL251z5C 7K2XHyKoWHoSBpjtZaD0oRm+Aagw+LI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1683814217; 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=ohCWniQhLy1JmPaSZJVICMhqHrQzKwUuV5HUXtssSws=; b=0W6dyMkbsIwjkAjT+NoXSN9fSCsQmQB0A3mkL0t2fLFmEJq3L7LqpNiRRWpMuQWWDpUl85 PByQGNHsAlw+FRAA== 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 AFC0A134B2; Thu, 11 May 2023 14:10:16 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id nSVCIkj3XGR+PwAAMHmgww (envelope-from ); Thu, 11 May 2023 14:10:16 +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 v4 08/11] nvme: Add minimal test image size requirement Date: Thu, 11 May 2023 16:09:50 +0200 Message-Id: <20230511140953.17609-9-dwagner@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230511140953.17609-1-dwagner@suse.de> References: <20230511140953.17609-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?1765607705668652695?= X-GMAIL-MSGID: =?utf-8?q?1765607705668652695?= 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. Reviewed-by: Hannes Reinecke Reviewed-by: Chaitanya Kulkarni Signed-off-by: Daniel Wagner --- tests/nvme/012 | 1 + tests/nvme/013 | 1 + tests/nvme/045 | 2 +- tests/nvme/rc | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) 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/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 8d5305e280ad..c951339fad7d 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -21,6 +21,7 @@ nvme_img_size=${nvme_img_size:-"1G"} _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