From patchwork Wed Mar 12 06:44:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012923 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D87D51BDCF; Wed, 12 Mar 2025 06:45:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761949; cv=none; b=fSGO9GvpOWkE+E2WAT/U6hDnkWaJuyOaUx8CZQpMJs48aoSPtnGgLuDiYlbcYPAJJfqjFVT0LzjiaObXZ2OZT7tcOOuv7nHCW5iDC5GoLt1OAUGSNACWVA4c4p6OLilq7D928xYgNYw/6FCE9aWk+GS51PT12Sw0PQsD0jw11Bs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761949; c=relaxed/simple; bh=ZiFK445Fm9ga15GozLcEHxKHLU6PjXIJtKvyaHCA8SQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S+ixdO9lQPUkXkaH+nOF7TXgoCVpHGah+TsMqmExLq318TsY+36JiQwWhC0OqOGonWXtpb0mbpE6xehP+0gyy58/OPHM3QalNJh2cpN6NTQO/LbxBwyz1YOMFAM+IkALmD66GoZk/Qdts91EwFleM2hd7l8sbbt3vqb2TJmWYIU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=dL6coCwZ; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="dL6coCwZ" 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=FABb7VRvCfRKUzVM44IPS4mMQGvnlut7f5XDm2RGHsU=; b=dL6coCwZl8qEjvgvdaVUl4Diqm 0X4npsp521udWJJYflJAD9pWaZCQ5tKOx1pDVJ1OEO21oycw6SsMzbI+Zl8xvHBsShciK/dSPZEKB LopO10qCvF+XfJOVaPEX0NxV17NhDoufoTYVn0fIe8NVAVV2FU/KFfPZhcNi4tezE9POJgtC+LOKC WNFN44EO49FIatccXUo4Arq6SjKJWqM4K4MxckUEgZrJjne8UIQXgU4KY2aqBp7+WPRgXdmG/XPxU Jlxuj9UkgMScLFPgKcuSVAud7yUknIxxL3fTSwIgz/YKCU6pvHCSGQaKHC8f1B2WnpH048Eyenq5k hqOUmpaw==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFqd-00000007cj0-0YMW; Wed, 12 Mar 2025 06:45:47 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 01/17] xfs/177: force a small file system size Date: Wed, 12 Mar 2025 07:44:53 +0100 Message-ID: <20250312064541.664334-2-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html This test make assumptions about the number of metadata inodes. When using small realtime group size (e.g. the customary 256MB for SMR hard drives) this assumption gets violated even with modest file system size. Force a small file system size to side-step this issue. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- tests/xfs/177 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/xfs/177 b/tests/xfs/177 index 82b3ca264140..8d23f66d51b7 100755 --- a/tests/xfs/177 +++ b/tests/xfs/177 @@ -77,7 +77,9 @@ delay_centisecs="$(cat "$xfs_centisecs_file")" sleep_seconds=$(( ( (99 + (delay_centisecs / 6) ) / 100) + 1)) echo "Will sleep $sleep_seconds seconds to expire inodes" >> $seqres.full -_scratch_mkfs >> $seqres.full +# Force a relatively small file system size to keep the number of rtgroups +# and thus metadata inodes low +_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full _scratch_mount >> $seqres.full junkdir=$SCRATCH_MNT/$seq.junk From patchwork Wed Mar 12 06:44:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012924 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E74F51E5B7F; Wed, 12 Mar 2025 06:45:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761952; cv=none; b=oVqKS0nDufyp7yxpePyzcEnYyyHMbh6al9yG17P1jCl2GFfbDO2Vxd93s0rYhieYsOkfM0OzaokKthiY/2YvHKvv6Q0DSMMJFKlKTMqnP3LQ2u/GeMgD5gtE7cnigynWzqtddghUoLXjjiqCi4AyPXXU2DmwBUNDay+/pKufS54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761952; c=relaxed/simple; bh=SDubL15RTZtwkKk0PGndGA908VZ28cUOKxKlfxUMYdU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o+ZIqqcdx6xxs6zSTh1MiPWojITQem6QWjZaoAkQx8AEFoMadVNzyVFVpNOkyGObMS9vuMjyJsSYvGOc2fDO8BU1FRMinlrO8g1mdQDrlK7UnvBlk8BI006uMToUH+oCb+E9o+C6l7O/RM9HM4qYOt7rqxcR3E/6iZdVBfT2oSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=jboxdCqJ; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="jboxdCqJ" 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=sKlz5L0Ao/eBnyjpBgYMZuxfsY67WLOtZfWFdWYW+1I=; b=jboxdCqJpu0ouxIrRFdlm1jSK5 6nQ6pTkPfnp1XywzrN5KHYj/LHB7FoqiSSQ9SeZ+Fra6DEhVQAdExjswEwMVX+O9yyDIcnyyVICZ7 j3d8eSA0GsMJk66w3yqj8dFyRYUqPyQybYglLhBM+NLz/05DkkUjHocTOVtvI+kpOO8aFCZdP4G2I MzjE6YyhZMD336htZoRM9y4sOcpl+3fUadwowRqmlVX5W6RTajUTSuc4UF5g2GMiD0CKppmagQKx6 A0Q+Z+EHIZQSbBybqoRBA5v3lV19J3n+7F1mnzapXkD92VgFgYD50ztE7BClmcFHsT4YO3/ekn17H q1Zo/Hdg==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFqg-00000007cjA-1P25; Wed, 12 Mar 2025 06:45:50 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 02/17] xfs/419: use _scratch_mkfs_xfs Date: Wed, 12 Mar 2025 07:44:54 +0100 Message-ID: <20250312064541.664334-3-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html So that the test is _notrun instead of failed for conflicting options. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- tests/xfs/419 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xfs/419 b/tests/xfs/419 index b9cd21faf443..5e122a0b8763 100755 --- a/tests/xfs/419 +++ b/tests/xfs/419 @@ -39,7 +39,7 @@ $MKFS_XFS_PROG -d rtinherit=0 "${mkfs_args[@]}" &>> $seqres.full || \ echo "mkfs should succeed with uninheritable rtext-unaligned extent hint" # Move on to checking the kernel's behavior -_scratch_mkfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs +_scratch_mkfs_xfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs cat $tmp.mkfs >> $seqres.full . $tmp.mkfs _scratch_mount From patchwork Wed Mar 12 06:44:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012925 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A8AA41E51F3; Wed, 12 Mar 2025 06:45:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761954; cv=none; b=OD+ROlkE73BfvENlfNEdxmS7IF+aRcaoEpdw4pcQRn5lXJFOw1TvfaR2/jGiaJl3wibHkTUoZ9y7D/R/81E4azd5lP8kwzCa02eSXZ+/fIQX/8Q9ZwBigkl65MDv7JNxu/YeJ99wu1knyNyqxNkpa/xhSbQBFuWRhIn2r6uNnzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761954; c=relaxed/simple; bh=ZitEwAydy+enmOnWR/0i6NXS52j6t3EL37N/HUAhGMI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U/R5tlumKNqK45Ue6VgptktyJy3r4I2cD7ECnvkJ1LF0ZV4iDWkMHbqiiluqaWD/CpdMDGMs+AL6v/0IptfY5/4rgVjn4e8rcKxD2mfKwVJDM4N5nIE+JErGXCZSuIjYH8ll8/7x4A6jUr/xFz9oA4P+DNzEAxS/pC2Pd0AM19E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=ZputGOrj; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="ZputGOrj" 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=89iPUUS8gT/28hMWv/aGcwyRVz3k80H4Guw8VAWfhVU=; b=ZputGOrjCoA2escPdkISiFgF2j l9NpKAvytQRAbhHyRHZF5Oaq0Zdfgid8j27EVayqEQc3DN6bCGEQaIhHb7J7vsBrQrhDd5aSSGyOR VOswKZdm9Nm6nckMNk352lRpcFVpE0blAAuYCdXsS7GQuNkApfPcju7Cp/7i1pcS/lpG8nAXmCJ9G I2Tgor2aOIde/e206BItFn4x5arbiPCMgjJkn0YyXyyX2RtYQvPKbhT+8EIDxEa69pcn7h0boUld1 S2hz6VpqwAywQ98AWVykVF5qNOPzpLY6f6wCC4EFlqxwEnPdr8BPAoDH46LamuL94XI26weLhwIi1 yXVCgwfw==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFqi-00000007cjf-3zE2; Wed, 12 Mar 2025 06:45:53 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 03/17] xfs/540: use _scratch_mkfs_xfs Date: Wed, 12 Mar 2025 07:44:55 +0100 Message-ID: <20250312064541.664334-4-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html So that the test is _notrun instead of failed for conflicting options. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- tests/xfs/540 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xfs/540 b/tests/xfs/540 index 3acb20951a56..9c0fa3c6bb10 100755 --- a/tests/xfs/540 +++ b/tests/xfs/540 @@ -26,7 +26,7 @@ _begin_fstest auto repair fuzzers _require_scratch echo "Format and mount" -_scratch_mkfs -r extsize=7b | _filter_mkfs > $seqres.full 2>$tmp.mkfs +_scratch_mkfs_xfs -r extsize=7b | _filter_mkfs > $seqres.full 2>$tmp.mkfs cat $tmp.mkfs >> $seqres.full . $tmp.mkfs From patchwork Wed Mar 12 06:44:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012926 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 6993A1BDCF; Wed, 12 Mar 2025 06:45:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761957; cv=none; b=uQxxULIyi2ctHvlyZoY5/EKZHtoIIUy5EeGF59tx8i8oKy6vGYhmOTGajRSjC1OzMROKU7Pi4OascOqh8IqlthCKHrL3gwop9hucjiIYcnSORTU/nIs42iiwGHUYqHf/vFbHRn/lyBcG1/U3SghkH7bODyw3EMoNTQ2AT3uG7fg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761957; c=relaxed/simple; bh=STF2JQgQZYn4CiPUmjKmtjyClZhd8AApANiHjcGqA7M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rIobwtQPqlSZm3NuSowdbF8OJMX8jWg+09a6kBY1y27vKiqNN+OdOMUzP53ZrMHFQZ23+WlzuiQrX49WmoZ+dCCLq4BgRSJqoxi0af2IayELNawwyArwIv/mHg4IQyHzsGt+NZ/0i5xMRvzPm3CjhhmUIgv3ov51kmz1nfSQ75c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=X5PSyeBS; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="X5PSyeBS" 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=F/du0xmIb6jThZo5bRLMdXsJONPyIqYddA2GCtp0F5k=; b=X5PSyeBSbiosqmSokQ9j2X8icK M2Eb2lti7bQf5NgLMobefjQnema+UbdXlKQmhN//nQahEj5i189662xmIurTzdyqht3wPMS9afksy oPBhINeX5d68Xx7xXQWlB9jKUoYo5m1n21tR2UMXryAyc6f0UNpDdXUFYenzPueTZ9T9Bzt523+rK fN4qq/kzkRCvW4t8PjyTQPe7+UpttXw/5Rbtrxck9hmHAJp1LhV7VyN/J6y3qdUaO+TNjmPcMKiLI 1B7H5xmROYdJeubs1rcOXgYWMTkl+O3pBfZpHE3cxogXGMBmj8ovCV/JlYf2wuYE74tb6x4oYEnKg arI5YclA==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFql-00000007ckJ-2LSW; Wed, 12 Mar 2025 06:45:56 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 04/17] common: extend the zoned device checks in _require_dm_target Date: Wed, 12 Mar 2025 07:44:56 +0100 Message-ID: <20250312064541.664334-5-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Also check for zoned log and rt devices in _require_dm_target Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- common/rc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/rc b/common/rc index dcdfa86e43b1..753e86f91a04 100644 --- a/common/rc +++ b/common/rc @@ -2501,6 +2501,12 @@ _require_dm_target() case $target in snapshot|thin-pool) _require_non_zoned_device ${SCRATCH_DEV} + if [ "$FSTYP" = "xfs" ] && [ -b "$SCRATCH_RTDEV" ]; then + _require_non_zoned_device ${SCRATCH_RTDEV} + fi + if [ "$FSTYP" = "xfs" ] && [ -b "$SCRATCH_LOGDEV" ]; then + _require_non_zoned_device ${SCRATCH_LOGDEV} + fi ;; esac } From patchwork Wed Mar 12 06:44:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012927 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E19CE1BDCF; Wed, 12 Mar 2025 06:45:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761960; cv=none; b=OEtHFnLmpncQ2xBx9lf47WLoDeZ0rT8CIGY54ggF4/ULUw956zilXz+BJoUqY7nMDkpM8JAQPiA0GUjlAqCTQaNUWYqGLPErw6XgbgL2xOcIOhUAjMLhqgy0X+qk3iiIxF7weOEh+mAy0xYWVHjgcrx+B3NSK3ntKViA4ifPQsE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761960; c=relaxed/simple; bh=+Xuj5VA7y01AhdIDZ/geAs3ML5Zb372MjRzV+oz/qEA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pZwO3kFc4ugMKyR1Mls2pdn00J3z4RPQ3Rde8Sc/xSw6jHELlTPfN4Q47K+f8O4tbMJtSfpTCDXY/8dg98shXgs/4tCMtEYNsw5h8cL6L0qHty4EInCHJ75kCmI8pChw97lNGl3dsmJ/0kJlj9YHPTOiPBO2ycGP9cPj4zatHFA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=J+kTwcVz; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="J+kTwcVz" 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=oXx5SGtYGzCvPp6FRQRsfdvy/uQe6idPiW6r5ocEjeQ=; b=J+kTwcVzMeimG/lShKjDk6HVvI 95q1Rkqf1flDZEZNO7EHJehuKuUk39aDFzl5slRnpLNe4ibfcqeDalhdXwLLAMTR16hdTOGLJ6J/r bp6sFubW2k4IivOYXoitM8KB8b12E3ACDQvue/t9PfDBPserFiWWlS/HEO1RfmF58dMzQo+JlagEi lHrEWaSxibdaP22b5yFdyI6zzZ7q/yxuI2fJPTkqtEoqo4xiDGXL2+XgpKNEfTcJVmPQJ3UTAuZwJ QqV9iyahFCb92eI+RihuXTe+hncP8czVcMA2GCVwpUqs0AEqX1J7uOCU5+yQ1NvukfxswxsWmu737 +muIviGA==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFqo-00000007cmG-09KT; Wed, 12 Mar 2025 06:45:58 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 05/17] common: allow _require_non_zoned_device without an argument Date: Wed, 12 Mar 2025 07:44:57 +0100 Message-ID: <20250312064541.664334-6-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html That way it can also be used for RT and log devices. Signed-off-by: Christoph Hellwig --- common/rc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/rc b/common/rc index 753e86f91a04..b0131526380a 100644 --- a/common/rc +++ b/common/rc @@ -2545,8 +2545,7 @@ _require_non_zoned_device() { local target=$1 if [ -z $target ]; then - echo "Usage: _require_non_zoned_device " - exit 1 + return fi local type=`_zone_type ${target}` From patchwork Wed Mar 12 06:44:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012928 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 F297B1E25EF; Wed, 12 Mar 2025 06:46:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761963; cv=none; b=q4mqxxUVB0P62C8XAWWQlm/lD/zI5ZEp/CUmT813Y1N8nrycp/s4QtPLbTQ8nH8h8EwiB7gG2ES6nTdHE9nZxX2VgviIejy5LeDOA+Y9SBAIsQpuyMpmeWbXNHCJeudRmgcGakoDoWNo9PudjtZA+uHBakuxMbO9NwuMHo8yCoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761963; c=relaxed/simple; bh=zRnYF4wDNyluIlU0tJZ10Erbifxt6iYxQKXppu/4r3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=es3z1oUJJM173EChJijCHaUPURpyUu8WAdI+8Y/ZeDUyKsSd/rgoIVL4ly7X64e4/mii3oDfTk82ffeAMHcxUt92mL3ylqKSJsU3dt9fblnlV3hNPTSo8bA+A2BjOqApMOKMIa9xYeWGtZzw0AUmCTJjZHw63+PVkPYT0XW/NRM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=gjCxtiGs; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="gjCxtiGs" 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=iVtJ+TeOhiuT1xOGpUqf30pNV5N0f7xe7kwsff0a894=; b=gjCxtiGs7xLE9BHveqafhWJLmB QjcoKZcaoOpEDtEWiI2oa6UfqJLQrrw51UiH1JoKpXgDoXBH+iJkWyrNYeXIzEGVMMMADsvNVkKFB VvQS/CWmDTO72g6kjPP2mfBhYPLP0rEtJMOLfIxCWkLgB3XcMZgli1E9yUGrpQu1CIwC+ILIcoFW0 g2njnTmD8x0K09h+6NHPYuzQiS0V/XpnWiQmQnv2TuNh3OVlXanOmj4pwSaHZ5SXgKdoA8IDXgUIU rZLM/q3dxNu0Jok4xjAVEIs3vJGnwqDR18uuCSoj2tUal+dab/1omJW209IRV/eyeDZaozsVAEAo7 dTnPZKjw==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFqr-00000007cnH-15hW; Wed, 12 Mar 2025 06:46:01 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 06/17] common: support internal RT device in _require_realtime Date: Wed, 12 Mar 2025 07:44:58 +0100 Message-ID: <20250312064541.664334-7-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html If SCRATCH_DEV is a zoned device it implies an internal zoned RT device and should not be skipped in _require_realtime. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- common/rc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/common/rc b/common/rc index b0131526380a..00a315db0fe7 100644 --- a/common/rc +++ b/common/rc @@ -2354,10 +2354,15 @@ _require_no_large_scratch_dev() # _require_realtime() { - [ "$USE_EXTERNAL" = yes ] || \ - _notrun "External volumes not in use, skipped this test" - [ "$SCRATCH_RTDEV" = "" ] && \ - _notrun "Realtime device required, skipped this test" + local zone_type=`_zone_type $SCRATCH_DEV` + if [ "${zone_type}" = "none" ]; then + if [ "$USE_EXTERNAL" != "yes" ]; then + _notrun "External volumes not in use, skipped this test" + fi + if [ "$SCRATCH_RTDEV" = "" ]; then + _notrun "Realtime device required, skipped this test" + fi + fi } # This test requires that a realtime subvolume is not in use From patchwork Wed Mar 12 06:44:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012929 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 512891E25EF; Wed, 12 Mar 2025 06:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761965; cv=none; b=pPiQquAvgeFwzPt33hkEkK4+D+VS86AjyVFPItHdtCAxQQ/OEKdWmfbB8AmZPF+7KIYdrLt44nZlX10B5g9CAWvZvHBy8aG34JtzLmZ2oJz7BxUCkHFhyrZ/5spyl4i2Homugn4GBeohQyaWB947oZWuDd/BqDcO/rPasGTtayQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761965; c=relaxed/simple; bh=CJw3mEUDeN05s9GTK5cAyr7DBEN8k3JNUYcnQkxqs2k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J6lx+GhZxjmY8H4PHi54gbkeXkq2RNPB52Adwnjsd0eeK0unTKX3nchJunT/MFDg3vUzHlCVTag1qoM7gjxFaJF1qErVXxZ/xpJwdaorhkS4k0bQini1u4VqatdvwFv+f9McbxvA19mAEZzXZyOzVcsgBi6uhlN9/NwkiQKCBPk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=SFCA0y4D; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="SFCA0y4D" 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=NoBGIt4bvnk2wsJvv02sGo7LMNk7ALyyQmU6RV7T2Gc=; b=SFCA0y4Dm4Yj1IgUMKl5SKcFmM ThOLbR6RcJrauZP25xUGWyofgz6x/0+/0eWWMF6xeXaCogMD/NmEsxzZHYFMw420JSKklxXlR4Rhf AxEnd8n+o4nDe6+o2BokQZgRvhgvX0s+Mmx5ayjLMu8WdPZIQHyPN/V461ubOvZqVbcgWpBCH0ch1 XWpVrRUco0QFc59oli57dfsl/USEnHXl48yjhbeu5We5V6lWCe19X/K+v/Iy+RtFHIxOdel6Trxib 0XydTIDcvQkAZzzzbsLRxrMhkNME4fxUBfHAUFTYG8KTFHDPqhGztt7SI+0ImJ575vOFSJzMT99bF ukQKQ8dA==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFqt-00000007cnr-2bwv; Wed, 12 Mar 2025 06:46:03 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 07/17] common: support internal RT devices in scratch_mkfs_sized Date: Wed, 12 Mar 2025 07:44:59 +0100 Message-ID: <20250312064541.664334-8-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- common/rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/rc b/common/rc index 00a315db0fe7..5e56d90e5931 100644 --- a/common/rc +++ b/common/rc @@ -1268,6 +1268,7 @@ _try_scratch_mkfs_sized() case $FSTYP in xfs) local rt_ops + local zone_type=`_zone_type $SCRATCH_DEV` if [ -b "$SCRATCH_RTDEV" ]; then local rtdevsize=`blockdev --getsize64 $SCRATCH_RTDEV` @@ -1275,6 +1276,12 @@ _try_scratch_mkfs_sized() _notrun "Scratch rt device too small" fi rt_ops="-r size=$fssize" + elif [ "${zone_type}" != "none" ] || + [[ $MKFS_OPTIONS =~ "zoned=1" ]]; then + # Maybe also add back the size check, but it'll require + # somewhat complicated arithmetics for the size of the + # conventional zones + rt_ops="-r size=$fssize" fi # don't override MKFS_OPTIONS that set a block size. From patchwork Wed Mar 12 06:45:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012930 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A0C231E25EF; Wed, 12 Mar 2025 06:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761967; cv=none; b=ayc/Q2KyU7ZvBmnzGlnaSDd8T+qbHs0rJ6d7JDiJwbIzTs2nFj6gdmFkDU5m6oam5CLjzijb0Ky4iEt3HGktxLIpfEJxzMe9tSjNHpfrqUovOp4NWIUPoprd5AwrXbH6fia94AZ3xZsdBpxqrOYfIWeeiZTP1BUOzLhQp9NjqZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761967; c=relaxed/simple; bh=yS+dACl+TXQCanDbmHn75Zllfk/ogkWWTNCpT89yCVg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P6A9Utj/BQAMQiE+3YkPFubNaxvFAKLq53KxrukfylCkijvg5nxeIr19gOwFYunP+i3VnUHx4zCLC77JZeKnWsv2vNKEJWdXJ6xflFyzOL5YxnL1aXbIaIjU3an1vuvZfGmuOyBVXE60/hRvV2qMPE6NGQW/PAy9bMbmO20FvEE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=SYWLGIGl; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="SYWLGIGl" 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=2qn3C9izqQGXM6HKPk3YkB346LcpSuvoklXQS6mR5D0=; b=SYWLGIGlSvvyaaN2kHNKaRaIwy GclpyGDEEy2AyE5LaAtT2rhXnuEwoGZiifhO79VZRwjJHb9sZRPTzeRX2a76sD8D8uG/HBdGVmvfD DszPi7wKYn8/j9BjMIIWzR9PGwq8j4b7jB1u9g3tqq8+tx/G6YzcS/NohbW5YZI0uuzInzY1P+KKi lkTY8SFZTXW6yvp3/WUGxX2++D3FpTELoxghRJk8faQpwNKGKKCpBA6i2VpuwVLEPZAwx8IgtHrfm jpc4+3WyiKZdx4CZQgYUkBqDEi+6tid7NQ4hHGILyRkM6zX2j3zQftcq/SMzugD8F3Y3gJgBpydD6 yc8S0Z+Q==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFqv-00000007col-3xvc; Wed, 12 Mar 2025 06:46:06 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 08/17] xfs: check for zoned-specific errors in _try_scratch_mkfs_xfs Date: Wed, 12 Mar 2025 07:45:00 +0100 Message-ID: <20250312064541.664334-9-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Check for a few errors issued for unsupported zoned configurations in _try_scratch_mkfs_xfs so that the test is not run instead of failed. Signed-off-by: Christoph Hellwig --- common/xfs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/xfs b/common/xfs index 93260fdb4599..807454d3e03b 100644 --- a/common/xfs +++ b/common/xfs @@ -160,6 +160,11 @@ _try_scratch_mkfs_xfs() grep -q crc=0 $tmp.mkfsstd && _force_xfsv4_mount_options + grep -q "zoned file systems do not support" $tmp.mkfserr && \ + _notrun "Not supported on zoned file systems" + grep -q "must be greater than the minimum" $tmp.mkfserr && \ + _notrun "Zone count too small" + if [ $mkfs_status -eq 0 -a "$LARGE_SCRATCH_DEV" = yes ]; then # manually parse the mkfs output to get the fs size in bytes local fs_size From patchwork Wed Mar 12 06:45:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012931 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 00DDD1E7C25; Wed, 12 Mar 2025 06:46:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761970; cv=none; b=QValK25AVTJpt9tkZ2FqFi1BrN3fLl6t1uk+AhuxFZ/hlecyOsXNLTpeoasfWD9c3nUY0UyQfgfy7jmTOJ5kx8hu8VyseAMINZa0MJKuuJkVsROIkY6Set8nIA/5xP+sfBZWWJsFqOCau9lPX8nepi+jpSXA/7B0tsOTjETAQqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761970; c=relaxed/simple; bh=hQJiIJYQ/lRknS6QBZlbWwm+hPWNd3gzckYFSOkaryc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DMwSWNix3lwWx/l0JyEGAzDfkfl2dAItJAXQRC2t5uRC4Z8uRg03IL9pgMELRBWebW/BbG2keaDCNIf9rlj3kUc7kaZSOXnEEww5rrijAdyt1okrIMthjuNka4nWMX8l3oxwLjWtBwB5HmtS6I8h84xtTvf+KCGhW/pwfrJtgUE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=EPML3Wic; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="EPML3Wic" 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=4dwuBGVi+62Qz36Zo2gYuYWNmA71hzYu9DyGavELtRw=; b=EPML3WicB4EMYE9RDAcXWhKpFf wePOTaruKzMl47qQNcVdG9XeqnvyDL9a+hsPwO+P/tt/9bjsnNKMXO4tde2ahhBKyi0rRHfhWstMU pFFjMcpAck7sF8KGkB6gEjQYHxOOYxnzt6GN+i8hI/TJPfXlk9MBowC/0qib9oqd3ld5t7VJKiC/v nUiHTo4gM7wCCf0+2wj2OUHQGfEiDCC9OAhgdgOdTAyNa+UsWKj9fwi7YZ/CqH6NwwXcGRDnNXTSQ o9QmYjhe1r3X10d+nBuP6Jz4z/eTho6O+SuYlmLECExESZY8uQH3qjPTAqVoA2xEsxWz3rnCNyVcC 0Zn/Ef/g==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFqy-00000007cpd-19ra; Wed, 12 Mar 2025 06:46:08 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 09/17] common: notrun in mkfs_dev for too small zoned file systems Date: Wed, 12 Mar 2025 07:45:01 +0100 Message-ID: <20250312064541.664334-10-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Similar to the regular scratch_mkfs, skip the test if the file system would be so small that there's not enough zones. Signed-off-by: Christoph Hellwig --- common/rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/rc b/common/rc index 5e56d90e5931..e664f3b81a6b 100644 --- a/common/rc +++ b/common/rc @@ -910,6 +910,10 @@ _mkfs_dev() { local tmp=`mktemp -u` if ! _try_mkfs_dev "$@" 2>$tmp.mkfserr 1>$tmp.mkfsstd; then + grep -q "must be greater than the minimum" $tmp.mkfserr && \ + _notrun "Zone count too small" + grep -q "too small for zoned allocator" $tmp.mkfserr && \ + _notrun "Zone count too small" # output stored mkfs output cat $tmp.mkfserr >&2 cat $tmp.mkfsstd From patchwork Wed Mar 12 06:45:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012932 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 C4ACD1E8328; Wed, 12 Mar 2025 06:46:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761973; cv=none; b=FvpMuzVTwZA8ZhdJKHXS+Gq6CfCSggkQg+CtE/cqCMeeObKJoTboAesVTQSvxEbOXDvgq1RWMt74SlyNTjcD4dicj3qBnfT7pFEI6JZhlJuJzMhhnGqoBxf+DMWDQdsKVEPNVUv1QaDzN42hQBbEPPigxY+Ayh9zuTz5PRiRWEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761973; c=relaxed/simple; bh=4980ixdozEiR9fAIVkseNO0wNhSB6I11xEnmLmqNyEI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TB/bRN250su7pO7Z2anARXz+KWGKr0HNhyJohv8SaOQS+xb0AICSKdGE8I9G1MRyx+2Gmb43mqHwWW2OLbNkK9BXfDFwhRpkhJkcqomS1CW7Cxo3p5EUpDcYatz6CuWtBN8n2YKbZzSpBSbWiBQH4JuXIctat/BwXx5OxWdZaGg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=KJqPF3dL; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="KJqPF3dL" 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=3QrNdjHatguZTK2DgQdbRVlgjCB7NzRbrigeYh2AFLA=; b=KJqPF3dLl1FB5beArzN2GYgm/z AePuExHGULswvlm2uYWj0bFICJZ3TIhxk/zRsDiDsymlNfSZrNXZ14Oor9VCfvapRZY3SuF0pKb20 uu1NJ8/yc45KZtPIsC8PV5Ca2XY4spiqSmyUTgg1l9r6dlb8XMk+0U4VXM25lgSBmYHjYbcFvkLBY yUPIlJqGHhSOAjg6AlMbOBh9fxNCnnACQ4NRCLCJ0i74TA+oVg+/QQD8rByyb3ju8IZlD/Z8MDVOB 0aFV9NFZp7OFFQISM92VD/GX9xk6PAizZ09whqr5mGB0z4gll+LP08KaGWKvxQdghLpsjfzzW1czy UtxQCVXg==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFr0-00000007cq7-3lC5; Wed, 12 Mar 2025 06:46:11 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 10/17] xfs: add helpers to require zoned/non-zoned file systems Date: Wed, 12 Mar 2025 07:45:02 +0100 Message-ID: <20250312064541.664334-11-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Looking at the max_open_zones sysfs attribute to see if a file system is zoned or not, as various tests depend on that. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- common/xfs | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/common/xfs b/common/xfs index 807454d3e03b..86953b7310d9 100644 --- a/common/xfs +++ b/common/xfs @@ -2076,6 +2076,33 @@ _scratch_xfs_force_no_metadir() fi } +# do not run on zoned file systems +_require_xfs_scratch_non_zoned() +{ + if _has_fs_sysfs_attr $SCRATCH_DEV "zoned/max_open_zones"; then + _notrun "Not supported on zoned file systems" + fi +} + +# only run on zoned file systems +_require_xfs_scratch_zoned() +{ + local attr="zoned/max_open_zones" + local min_open_zones=$1 + + if ! _has_fs_sysfs_attr $SCRATCH_DEV $attr; then + _notrun "Requires zoned file system" + fi + + if [ -n "${min_open_zones}" ]; then + local has_open_zones=`_get_fs_sysfs_attr $SCRATCH_DEV $attr` + + if [ "${min_open_zones}" -gt "${has_open_zones}" ]; then + _notrun "Requires at least ${min_open_zones} open zones" + fi + fi +} + # Decide if a mount filesystem has metadata directory trees. _xfs_mount_has_metadir() { local mount="$1" From patchwork Wed Mar 12 06:45:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012933 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 4D4C62BD04; Wed, 12 Mar 2025 06:46:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761975; cv=none; b=NacVySNseuq8+ilQZIho9UfBayGG1FH9EI4glFcnUhIKr5IDqKpuperGvrb5baOdH1Ft5AAJECFnMVfTC3CkwyW6UJiZQk/ONnzGuaVR7rs2QJXPicuqTYCqK/2vwBheQvTUeu7YH3znvuH7isUcKvQ1xUDSjG9jpe9AXHqwLpU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761975; c=relaxed/simple; bh=djI54cs6Y27ELEuS935js1Ady9bp9dSUrgtkkRBZVHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=unWbaWFizOFlYB/15bhiYrKVUq/JO1rSK2mJs8/PIIWR3wazPfIGSo1iHHHrjocd8D5XIlKOMn3F7s5tqyZDEznEYaECO7EH7i5Mkk6FMDUI3K16FrfPMvrwZx6W3SxpBAb2joUK21YE4wXcDnfdGQisANNbdwsOqQv4dMD3UjU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=xpzJ0A2C; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="xpzJ0A2C" 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=XLcExoIypM6eS3i9VS+syGVAyQeAHMZsk/AiQmE07b8=; b=xpzJ0A2CuiiVUPMWrvMIEd6aGI R1CsMQysvvFcOYKHWWijJO9QWxaEGkmLLUq43kfrgzzLka13eYWpoDtDUQA+8IAU/oPPSINHrgSpm 0kyUVY16KwQ4Lvr3HH5X/Z1q8x+QlLsutJOWvIuoEV9pDkpgULWG6MlMmkkZ9UlA92cMqKmXrMhWp ChHYdRIXQzWgWVD3EmZW9322PlIUndSNIsJ46gqcvqGzAfynEE1dmHfGs8MCifk2LIcyGyIG2Q2R3 XhtG+mtDd0HzYGWiAlBvOyCQ1+6kFonqrSn0E5oji/i9DdUMDnyygXuI5rgN2Fg0xm8QA1aj/WRbr lj1eOcog==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFr3-00000007crf-2alh; Wed, 12 Mar 2025 06:46:13 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 11/17] xfs: handle zoned file systems in _scratch_xfs_force_no_metadir Date: Wed, 12 Mar 2025 07:45:03 +0100 Message-ID: <20250312064541.664334-12-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Zoned file systems required the metadir feature. If the tests are run on a conventional block device as the RT device, we can simply remove the zoned flag an run the test, but if the file systems sits on a zoned block device there is no way to run a test that wants a non-metadir file system. Signed-off-by: Christoph Hellwig --- common/xfs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/common/xfs b/common/xfs index 86953b7310d9..a18b721eb5cf 100644 --- a/common/xfs +++ b/common/xfs @@ -2054,6 +2054,12 @@ _scratch_xfs_find_metafile() # Force metadata directories off. _scratch_xfs_force_no_metadir() { + _require_non_zoned_device $SCRATCH_DEV + # metadir is required for when the rt device is on a zoned device + if [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ]; then + _require_non_zoned_device $SCRATCH_RTDEV + fi + # Remove any mkfs-time quota options because those are only supported # with metadir=1 for opt in uquota gquota pquota; do @@ -2074,6 +2080,11 @@ _scratch_xfs_force_no_metadir() if grep -q 'metadir=' $MKFS_XFS_PROG; then MKFS_OPTIONS="-m metadir=0 $MKFS_OPTIONS" fi + + # zoned requires metadir + if grep -q 'zoned=' $MKFS_XFS_PROG; then + MKFS_OPTIONS="-m zoned=0 $MKFS_OPTIONS" + fi } # do not run on zoned file systems From patchwork Wed Mar 12 06:45:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012934 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 BA32E2BD04; Wed, 12 Mar 2025 06:46:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761978; cv=none; b=MG1GmEcfaFRJQnZLDADnNDLzEzKaiX2JGLm+avtRJl5s1uObCkUVtQ1uuhKd4/APdXCJSv1NTuhpAfhpEYesBzXJgHMV6D1Y0sGv+7Tue1DfH5PxYlWbX+uNB4WT648Wl/wflXYluQ9vUKiKPOe0v3a1GQhPYHElx0vDj4fLums= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761978; c=relaxed/simple; bh=mST0+OMiKJS3fvOBvJpZTUNJNNWGVJLWhpKVqKVZyqQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pyAN5kEbC44iEBq0rVW5T+zSt5SHhqNj/EETDxfhpdr6XOmb9dSr7/Re/8jlSLzagli3bA4S/Dtw7Iz66OrSGc9tolMvByUQlh1j1ppGSfTdxKLFDxzJCpauwRlV67QBrzO7WnGXio3vswO55jGzeHL3rNxu7GVN05OaUT5wJiE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=EgjWsrKk; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="EgjWsrKk" 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=E+UWIYZFw1uPodkdbF9/zV+7/kxfhAmXUP4hN9C5c5Q=; b=EgjWsrKkiaFgMfK0dPLzX3xmJ5 Kwanj825IaqGRQmXK12jdQrAHAS2ecB/IOSiwpqtwjD2OXPHaoQ1QwjAMSbgm3hkQVdWJbeD+BZTW Pi6XGC/6X68pCtNa2t9HbQpvmbJntsmgOJTJu5gV9BIrBoBsxOyLLK1MISwZETB25InF/kbh5ZFgA yRTVe7EeZVhlcaoSc7OI4UbZj3Fo/ho1Q3wA+mur5I0Wi5pVCVE0UwlRQlT/lcspPwiG+TRQRwpJJ KGE3Pu/enAmgCjqz4bjmlPTRwbbKDpnVFYYxIhunCTUVVnLs57M5dilUXxqni3O7PbBjTZKYvXY0H e/6d97JA==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFr6-00000007csh-0EPQ; Wed, 12 Mar 2025 06:46:16 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 12/17] xfs: no quota support with internal rtdev Date: Wed, 12 Mar 2025 07:45:04 +0100 Message-ID: <20250312064541.664334-13-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Same as regular zoned, but the previous check didn't work. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- common/xfs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/xfs b/common/xfs index a18b721eb5cf..3f9119d5ef65 100644 --- a/common/xfs +++ b/common/xfs @@ -2210,7 +2210,10 @@ _xfs_scratch_supports_rtquota() { # can check that quickly, and we make the bold assumption that the same will # apply to any scratch fs that might be created. _require_xfs_rtquota_if_rtdev() { - test "$USE_EXTERNAL" = "yes" || return + if [ "$USE_EXTERNAL" != "yes" ]; then + xfs_info "$TEST_DIR" | grep -q 'realtime.*internal' && + _notrun "Quota on internal rt device not supported" + fi if [ -n "$TEST_RTDEV$SCRATCH_RTDEV" ]; then _xfs_kmod_supports_rtquota || \ From patchwork Wed Mar 12 06:45:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012935 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 14B262BD04; Wed, 12 Mar 2025 06:46:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761980; cv=none; b=Mg4+LtJ7N+NL1Q1MAve6lB8Wn1AuP60+aB4t4/KsRwfu7FpSr5D0Zt0g7g1OK45SQ8gfeoujOvt4kpXedaPZr6+ROX0B23b8+1XrG6rXwdB7k+KUmpGDLEzzsfTXHkflJ1XKVMKXTOq+y67PbbndDwthECkIyE34j/TjmJ0LcoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761980; c=relaxed/simple; bh=q1Kcq+rUyPgX4uOQTsir7qgmyP3zf+2z6Xsjt60s2xY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UmCpQo04Idzvq8pqlUf+oP/m+wGEWnYM46tHzQdHNJEnrbfKKyGc6M4n5mdev+waj1b0jscTqO5aXcXsMAaxIqDNTqksU81apur9Fg+smWpJrkFM8gjO3WExVR5mgJdQkQmMTIbaEbkp+PDe2r8jg2AYA8mthxCX7UXUOabeMkI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=gPq0Es55; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="gPq0Es55" 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=2059WEcHa65hXCx3Ivv7mvrmkON9tnHf2OL0ocGIyyc=; b=gPq0Es55nii7xg41m7AZFTQZ2a JxmchLzz2Gv63PJByJgQH9KshWhSqhdxCiR19JLm36slqmBzUaTYq6VoF22I5k4E27RyAf7jIl8yl oD9yjK5ZH61DLPsXpasIz3FnNTSnw/45UafVE2Tiw7w9FpxClI+/x+x41g7d2RvB5YvEn73w3BKlb EzV/0rIs7aCn6PqF4aB90QJ8RZjIcxcBs0AcH3NBdINItlvjM1PXotJo0+IG5j7mKYUV0g8p9qlDD 5z8gy3iIU+drwcgp5NDj0hV+rWTSxemIRk/3B4UN4bBdgZ5a5G33omLiccaLzvHFpmlPifzPrg26h pstt2+Qw==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFr8-00000007ctY-1xZ8; Wed, 12 Mar 2025 06:46:18 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 13/17] xfs: xfs_copy doesn't like RT sections Date: Wed, 12 Mar 2025 07:45:05 +0100 Message-ID: <20250312064541.664334-14-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html internal or external.. Signed-off-by: Christoph Hellwig --- common/xfs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/xfs b/common/xfs index 3f9119d5ef65..7756c82cf0e5 100644 --- a/common/xfs +++ b/common/xfs @@ -1561,6 +1561,9 @@ _require_xfs_copy() [ "$USE_EXTERNAL" = yes ] && \ _notrun "Cannot xfs_copy with external devices" + xfs_info "$TEST_DIR" | grep -q 'realtime.*internal' && + _notrun "Cannot xfs_copy with internal rt device" + # xfs_copy on v5 filesystems do not require the "-d" option if xfs_db # can change the UUID on v5 filesystems touch /tmp/$$.img From patchwork Wed Mar 12 06:45:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012936 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 9D0FB2BD04; Wed, 12 Mar 2025 06:46:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761982; cv=none; b=EindYgXb39fXng0bKP7LOhJXsvDD3Pu7r/ieBCcpegRcLlXU4cgPOC6ULwCAgATJSoNrhHGFwEu4OMEQutDzk+QjzcrV9TzQHm4iPe5vli2Zqj9RoFr5OGhHFfhPhJy6E1s871aSqIdXdUxCwPW8WFETyeR0CIuW7sN2q2aXKMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761982; c=relaxed/simple; bh=8/ogB9bfCR35xQTfrmkb+xVCT2D6JNUDUB6diz6zlJE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aJmADeLjrq4Lny/0hz5GGBQ7kc2fGHASemEarpBI0BHLBYKgYUdF+e14UgTo8dZfZ99CSJbLiaDMfDDprsUJl9Ko44TiyUhwRA8ZCm/inRXlY/QFtBjp0+eyYIQXQJsUEKQg/IIZjb1uWpvejO4+18/k45oORnbYdg84jqmw01U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=IgOrRQVa; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="IgOrRQVa" 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=nxEnUdpFIXWRvVmdlWPtE3Rp+e3KUwAIqUkd8G4VSKk=; b=IgOrRQVaQ/8Cbs37wVKcScrjIC tmFsNyrUT7N2bwM+0YUwhKsPEQ6gPhd96WKaamhZv0xCs9SYd8JRb45rzkNPI0XvNPYSEjzkBgFyf keOdfJZLjJxgGxLphOfGZR5pQqO3xCVnTmBJ6rCXbxuCUvg8baPGeFscDmTgMfB3DU8FMwT2zKWyq nFFwkty2x0eM1GAbogBBOKYeWIjtNLXCu4KQ4tVE50sFBjShWeVaXBTUVASXQvsAVhtZp6XU20aJm kmRUWYJ5/KALWUzSlN9XB3mGaVzFjFc8H4dBGnjmZVKfU2gnutFfNHpsFcfIa4tZM2H2i/06TcHfU +/NJrtOg==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFrA-00000007ctv-3Fe5; Wed, 12 Mar 2025 06:46:21 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 14/17] xfs: skip filestreams tests on internal RT devices Date: Wed, 12 Mar 2025 07:45:06 +0100 Message-ID: <20250312064541.664334-15-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html The filestreams tests using _test_streams force a run on the data section, but for internal RT zoned devices the data section can be tiny and might not provide enough space. Skip these tests as they aren't really useful when testing a zoned config anyway. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- common/filestreams | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/filestreams b/common/filestreams index 00b28066873f..bb8459405b3e 100644 --- a/common/filestreams +++ b/common/filestreams @@ -108,6 +108,11 @@ _test_streams() { _scratch_mount fi + # Skip these tests on zoned file systems as filestreams don't work + # with the zoned allocator, and the above would force it into the + # tiny data section only used for metadata anyway. + _require_xfs_scratch_non_zoned + cd $SCRATCH_MNT # start $stream_count streams From patchwork Wed Mar 12 06:45:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012937 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A20911E5716; Wed, 12 Mar 2025 06:46:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761986; cv=none; b=gj0lQ0g+Eo5m9CBYxoeqQ6oylhHxUvvssulgxfuyJqoman/cNH7CY/35XAd2eYHzNm6oXNxbSZzkjNSMYxNW/o9NUcHOGfn9qfBSIAqzl3MKzr4uwIkXP4ZG2Ey1RE/iePgAhjyKXNFV3a8iElbFD5T3jwEZyq7ZcPSbOt8nMF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761986; c=relaxed/simple; bh=CWi+Fa6r0ay8bZL2ZNxHmQkGQ1EoN6e9pNpSZtYSTfs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JXU700lzCqHPzRPH88m2WJgj5ieqifrnFVGTEVZ8MC9FOvBuHm0lGlcQptpm4CELjA+NYQZRoauW1TDbsgArQvuL5StLV6ANMDQFHVToF6mcgPcCmcUbdR2vMA812d5knr3gbVX7jwfViSpv6ZNZIS+ccoT9rL1u4uM/gYrixxY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=4IvAS9k5; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="4IvAS9k5" 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=tt9gg9wMTMis5LZkSR9MQwPu5IDUyZBP2pyI5aCZdz0=; b=4IvAS9k5f2PbgEJoBMKMGHIeXI 8x8AJIivIxw3OhJQi7nLGFtG+s1TATFtTiW1TSjeBUFmYtYADb7DOiASqCFeQE3jiN8w0P5rT0/GF K9vy7mXrE1fZw3GXgq9LhByH3cXTrPqNZSXsPbKjttaN7XCjxNJFb1ctbjKJquD3i/8MA327OQOJO 8aW7iVG2he3QHX6O3v/CLwP2BAYFaqlrcy3rhhDe452a52mnNJoUQjzeJtaXWYi0/+QtPtgf+WCj+ /ToBxG3vPY6uOwToDDoRtKqnLPLofyWt4FeLCGYLehyy6SgiKXgDitatPiOFJen8Mc2JF8utBewNv WGQqnAKA==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFrE-00000007cvL-2g8o; Wed, 12 Mar 2025 06:46:25 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 15/17] xfs: skip various tests on zoned devices Date: Wed, 12 Mar 2025 07:45:07 +0100 Message-ID: <20250312064541.664334-16-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Various tests don't work with underlying zoned devices because either the device mapper maps don't align to zone boundaries, or in one case the test creates an ext2 file system that doesn't support zoned devices. Signed-off-by: Christoph Hellwig --- tests/xfs/049 | 2 ++ tests/xfs/311 | 3 +++ tests/xfs/438 | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/tests/xfs/049 b/tests/xfs/049 index cdcddf76498c..07feb58c9ad6 100755 --- a/tests/xfs/049 +++ b/tests/xfs/049 @@ -40,6 +40,8 @@ _require_scratch_nocheck _require_no_large_scratch_dev _require_loop _require_extra_fs ext2 +# this test actually runs ext2 on the scratch device +_require_non_zoned_device $SCRATCH_DEV echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seqres.full echo "" >> $seqres.full diff --git a/tests/xfs/311 b/tests/xfs/311 index 8b806fc29eb1..e8fc547cc4b4 100755 --- a/tests/xfs/311 +++ b/tests/xfs/311 @@ -30,6 +30,9 @@ _cleanup() _require_scratch _require_dm_target delay +# The dm-delay map added by this test doesn't work on zoned devices +_require_non_zoned_device $SCRATCH_DEV + echo "Silence is golden." _scratch_mkfs_xfs >> $seqres.full 2>&1 diff --git a/tests/xfs/438 b/tests/xfs/438 index 6d1988c8b9b8..d436b583f9d1 100755 --- a/tests/xfs/438 +++ b/tests/xfs/438 @@ -96,6 +96,13 @@ _require_user _require_xfs_quota _require_freeze +# +# The dm-flakey map added by this test doesn't work on zoned devices +# because table sizes need to be aligned to the zone size. +# +_require_non_zoned_device $SCRATCH_DEV +_require_non_zoned_device $SCRATCH_RTDEV + echo "Silence is golden" _scratch_mkfs > $seqres.full 2>&1 From patchwork Wed Mar 12 06:45:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012947 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B8D991E5716; Wed, 12 Mar 2025 06:46:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761991; cv=none; b=gTuUeIduy8wXYVE7hZe6kwIG8ASvqtq/MsUr49tRun5hBjKtrmtrImldRmb/j0sD20vQLkYyToR+ZZz9hPJcWPTOWVyPzwGtbZ12n8a+/vydsleuls/5ltnf2+Iv5Q4SP3+f96zzxjwxF5wNDkzfU7q9mF15BEEs9nsCg6wO99s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761991; c=relaxed/simple; bh=zDC6cpp5HFrfDTt+iU5Qmb65jD8P59RQOMSLuK864ic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=P+RciSAexMBoLk0ONdb6S2PgeCZnhmU6FH7qmH0/EGivNidegbyVgEXhIhQ469UC9Nz0l4SjNXbiJi5qicyywmb9lDTZr+QObCpfzjxeMQtc9FWi19AlQtzEA4EwwC9Zb00WkgAc6upA2HKcESox16LFRWlVR9LSefko6CaAXNM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=3iDRaqTO; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="3iDRaqTO" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=ZOVb6koitkE1JUcpNWqVRAyps0IKE4mUivigBPMuwfo=; b=3iDRaqTOuYkppiG9+BHAHK8Cy/ dRkqnVGBljmJCt5q+vZQGRYRYgIcw5GO0XvFTX+aqAyLd9fRo+w5+kzchOCjYms2uQXFa6lhYNMCv DjFavbBfWtScEFOdb7CqKlZ05kmWlxYChis1fsjWHA9oaV4Oa996KZoQDyS18WKxX+sz6zoYwHGmP 9VSkewRRy+nie1UhsYSzfzCZtjWZRlHCEC+oMkNzlhp6K9CveQRcF68a5Tz6hSjrYPJB/RdTiJUBZ Ti23usz57IKDT9nOS9YcDr1+Eg+oQ5aMGqnvHcDjrIyVSiXj5kwXJKfkQeBCIyLmEATN8RwhFDUxz WGEj7zuw==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFrI-00000007cwJ-36bt; Wed, 12 Mar 2025 06:46:29 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 16/17] xfs: skip various tests when using the zoned allocator Date: Wed, 12 Mar 2025 07:45:08 +0100 Message-ID: <20250312064541.664334-17-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Various file system features tested are incompatible with the zoned allocator. Add a _require_xfs_scratch_non_zoned to guard them. Signed-off-by: Christoph Hellwig --- tests/xfs/015 | 7 +++++++ tests/xfs/041 | 5 +++++ tests/xfs/272 | 5 +++++ tests/xfs/276 | 5 +++++ tests/xfs/306 | 4 ++++ tests/xfs/419 | 3 +++ tests/xfs/449 | 3 +++ tests/xfs/521 | 3 +++ tests/xfs/524 | 4 ++++ tests/xfs/540 | 3 +++ tests/xfs/541 | 3 +++ tests/xfs/556 | 13 +++++++++++++ tests/xfs/596 | 3 +++ 13 files changed, 61 insertions(+) diff --git a/tests/xfs/015 b/tests/xfs/015 index acaace0ce103..ddb3e0911813 100755 --- a/tests/xfs/015 +++ b/tests/xfs/015 @@ -38,6 +38,13 @@ _require_scratch # need 128M space, don't make any assumption _scratch_mkfs >/dev/null 2>&1 _scratch_mount + +# This test tries to grow the data device, which doesn't work for internal +# zoned RT devices +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi + _require_fs_space $SCRATCH_MNT 196608 _scratch_unmount diff --git a/tests/xfs/041 b/tests/xfs/041 index 780078d44eeb..6cbcef6cfff0 100755 --- a/tests/xfs/041 +++ b/tests/xfs/041 @@ -44,6 +44,11 @@ bsize=`_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 | _filter_mkfs 2>&1 \ onemeginblocks=`expr 1048576 / $bsize` _scratch_mount +# Growing the data device doesn't work with an internal RT volume directly +# following the data device. But even without that this test forces data +# to the data device, which often is tiny on zoned file systems. +_require_xfs_scratch_non_zoned + # We're growing the data device, so force new file creation there _xfs_force_bdev data $SCRATCH_MNT diff --git a/tests/xfs/272 b/tests/xfs/272 index 0a7a7273ac92..aa5831dc0234 100755 --- a/tests/xfs/272 +++ b/tests/xfs/272 @@ -29,6 +29,11 @@ echo "Format and mount" _scratch_mkfs > "$seqres.full" 2>&1 _scratch_mount +# The synthetic devices for internal zoned rt devices confuse the parser +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi + # Make sure everything is on the data device _xfs_force_bdev data $SCRATCH_MNT diff --git a/tests/xfs/276 b/tests/xfs/276 index b675e79b249a..2802fc03c473 100755 --- a/tests/xfs/276 +++ b/tests/xfs/276 @@ -32,6 +32,11 @@ _scratch_mkfs | _filter_mkfs 2> "$tmp.mkfs" >/dev/null cat "$tmp.mkfs" > $seqres.full _scratch_mount +# The synthetic devices for internal zoned rt devices confuse the parser +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi + # Don't let the rt extent size perturb the fsmap output with unwritten # extents in places we don't expect them test $rtextsz -eq $dbsize || _notrun "Skipping test due to rtextsize > 1 fsb" diff --git a/tests/xfs/306 b/tests/xfs/306 index 8981cbd72e1c..e78493784233 100755 --- a/tests/xfs/306 +++ b/tests/xfs/306 @@ -33,6 +33,10 @@ unset SCRATCH_RTDEV _scratch_mkfs_xfs -d size=100m -n size=64k >> $seqres.full 2>&1 _scratch_mount +# When using the zone allotator, mkfs still creates an internal RT Ń•ection by +# default and the above unsetting SCRATCH_RTDEV of doesn't work. +_require_xfs_scratch_non_zoned + # Fill a source directory with many largish-named files. 1k uuid-named entries # sufficiently populates a 64k directory block. mkdir $SCRATCH_MNT/src diff --git a/tests/xfs/419 b/tests/xfs/419 index 5e122a0b8763..94ae18743da9 100755 --- a/tests/xfs/419 +++ b/tests/xfs/419 @@ -44,6 +44,9 @@ cat $tmp.mkfs >> $seqres.full . $tmp.mkfs _scratch_mount +# no support for rtextsize > 1 on zoned file systems +_require_xfs_scratch_non_zoned + test $rtextsz -ne $dbsize || \ _notrun "cannot set rt extent size ($rtextsz) larger than fs block size ($dbsize)" diff --git a/tests/xfs/449 b/tests/xfs/449 index a739df50e319..d93d84952c6a 100755 --- a/tests/xfs/449 +++ b/tests/xfs/449 @@ -38,6 +38,9 @@ fi _scratch_mount +# can't grow data volume on mixed configs +_require_xfs_scratch_non_zoned + $XFS_SPACEMAN_PROG -c "info" $SCRATCH_MNT > $tmp.spaceman echo SPACEMAN >> $seqres.full cat $tmp.spaceman >> $seqres.full diff --git a/tests/xfs/521 b/tests/xfs/521 index c92c621a2fd4..0da05a55a276 100755 --- a/tests/xfs/521 +++ b/tests/xfs/521 @@ -43,6 +43,9 @@ export SCRATCH_RTDEV=$rtdev _scratch_mkfs -r size=100m > $seqres.full _try_scratch_mount || _notrun "Could not mount scratch with synthetic rt volume" +# zoned file systems only support zoned size-rounded RT device sizes +_require_xfs_scratch_non_zoned + testdir=$SCRATCH_MNT/test-$seq mkdir $testdir diff --git a/tests/xfs/524 b/tests/xfs/524 index ef47a8461bf7..6251863476e5 100755 --- a/tests/xfs/524 +++ b/tests/xfs/524 @@ -25,6 +25,10 @@ _require_test _require_scratch_nocheck _require_xfs_mkfs_cfgfile +# reflink is currently not supported for zoned devices, and the normal support +# checks for it don't work at mkfs time. +_require_non_zoned_device $SCRATCH_DEV + echo "Silence is golden" def_cfgfile=$TEST_DIR/a diff --git a/tests/xfs/540 b/tests/xfs/540 index 9c0fa3c6bb10..5595eee85a9b 100755 --- a/tests/xfs/540 +++ b/tests/xfs/540 @@ -34,6 +34,9 @@ test $rtextsz -ne $dbsize || \ _notrun "cannot set rt extent size ($rtextsz) larger than fs block size ($dbsize)" _scratch_mount >> $seqres.full 2>&1 +# no support for rtextsize > 1 on zoned file systems +_require_xfs_scratch_non_zoned + rootino=$(stat -c '%i' $SCRATCH_MNT) _scratch_unmount diff --git a/tests/xfs/541 b/tests/xfs/541 index b4856d496d5e..2b8c7ba17ff8 100755 --- a/tests/xfs/541 +++ b/tests/xfs/541 @@ -30,6 +30,9 @@ _require_scratch SCRATCH_RTDEV="" _scratch_mkfs | _filter_mkfs 2> $tmp.mkfs >> $seqres.full _try_scratch_mount || _notrun "Can't mount file system" +# Zoned file systems don't support rtextsize > 1 +_require_xfs_scratch_non_zoned + # Check that there's no realtime section. source $tmp.mkfs test $rtblocks -eq 0 || echo "expected 0 rtblocks, got $rtblocks" diff --git a/tests/xfs/556 b/tests/xfs/556 index 83d5022e700c..f5ad90c869ba 100755 --- a/tests/xfs/556 +++ b/tests/xfs/556 @@ -35,6 +35,19 @@ filter_scrub_errors() { } _scratch_mkfs >> $seqres.full + +# +# The dm-error map added by this test doesn't work on zoned devices because +# table sizes need to be aligned to the zone size, and even for zoned on +# conventional this test will get confused because of the internal RT device. +# +# That check requires a mounted file system, so do a dummy mount before setting +# up DM. +# +_scratch_mount +_require_xfs_scratch_non_zoned +_scratch_unmount + _dmerror_init _dmerror_mount >> $seqres.full 2>&1 diff --git a/tests/xfs/596 b/tests/xfs/596 index 12c38c2e9604..5827f045b4e6 100755 --- a/tests/xfs/596 +++ b/tests/xfs/596 @@ -44,6 +44,9 @@ _scratch_mkfs_xfs -rsize=${rtsize}m | _filter_mkfs 2> "$tmp.mkfs" >> $seqres.ful onemeginblocks=`expr 1048576 / $dbsize` _scratch_mount +# growfs on zoned file systems only works on zone boundaries +_require_xfs_scratch_non_zoned + # We're growing the realtime device, so force new file creation there _xfs_force_bdev realtime $SCRATCH_MNT From patchwork Wed Mar 12 06:45:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 14012948 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 352061E25EF; Wed, 12 Mar 2025 06:46:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761994; cv=none; b=P+SLgo9hudgmM90S4g9JcEzYRF3+AlEa8/RcutyzRHVt50hwCoBmfeR30r1lZyU7qe2k8b1Gp1f3fRWyzb3LY87hNhoTT+RuwT9zlBAg6geQnYxImzaGDJTT76zE32KhLogvqUSMZAIV6QOpk6hrHscXSUCZ4S/QRFKoPwyaRyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741761994; c=relaxed/simple; bh=LGcMO4L5SjAqR4JL+byLtIvA9eFwqrCO7ivh9CUt/M4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SRoXFbH4HtimMyG7pbNJmqtyUY+Wyyk+xUupG8UwvZwiTE89IBrFAgeIYjLvPANoPxBXiMzezEZa8UWVABLHk7GV9MYbycxZJmPqK83Y86/vCWMgeZMlnizEeISrvMV98b0Oj+4I8dhIPFyTxiDST/Wjz7MvL/0iP6BbFsVx7BM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=DcUZJ0eQ; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="DcUZJ0eQ" 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=mg4jF/elO0L6V3QDR+jzf12z+53XfQM3w4/bfLcOl0w=; b=DcUZJ0eQeIAULugcBa3fBYujDC veI78+7+JBn2uRC/483ncWXY2MvVPRkD4LJkOfmxVtTDs06SqcA5gvT8+3mv+kervdv3iYxJpCOya Y4gcZzGzMbilh2z5B7zaeSN46+6C1LkLh5Snkry2w85Zq6h65G6XVVSdDuu9RsoQy2yXro00yRIsM Xc7+7tqMp+2Gkt6sIzAjGcZCEsq1WHw+Vxu98B8XYfXm/VY8JYkOgJCiYC71JuLNlYl+ulqNiEzaP NUTiu14oWLG7irJiV2I0SiHJAMugVV84dmVXmS7kOjaxMP1mzXY00TauE2PpwcPyg78Uj8DrXXAjA za/g0uiA==; Received: from 2a02-8389-2341-5b80-f359-bc8f-8f56-db64.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f359:bc8f:8f56:db64] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tsFrM-00000007cxD-1E0v; Wed, 12 Mar 2025 06:46:32 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J. Wong" , Hans Holmberg , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH 17/17] xfs/206: filter out the zoned line from mkfs output Date: Wed, 12 Mar 2025 07:45:09 +0100 Message-ID: <20250312064541.664334-18-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250312064541.664334-1-hch@lst.de> References: <20250312064541.664334-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html So that the test still passes with a zone enabled mkfs. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- tests/xfs/206 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/xfs/206 b/tests/xfs/206 index 01531e1f08c3..bfd2dee939dd 100755 --- a/tests/xfs/206 +++ b/tests/xfs/206 @@ -66,6 +66,7 @@ mkfs_filter() -e '/metadir=.*/d' \ -e 's/, parent=[01]//' \ -e '/rgcount=/d' \ + -e '/zoned=/d' \ -e "/^Default configuration/d" }