From patchwork Wed Oct 16 23:15:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13839044 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D956170A3E; Wed, 16 Oct 2024 23:15:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729120517; cv=none; b=VkIh6KktfD7QPgIny75hFjlplq5hhx2joktb1bQv4lXfDXBBi93ZBgdBPItbwYMRRmm7GtS9OAgdQnrIXHHU46PWVZGMAIsavi3/QZElUSEqAao5qXxpIzzKKdyvv0X+RcMZMLFNDMhyJegoX0XCfPvAgb/VtxivA3CVyoZwouY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729120517; c=relaxed/simple; bh=nPBzuVmDbErR9epDVF+Ui3A0N5zBno9pCjItZniZqYQ=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tNpCkjEkhDO0n39/IYjMqLrTbZon+Gh13NPsCPP6yiXdC0mFqytso3PbzMDp0191xY3dfQTs6LuqPC0Sih4hPbBjWrfXIAO9V+fiKbJaeeMAPzR7BOa43jdssU/m6nOKn92fT0ilxDXJ/SitS3GnajGZfdT9HV70BWnWHPjap1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bUA7Uv+u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bUA7Uv+u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A059C4CEC5; Wed, 16 Oct 2024 23:15:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729120517; bh=nPBzuVmDbErR9epDVF+Ui3A0N5zBno9pCjItZniZqYQ=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=bUA7Uv+uNagpicT+VJeoZce0pONXaiTaHqJe4ztGX5QfVpMkLS+fksUmtEWgOZ7e+ xxJ+jgxIwCLW0tKjptpfxRk1Z+I/j0wk59TByALL9nIo8N257u5DnEme6rkYuTEETh Z3sODsto4MtRwWQacHjzjmt2XL8YNr8R0AXuZ3SgJTIfyyB6GjqfvyuMTxJ46M0XAy SGEpbqZbsfDJdFVCdwxh3OM8NFPNeFqz0XqpXMePMLhUcMkGmnh40DP57svrl47par gF/Skzf/M0aZcwskhwU3RNvWj1vKBcicYpqS+yAL2M0CI/79vPYe6hY/O4MOfB/mLO pVwDMN+pom78w== Date: Wed, 16 Oct 2024 16:15:16 -0700 Subject: [PATCH 1/2] common/xfs: _notrun tests that fail due to block size < sector size From: "Darrick J. Wong" To: djwong@kernel.org, zlang@redhat.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Message-ID: <172912045609.2583984.9245803618825626168.stgit@frogsfrogsfrogs> In-Reply-To: <172912045589.2583984.11028192955246574508.stgit@frogsfrogsfrogs> References: <172912045589.2583984.11028192955246574508.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Darrick J. Wong It makes no sense to fail a test that failed to format a filesystem with a block size smaller than the sector size since the test preconditions are not valid. Signed-off-by: Darrick J. Wong --- common/xfs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/xfs b/common/xfs index 62e3100ee117a7..53d55f9907fbb0 100644 --- a/common/xfs +++ b/common/xfs @@ -172,6 +172,11 @@ _try_scratch_mkfs_xfs() mkfs_status=$? fi + if [ $mkfs_status -ne 0 ] && grep -q '^block size [0-9]* cannot be smaller than sector size' "$tmp.mkfserr"; then + errormsg="$(grep '^block size [0-9]* cannot be smaller than sector size' "$tmp.mkfserr" | head -n 1)" + _notrun "_scratch_mkfs_xfs: $errormsg" + fi + # output mkfs stdout and stderr cat $tmp.mkfsstd cat $tmp.mkfserr >&2 From patchwork Wed Oct 16 23:15:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13839045 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2081E170A3E; Wed, 16 Oct 2024 23:15:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729120533; cv=none; b=O5CU6zAz63q1sSTSFV0azlk5JkFA6hZsud7y+n6RSyT4xxHSZDqO5sxA/0nEa9+HwxGgAFHzn18zVu6grTewtmfMcnxj4iWly9oMvlr5uBKbNOCjf9PW2GQjZzwixhOpo9EcCBR9PuX/iU+D2VMmb6vWoPffHgvsP823WMYZC2g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729120533; c=relaxed/simple; bh=C5ydWRI+y/VaKF1JhhT87glGETint/k466bW9GRA2Qk=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u0dt52xLp9Di1vXRmuUk0qatVB1gLq95LiaYLJy3dbrUyd0bP2+8RL81fz5Vi5Ah+q74NIacHsWfNzbKw+RY72kk5+uosT5uavk6qOq8V9SVlLhe54Q6HMzdebFs6M7lmLYS0flqhgcntCiky16NILchp0Nkc3npu9IDpB5H2og= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=POYLrxkn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="POYLrxkn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE465C4CEC5; Wed, 16 Oct 2024 23:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729120533; bh=C5ydWRI+y/VaKF1JhhT87glGETint/k466bW9GRA2Qk=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=POYLrxknEoBMprND0QkgJ+NuSFVT9iyDUjnZ4945aK8Q8oC1+rKKT9m92Ui+K/Wzh sM5goNSpg0qghwWX2ebiKk2eXXDxAzkvV2Pv/gs5Apaux0ehCGSRGACFNNDHoR36Ul xVPp6ZGPFj+AQZA5MGSxQfaOkbZ14msGKzfECRbuc6QbVHUgi/p6d3RxnTv/h98pZE 0ZC+gPC17nmySwf6fcoPHXzvfPL7OKztmxoyUwBdBGkQeYKEFh1v3liwx0bVygTEVK Euw67oAeBN1H1wWWYcjkyYkrNfEfRr2cvjcsaleBtp2HJkGWap64P53n52JqjFhMyV C2aVDFDkySy6g== Date: Wed, 16 Oct 2024 16:15:32 -0700 Subject: [PATCH 2/2] xfs/161: adapt the test case for LBS filesystem From: "Darrick J. Wong" To: djwong@kernel.org, zlang@redhat.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Message-ID: <172912045624.2583984.16971966548333767345.stgit@frogsfrogsfrogs> In-Reply-To: <172912045589.2583984.11028192955246574508.stgit@frogsfrogsfrogs> References: <172912045589.2583984.11028192955246574508.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Pankaj Raghav This test fails for >= 64k filesystem block size on a 4k PAGE_SIZE system(see LBS efforts[1]). Adapt the blksz so that we create more than one block for the testcase. Cap the blksz to be at least 64k to retain the same behaviour as before for smaller filesystem blocksizes. [1] LBS effort: https://lore.kernel.org/lkml/20230915183848.1018717-1-kernel@pankajraghav.com/ Signed-off-by: Pankaj Raghav Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong --- tests/xfs/161 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/xfs/161 b/tests/xfs/161 index 002ee7d800dcf1..948121c0569484 100755 --- a/tests/xfs/161 +++ b/tests/xfs/161 @@ -37,7 +37,11 @@ _scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full _scratch_mount >> $seqres.full -blksz=$(_get_file_block_size "$SCRATCH_MNT") +min_blksz=65536 +file_blksz=$(_get_file_block_size "$SCRATCH_MNT") +blksz=$(( 2 * $file_blksz)) + +blksz=$(( blksz > min_blksz ? blksz : min_blksz )) # Write more than one block to exceed the soft block quota limit via # xfs_quota. filesz=$(( 2 * $blksz))