From patchwork Wed May 3 08:02:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 89622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1156995vqo; Wed, 3 May 2023 01:13:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5nPGIi49kxrP65gidQbPQi3AvAikpO9wvwOoh1lMiMkrwY6WrSBBfurzBtHXAcTTIWzV2Q X-Received: by 2002:a05:6a20:144a:b0:f2:e20a:c8f4 with SMTP id a10-20020a056a20144a00b000f2e20ac8f4mr1337586pzi.31.1683101637914; Wed, 03 May 2023 01:13:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683101637; cv=none; d=google.com; s=arc-20160816; b=JQQc4UkNnBLqGCqK7vQ/w/Nu9xVPSDN4YYQwgupXEAmI/TcNFHr8HanxydN7TsZcAh 9RK9LFUtTIdexlYTAMTy4DrIu1fpQnGyeItXglOhH8FDIiWzg9hxKc3SR1wxR3wkWuBN 1vskNma7T49zJ5mhNHZtiI9HgGpUFwy0xLBh8ewCTTynAhBWgZcnug82aXm3rkwymp59 sXJd+D3/XdA2vZ4mI6vrmv+i4M09v1RIp1U8kRgDVHeartwIXKuoPqkHjxGwr81Nv0LW V66rDn8JWGx+kw496mpNcGafoiG2jnG2otkkfFGDTVOB4y7h1xoPXUCMWxfSy0+xND8f QawQ== 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=W7w0k+oXuT3ygMJBORCHbE7gJuAfade3I+Yj4aO2iQ4=; b=fESsK2a/buVBBQFfboCVDKtoAJ9ao18qhQ3oLSHM3HfLZwPRMq66SYLM5VfiXrcZVv BwWI9loJf4/0KASfCNWsw+Q9UdUHIwUYL3l5qWgUrXf+eNuJmX09ouMNs0K4EU0Q3xor arnvDFIhp01fYLvyiHM1Shb1QifzM1XIp+/IfyPu+ghTZJ74KqxckkZlyWTTH+R3z3l+ l/gplSS9fsZORpDWu5JNJd+91mW7/WgOTtDHVO/ti/Rll+c94fv3gvvdACH03v9SBovv 7J6mTdCWXTDQwTyIGQZUDtfzNGWJgooOC3BiHc4DgELHuEK5wkeOpTYVkU8824J3LfcC TsxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=QnWEZFn5; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 o12-20020aa7978c000000b00628a75401bdsi32770821pfp.142.2023.05.03.01.13.45; Wed, 03 May 2023 01:13:57 -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=QnWEZFn5; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 S229554AbjECIDj (ORCPT + 99 others); Wed, 3 May 2023 04:03:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229532AbjECIDP (ORCPT ); Wed, 3 May 2023 04:03:15 -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 1E8D110F5; Wed, 3 May 2023 01:03:14 -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 C54632233D; Wed, 3 May 2023 08:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1683100992; 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=W7w0k+oXuT3ygMJBORCHbE7gJuAfade3I+Yj4aO2iQ4=; b=QnWEZFn5QsXCkwyHBQsdL6x12IWRpfaU0FhE/tNMa0MHiWKsu2XILyr1gYWyAl9B1W2rG/ 3oxlsp92hqnyMInwoHxnico5eVjAci+JoDkgH0+Izt/YEV4ztfZsRachvVQAXo8KTVD84+ bGFsNAJEJbUYNWVDL0u5p96VKsZe7PI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1683100992; 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=W7w0k+oXuT3ygMJBORCHbE7gJuAfade3I+Yj4aO2iQ4=; b=XQIMNtqZ8muZDol8RlsMpug/UOB/qwYif3FZgM1zc4yyBJsUtN04+nPYrB96tlHF/PC33z K2dG+UicqUyGAtCQ== 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 B811B1331F; Wed, 3 May 2023 08:03:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id /kHuLEAVUmQ3YgAAMHmgww (envelope-from ); Wed, 03 May 2023 08:03:12 +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 v3 05/12] nvme: Use runtime fio background jobs Date: Wed, 3 May 2023 10:02:51 +0200 Message-Id: <20230503080258.14525-6-dwagner@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230503080258.14525-1-dwagner@suse.de> References: <20230503080258.14525-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?1764859983021052745?= X-GMAIL-MSGID: =?utf-8?q?1764859983021052745?= The fio jobs are supposed to run long in background during the test. Instead relying on a job size use explicit runtime for this. Signed-off-by: Daniel Wagner --- tests/nvme/032 | 4 ++-- tests/nvme/040 | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/nvme/032 b/tests/nvme/032 index 017d4a339971..2e4b7f0760c7 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" \ + --group_reporting --time_based --runtime=-1 &> /dev/null & sleep 5 diff --git a/tests/nvme/040 b/tests/nvme/040 index 04bd726cd309..05b4f5472ef5 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -21,6 +21,7 @@ test() { local port local loop_dev local nvmedev + local fio_pid echo "Running ${TEST_NAME}" @@ -37,8 +38,10 @@ test() { # start fio job echo "starting background fio" - _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size=1g \ - --group_reporting --ramp_time=5 &> /dev/null & + _run_fio_rand_io --filename="/dev/${nvmedev}n1" \ + --group_reporting --ramp_time=5 \ + --time_based --runtime=-1 &> /dev/null & + fio_pid=$! sleep 5 # do reset/remove operation @@ -48,6 +51,8 @@ test() { echo "deleting controller" _nvme_delete_ctrl "${nvmedev}" + { kill "${fio_pid}"; wait; } &> /dev/null + _remove_nvmet_subsystem_from_port "${port}" "${subsys}" _remove_nvmet_subsystem "${subsys}" _remove_nvmet_port "${port}"