From nobody Wed Dec 17 11:40:42 2025 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 F25ECC77B72 for ; Thu, 20 Apr 2023 18:31:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231658AbjDTSbj (ORCPT ); Thu, 20 Apr 2023 14:31:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230129AbjDTSb2 (ORCPT ); Thu, 20 Apr 2023 14:31:28 -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 1CDF530F2; Thu, 20 Apr 2023 11:31:27 -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 AFCCF1FD8D; Thu, 20 Apr 2023 18:31:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682015485; 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=9lIVFZmI6Kd5BjqNKBTjO2IfwGUAsCicokfMeR7skIo=; b=IQSOQLGg1asFq2ObLcZSIE9clwijfiPy0A5BmBVnz6rkYT+dqKhsycbvhb8v42OrIKBYv1 9HK6gy9rI3M/vrYh1kcCr6Wcm28Fyyv9GtNX43JxAJMpJqzJvlwZeK8vMWvfVzTA+3EjZx U4oUfDyFhvRosAIaSpsUWqH6EGfaPOU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682015485; 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=9lIVFZmI6Kd5BjqNKBTjO2IfwGUAsCicokfMeR7skIo=; b=TOVk7c5eVsbcioWCvcv4Furyspbz+giSPRZaF0xQsuc6huQ3sVKafzcbG0nrzzRcysSlre XBGpuMXZ3KwzHBBg== 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 A20E913584; Thu, 20 Apr 2023 18:31:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id PVSPJ/2EQWSjNAAAMHmgww (envelope-from ); Thu, 20 Apr 2023 18:31:25 +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 2/9] nvme: Do not hard code device size for dd test Date: Thu, 20 Apr 2023 20:31:11 +0200 Message-Id: <20230420183121.4489-3-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Read the block device sizes instead hard coding them. Signed-off-by: Daniel Wagner --- tests/nvme/014 | 10 +++++++++- tests/nvme/015 | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/nvme/014 b/tests/nvme/014 index d13cff7921da..28913641ae40 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -23,6 +23,9 @@ test() { local port local nvmedev local loop_dev + local size + local bs + local count local file_path=3D"$TMPDIR/img" local subsys_name=3D"blktests-subsystem-1" =20 @@ -41,7 +44,12 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" =20 - dd if=3D/dev/urandom of=3D"/dev/${nvmedev}n1" count=3D128000 bs=3D4k stat= us=3Dnone + size=3D"$(blockdev --getsize64 "/dev/${nvmedev}n1")" + bs=3D"$(blockdev --getbsz "/dev/${nvmedev}n1")" + count=3D$((size / bs - 1)) + + dd if=3D/dev/urandom of=3D"/dev/${nvmedev}n1" \ + count=3D"${count}" bs=3D"${bs}" status=3Dnone =20 nvme flush "/dev/${nvmedev}" -n 1 =20 diff --git a/tests/nvme/015 b/tests/nvme/015 index bb52ba2598db..2f7957caac88 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -22,6 +22,9 @@ test() { =20 local port local nvmedev + local size + local bs + local count local file_path=3D"$TMPDIR/img" local subsys_name=3D"blktests-subsystem-1" =20 @@ -38,7 +41,12 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" =20 - dd if=3D/dev/urandom of=3D"/dev/${nvmedev}n1" count=3D128000 bs=3D4k stat= us=3Dnone + size=3D"$(blockdev --getsize64 "/dev/${nvmedev}n1")" + bs=3D"$(blockdev --getbsz "/dev/${nvmedev}n1")" + count=3D$((size / bs - 1)) + + dd if=3D/dev/urandom of=3D"/dev/${nvmedev}n1" \ + count=3D"${count}" bs=3D"${bs}" status=3Dnone =20 nvme flush "/dev/${nvmedev}n1" -n 1 =20 --=20 2.40.0