From patchwork Tue Jun 7 12:47:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12871887 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 F410AC433EF for ; Tue, 7 Jun 2022 12:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244164AbiFGMr5 (ORCPT ); Tue, 7 Jun 2022 08:47:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244182AbiFGMr4 (ORCPT ); Tue, 7 Jun 2022 08:47:56 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCF61A189 for ; Tue, 7 Jun 2022 05:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=fIIUnl2FFj3PC5UM3XNNeUdzjQLbccPKejN95eKVEjY=; b=Do0l2MqlpMQ2mzA0EkOXTJV2Zj DZSqJenmhBwOCNe9tuWwQDhAbSORQdYaG/MF1pKhvGSAwuMzbNF09HRUZLIr/L7UpIDUSIeAFixou JTPn5/NMcL9LwIdkKAAc7at4CBT3s9upYcVEAdijNQL8FIxg/9PcpRck2qusVdzvZ+XLjzQzLQk1/ l86Sq6V5Yp6HDqWpcwnusZBGkx3nG9ZaaJGsR6x2GgAiMrN9U2QTNHcHkHjmEBRQ+hHG3hTFJxzsG 8Khi+R+Bc7n5ewAdq2wSQ/nHs2/XHXhnWzH9lQp6+YAACtfMmX2MLTDHUGvTr3qd1A3Ma546qm63y Kt0RRJOg==; Received: from [2001:4bb8:190:726c:b34a:228:52ee:6d34] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyYcj-007SZY-MG; Tue, 07 Jun 2022 12:47:54 +0000 From: Christoph Hellwig To: Shin'ichiro Kawasaki Cc: linux-block@vger.kernel.org Subject: [PATCH blktests 04/13] block/029: don't require modular null_blk Date: Tue, 7 Jun 2022 14:47:30 +0200 Message-Id: <20220607124739.1259977-5-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220607124739.1259977-1-hch@lst.de> References: <20220607124739.1259977-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Drop the call to _init_null_blk and just operate on nullb1 instead, leaving the default device alone. Signed-off-by: Christoph Hellwig --- tests/block/029 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/block/029 b/tests/block/029 index dcf4024..b9a897d 100755 --- a/tests/block/029 +++ b/tests/block/029 @@ -21,25 +21,24 @@ modify_nr_hw_queues() { num_cpus=$(nproc) while [ "$(_uptime_s)" -lt "$deadline" ]; do sleep .1 - echo 1 > /sys/kernel/config/nullb/nullb0/submit_queues + echo 1 > /sys/kernel/config/nullb/nullb1/submit_queues sleep .1 - echo "$num_cpus" > /sys/kernel/config/nullb/nullb0/submit_queues + echo "$num_cpus" > /sys/kernel/config/nullb/nullb1/submit_queues done } test() { - local sq=/sys/kernel/config/nullb/nullb0/submit_queues + local sq=/sys/kernel/config/nullb/nullb1/submit_queues : "${TIMEOUT:=30}" - _init_null_blk nr_devices=0 && - _configure_null_blk nullb0 completion_nsec=0 blocksize=512 \ + _configure_null_blk nullb1 completion_nsec=0 blocksize=512 \ size=16 memory_backed=1 power=1 && if { echo 1 >$sq; } 2>/dev/null; then modify_nr_hw_queues & fio --rw=randwrite --bs=4K --loops=$((10**6)) \ --iodepth=64 --group_reporting --sync=1 --direct=1 \ - --ioengine=libaio --filename="/dev/nullb0" \ - --runtime="${TIMEOUT}" --name=nullb0 \ + --ioengine=libaio --filename="/dev/nullb1" \ + --runtime="${TIMEOUT}" --name=nullb1 \ --output="${RESULTS_DIR}/block/fio-output-029.txt" \ >>"$FULL" wait