From patchwork Tue Jun 7 12:47:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12871890 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 9A198C43334 for ; Tue, 7 Jun 2022 12:48:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244181AbiFGMsR (ORCPT ); Tue, 7 Jun 2022 08:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244176AbiFGMsG (ORCPT ); Tue, 7 Jun 2022 08:48:06 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2960C313B1 for ; Tue, 7 Jun 2022 05:48:03 -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=Z2CkPnYlffK5GNSK1h/kYKOR8TaKi66VozXAAmMXrbg=; b=PlEUO63RaUw8Yb05QUhE3Hw4Sm UTBtg1NEoDWZXnOOUioVlRRy2ACVDd/5me050kMg7Kdqk5CdWKNUc98F6ULu7XxUJQ0CMmbNCdyBS bvW7PWGp8LiNH5ZZ9AgkyePVYkNL24eQu/sdmDNMWphn5BUXd4IKJsD+YmJ5ibNqurnM3IKuy8JlJ t8ZY4TEI65TghHH8aqR/S7KxkvIgzOF2JUwiUf+ebRmytPzImoYS1bBUF+GMRhEUdoGsthhuicnZB 7QV30rGDs6Qkug7wjZF1WtPx9JNZuTR3Q+E7bQP2q2QM8wU6IsXoP42yjSkilik1A5jIEgC/NIku6 oc/qX+uw==; 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 1nyYcs-007SeT-DH; Tue, 07 Jun 2022 12:48:02 +0000 From: Christoph Hellwig To: Shin'ichiro Kawasaki Cc: linux-block@vger.kernel.org Subject: [PATCH blktests 07/13] block/017: convert to use _configure_null_blk Date: Tue, 7 Jun 2022 14:47:33 +0200 Message-Id: <20220607124739.1259977-8-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 Switch to use _configure_null_blk so that built-in null_blk can be supported, which implies not using the default nullb0 device. Signed-off-by: Christoph Hellwig --- tests/block/017 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/block/017 b/tests/block/017 index c84b661..8596888 100755 --- a/tests/block/017 +++ b/tests/block/017 @@ -19,23 +19,24 @@ requires() { show_inflight() { awk '{ printf "sysfs inflight reads %d\nsysfs inflight writes %d\n", $1, $2 }' \ - /sys/block/nullb0/inflight - awk '{ print "sysfs stat " $9 }' /sys/block/nullb0/stat - awk '$3 == "nullb0" { print "diskstats " $12 }' /proc/diskstats + /sys/block/nullb1/inflight + awk '{ print "sysfs stat " $9 }' /sys/block/nullb1/stat + awk '$3 == "nullb1" { print "diskstats " $12 }' /proc/diskstats } test() { echo "Running ${TEST_NAME}" - if ! _init_null_blk irqmode=2 completion_nsec=500000000; then + if ! _configure_null_blk nullb1 irqmode=2 completion_nsec=500000000 \ + power=1; then return 1 fi - dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none & + dd if=/dev/nullb1 of=/dev/null bs=4096 iflag=direct count=1 status=none & sleep 0.1 show_inflight - dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none & + dd if=/dev/zero of=/dev/nullb1 bs=4096 oflag=direct count=1 status=none & sleep 0.1 show_inflight