From patchwork Thu May 11 14:09:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 92624 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp4466439rwl; Thu, 11 May 2023 07:12:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VEAdsYXMklJ1I7wTqRmAF3d3tY8BP1peoDecubTE+6WGhmiijYyv32ZhRfLVUNZ0eyB7s X-Received: by 2002:a17:902:bf0b:b0:1ac:3780:3a76 with SMTP id bi11-20020a170902bf0b00b001ac37803a76mr18628362plb.4.1683814322078; Thu, 11 May 2023 07:12:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683814322; cv=none; d=google.com; s=arc-20160816; b=vQVlP2GzhM0VaCtIIGmLTeHiqLcfWyQ8ghhAlo9mkrC5k0naBIzeqELqJiuWwogSBi WE40+sPiQPkQsQgIwabFhS4vYwYATo+1zuPCJ6AyG6DkbdN/AOef44EywC6zuCRYCJZp npT5g5EXfRUMXHJ0MMZOBE0prF1wpC+wzrBpYmeLK30BMXnnCRFfQBwJs3ZRmWa1zgU3 529WJ+L/nABdFVwsw0rCsm2xbKGaSyhAnqp4pnDLwBn5dq71bxemu9Kyb85vwkH6HZH6 HgwHKHsSY3FqX0Y2zmazNM8i/cOFzcIjrZdmzjOQG0c2blaG5yWj5VaNzb+4M4zK8/I/ HiEA== 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=blxJG8cSb9nAOdVRY3eSjODYe9Zj/GUTrxASYKRPMLY=; b=1BG0Gx/zzXAjiNbzvmauvLU5aXj+YMK08yeGp5K2VnE2de1sUHy6RR+VmqLNqED101 7jBfOs6UHVVdgZOdx1HfhZ5yYT765mIhTqfxnSaxgt2ErH27gbpJXYxLKir7niNSH+sp LqqADOd0MTWpehsyg4vsFqrBJoGP5UF7EBdZ86SBDcjSNE2dzW2FC8C4SREZLsm5g5Dc 7WJq5TzWMz3sM+3QTVmgApmO+h5IE4WUYU8+/D/RT9LZ+nhHk0o0DZ+MHRi4JW7QX8NZ meX/AODgd9sKdesr2qfRB7Rhnyko0ljquo3P89ZBRhofTSBojwCbhtW9l8kY4jKXAFIz jqUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="dM/I2q/U"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=5bHvKi+h; 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 y3-20020a170902864300b001ac91ece0dasi6488908plt.7.2023.05.11.07.11.49; Thu, 11 May 2023 07:12:02 -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="dM/I2q/U"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=5bHvKi+h; 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 S237233AbjEKOKW (ORCPT + 99 others); Thu, 11 May 2023 10:10:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238320AbjEKOKN (ORCPT ); Thu, 11 May 2023 10:10:13 -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 B2E39558B; Thu, 11 May 2023 07:10:08 -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 653321FEFE; Thu, 11 May 2023 14:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1683814207; 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=blxJG8cSb9nAOdVRY3eSjODYe9Zj/GUTrxASYKRPMLY=; b=dM/I2q/UQK2R07M7bunrP2cK3vtkIrs3oRdNXboTpYtETDyKfFgXL8EWz+ewSS4++IGBXL 0/8urNH58ilhIB1tMKcWoHES04VrZEGp6Xb7Fmg+Y03kJzDA2jzPsZUJi41gDaKW4cj+A/ amtCufaH8rrMzg6geF7AWM/DFWqXgNU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1683814207; 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=blxJG8cSb9nAOdVRY3eSjODYe9Zj/GUTrxASYKRPMLY=; b=5bHvKi+hhm7I9XfJQuEYd+NonkyMvnbkfieEJaqHqajxVhwsQXH8Pq6tyb1jziOf6WUxsf 9pwSIGxPcqUirdDA== 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 15AB4134B2; Thu, 11 May 2023 14:10:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kVEqOD73XGRmPwAAMHmgww (envelope-from ); Thu, 11 May 2023 14:10:06 +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 v4 04/11] common/xfs: Limit fio size job to fit into xfs fs Date: Thu, 11 May 2023 16:09:46 +0200 Message-Id: <20230511140953.17609-5-dwagner@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230511140953.17609-1-dwagner@suse.de> References: <20230511140953.17609-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?1765607286416256363?= X-GMAIL-MSGID: =?utf-8?q?1765607286416256363?= The usable capacity of the filesystem is less than the raw partition/device size due to the additional meta/log data. Ensure that the job size for fio is not exceeding the limits. Because we have hard coded the path where we mount the filesystem and don't want to expose this, we just update max size inside _xfs_run_fio_verify_io(). No need to leak this into the caller. Signed-off-by: Daniel Wagner Reviewed-by: Chaitanya Kulkarni --- common/xfs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/xfs b/common/xfs index 413c2820ffaf..37ce85878df2 100644 --- a/common/xfs +++ b/common/xfs @@ -37,6 +37,9 @@ _xfs_run_fio_verify_io() { sz_mb="${avail_mb}" else sz_mb="$(convert_to_mb "${sz}")" + if [[ "${sz_mb}" -gt "${avail_mb}" ]]; then + sz_mb="${avail_mb}" + fi fi _run_fio_verify_io --size="${sz_mb}m" --directory="${mount_dir}/"