From patchwork Thu Apr 20 18:31:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 86006 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp538774vqo; Thu, 20 Apr 2023 11:38:45 -0700 (PDT) X-Google-Smtp-Source: AKy350b4QM0vDvkUVyoBTSwIcD+jsHJY2kQt8BbpYhbGIf1cuvtzjnMlYAGMmgz5siW49wXkuSyE X-Received: by 2002:a17:902:bb0f:b0:1a6:a375:cb49 with SMTP id im15-20020a170902bb0f00b001a6a375cb49mr2056484plb.39.1682015925438; Thu, 20 Apr 2023 11:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682015925; cv=none; d=google.com; s=arc-20160816; b=mMGgaWa58cS0dh+ia8sltFZCuIpnDs+tEb3UlirT5W/7Y/VNhEz5cqKErY2JRETYcE DN6Anw08rioueE/eEMBqSxxp9U7O3Hm1vKabK055JZN8pU5xHMemciHpuVCevscBnBDq SrpIwk7AusGcuKehZcGpgQkPOxXWezOuKwatv9qs0BMfodCupEsy6vcW/90cbZJi5lAw zuh30LQCU84XoluYZi8qG0Sq5ZHsmCQoop6Ev9hDkTBxW0tD6fzY2qPqO77KxEItgMGX 1hDEarmGQBz5kmLbFXhNUZD6OOWUoV/rXytj6UfvUwgXmLY04DFHSrGz9oOORlBHR0qW qnHg== 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=Y7LYG31wkiXr0z2RVLriiPlnLrwv4Qw3dEuqAPHE1Yc=; b=s5ZsXXfGQVhuRpJApYEhSnvfoN0TLUwWegQRVeuECUMNR9ZPq99z11XmRSTSBY/Gef 61heFQJkMgB85W3RgVfgQy9Bkyb/4EjH0G7pJ44JdoCSNBEHZEOJvf3MHTKOuUqzfo7f Ar46VDCd8eTIuQbPJGAI6hRFm/9/DvZv2EUOTDI1Fum6hI/9yMFrXf6uy7VQRLIju/Fm MQ7ia0kpuxY3uPUzqPe+3FxfN7sT68Fpfh0uIX9ou4F0ycjhd9sn/FYpc3BzvvUfAx+M Q2o2rogMqggzpCfCrnvg032OBRb+kBINa6Ky+kOZaF2NmqHyXfYXjv3U8V9QR19Fw0RP wrYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=HIwIZTxZ; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x4-20020a170902ec8400b001a20c983d1dsi2558912plg.618.2023.04.20.11.38.29; Thu, 20 Apr 2023 11:38:45 -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=HIwIZTxZ; 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 S231786AbjDTSbq (ORCPT + 99 others); Thu, 20 Apr 2023 14:31:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231328AbjDTSba (ORCPT ); Thu, 20 Apr 2023 14:31:30 -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 7BC163C27; Thu, 20 Apr 2023 11:31:29 -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 22CAF1FDCA; Thu, 20 Apr 2023 18:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682015488; 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=Y7LYG31wkiXr0z2RVLriiPlnLrwv4Qw3dEuqAPHE1Yc=; b=HIwIZTxZlCi9PZTOn04wtqJsiu2afZALKP1d+05IUbQDYVti2tms+mIB0UCiootLHzbmi5 05es4+zi03scBG50QImpj9ZPYwK+pPjgIThJC2vdVVuidZgc4TxSUj7sp3v5PegMitP6rZ s6IS9h3p+DX5wiWy7UbtBtocBrHoyDg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682015488; 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=Y7LYG31wkiXr0z2RVLriiPlnLrwv4Qw3dEuqAPHE1Yc=; b=w3yoKl+IYSZvFFG29GHh81UWinTgF6pjQSL0YVVqYtKHHdDqHHftkNGOqSNqMEpn1hNANL UJsuQz4ebNpn33Aw== 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 1382F13584; Thu, 20 Apr 2023 18:31:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Rb2TBACFQWSvNAAAMHmgww (envelope-from ); Thu, 20 Apr 2023 18:31:28 +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 4/4] nvme: Make the number iterations configurable Date: Thu, 20 Apr 2023 20:31:15 +0200 Message-Id: <20230420183121.4489-7-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?1763721219891474292?= X-GMAIL-MSGID: =?utf-8?q?1763721531029754432?= The test hard code the number of iterations certain test should run. Make this variable via the newly introduced nvme_num_iter environment variable. Signed-off-by: Daniel Wagner --- tests/nvme/002 | 2 +- tests/nvme/016 | 2 +- tests/nvme/017 | 2 +- tests/nvme/031 | 2 +- tests/nvme/037 | 2 +- tests/nvme/rc | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/nvme/002 b/tests/nvme/002 index 6b8484844b4d..c28035483514 100755 --- a/tests/nvme/002 +++ b/tests/nvme/002 @@ -20,7 +20,7 @@ test() { _setup_nvmet - local iterations=1000 + local iterations="${nvme_num_iter}" local port port="$(_create_nvmet_port "${nvme_trtype}")" diff --git a/tests/nvme/016 b/tests/nvme/016 index 4eba30223a08..c0c31a55b190 100755 --- a/tests/nvme/016 +++ b/tests/nvme/016 @@ -17,7 +17,7 @@ test() { echo "Running ${TEST_NAME}" local port - local iterations=1000 + local iterations="${nvme_num_iter}" local loop_dev local subsys_nqn="blktests-subsystem-1" diff --git a/tests/nvme/017 b/tests/nvme/017 index 0248aee9bc41..e1674508f654 100755 --- a/tests/nvme/017 +++ b/tests/nvme/017 @@ -18,7 +18,7 @@ test() { local port local file_path - local iterations=1000 + local iterations="${nvme_num_iter}" local subsys_name="blktests-subsystem-1" _setup_nvmet diff --git a/tests/nvme/031 b/tests/nvme/031 index e70898819a86..9b08ec1f6989 100755 --- a/tests/nvme/031 +++ b/tests/nvme/031 @@ -25,7 +25,7 @@ requires() { test() { local subsys="blktests-subsystem-" - local iterations=10 + local iterations="${nvme_num_iter}" local loop_dev local port diff --git a/tests/nvme/037 b/tests/nvme/037 index fc6c21343652..de9765af194b 100755 --- a/tests/nvme/037 +++ b/tests/nvme/037 @@ -14,7 +14,7 @@ requires() { test_device() { local subsys="blktests-subsystem-" - local iterations=10 + local iterations="${nvme_num_iter}" local ctrldev local port diff --git a/tests/nvme/rc b/tests/nvme/rc index 8cd89af703bb..03b66100423b 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -18,6 +18,7 @@ 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_num_iter=${nvme_num_iter:-"100"} _nvme_requires() { _have_program nvme