From patchwork Fri Mar 21 07:21:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024905 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 CFC9E1E9B1C; Fri, 21 Mar 2025 07:21: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=1742541712; cv=none; b=qJU52mhCyXTlluPt8143689yruF/lvXM9/DJ5d7H/1z82fCMsv5y1WpGweI59sAYfYCQ5KzHHDuENNGUzbzmUpJsigwka6fvZ32tGL8dENTG2JFmlnKerfFwn3dzySo/CZLL5vDSEzB90+3NQrEwh4y8vHaa8GyLCjplfNxNeqE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541712; c=relaxed/simple; bh=yGaIlq4gvov3ZHwbjzKqHlgpFDLtkRwnWdfFRiQwWZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jF4TZl/qPZxEJqpk+4Ipxz0k+ybWocChuZUhjquo/FfqNxHZnYKXdEs++VvZ4pS1PBXGg6T+dI8KPYldEda57zst5n/VQcfNxgtcU36XEQQBLUAZV/KYROpvxVo5/vbYIyyawtczXpcS2pgUX8e3yAMltRsWkSXgovr+OMKAGts= 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=AiPAoZeT; 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="AiPAoZeT" 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=LLSs537/c+e20ke0v7q9Q2ZY994B88jrs+fyZlTXeKw=; b=AiPAoZeT6Be5x46evyw0U7NENH jcdrcw47ewSBo7Mr9bcybLRhJLsooR3ko0umH7FJN8IqVRZFznOhMR6weo6ogddrkdbsN3CkcsfJP K856ssQUio6RnFrVp4vVcKjbBJmN0vSllBulJhVkmorCmE1rA45FxxBi3OKfonLofRrqn+/K+CUjz BBtKsHmInxsgYJsuQEAI4UCCyqJS+Gb9yQjkUcFNd9SaOTQelpScw+ks3ZsMKpskkmzcSQr+3BAL9 EhH5CG9JB+cqPbdSpSW7gwELxTmlT0jrCW6XXSepT509rOsnjL63ItSn9c6CD8PX8jsYgPSdtquRf JILJi8pw==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhS-0000000E5BE-0Tnf; Fri, 21 Mar 2025 07:21: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 01/13] xfs/177: force a small file system size Date: Fri, 21 Mar 2025 08:21:30 +0100 Message-ID: <20250321072145.1675257-2-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 Fri Mar 21 07:21:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024906 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 0E6CC1E9B1C; Fri, 21 Mar 2025 07:21: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=1742541714; cv=none; b=mvhz9CBIoj1CVcERoABZB2cQtTecr5XSpRrpohx6DQJAFht+UeVKRwxL9cqOVEd6+gkAHKlRu56n5T60gGvK6P4c3bp/DwOKylJ4hKepuMdnW4R5rF/bQUjFe1X/NC3pvZjXETvVU/dxZq+sMEkxjXzt88wYLWMkIqdGpH7NHAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541714; c=relaxed/simple; bh=QoLKG4HJoTNYDYtiqinh04y3RzUrM/UWx2FU2/ku1pc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UVr6X/HOHJ6owP/cSqS4D55KS7qJliijC0C3MyvKcLh0R4w5Ia2Xm1iwBcIvi3amC8Sz4cRfEpM3I+ahj0Zw9q4DcZacgIeUBxd0ASASi/faWY1GLDTlunKG5VJTTiunX3rmE90N+9+2ViX3nKhfb4OrPMpfL0MP1LKmZsvUgu4= 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=DzzQ3EJ7; 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="DzzQ3EJ7" 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=GFudg3xupFpSk820Mdao2PuErBaH67XXgplHHmlT81Y=; b=DzzQ3EJ7aau7grW7T97swCU+eD C2NMha1PaREkDJ7ZCZzCM5YdL2NjobBfs4aBrHH3tQo1Fsw5AsNqQjyikluGkKU3LzZUhpxwHDCmC oE2tBg9VUI1ap49pTsUw3qRHWNHvcdLjigDWWJBRawdi1rLm0UE7HfPmjjic5zXhlHxHmPny8OFiV 01ghDjxeTD0+T5E/pQsmwdTxpOMIHbfgaNLp0GXOWkvj7NsDL3JXzOv/sF8a6BWXiL/+igJp2UrfY y1w0rokHKYOWkJc4bEcImpdGPCZLdDdKS5pK+26uE+/2dFB6h48aEwlOdNZx12Si81j+sYOhzPuNe xotz3tng==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhU-0000000E5BW-1rek; Fri, 21 Mar 2025 07:21:52 +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/13] xfs/419: use _scratch_mkfs_xfs Date: Fri, 21 Mar 2025 08:21:31 +0100 Message-ID: <20250321072145.1675257-3-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 like -r zoned or specific RT group configurations. 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 Fri Mar 21 07:21:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024907 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 84F501E9B1C; Fri, 21 Mar 2025 07:21:55 +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=1742541716; cv=none; b=XnudfnDiDwfjqt+2tJoEby5YcTDniRnhT2boPJIbRvvdZnthY/5vXyOXtsZUVVehjUxa74jtdb16nSXneHzJw+uiIn8+2m+YYJDEc6QYTeK2OIayjqy5BFCShFya4iEvig8sQBo1N849jDVlz40DcJOrRv0Su7CAw5/gXpBAxWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541716; c=relaxed/simple; bh=h+h4s9In1zcp/QffhwuXozG1yWWSBONa8uVc0X2o49Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bX/NDcdoY8ala627I8+zXAIex6nVRcn2F6vPGVBw/EjLcav9GT4675nPJeUInwsJLSEhH4xC4rn5g1eINFasqEoUE7ZEnh+ExJ2tMydeO7XMifrPhb+wF9fo3yWQzJVfor93EohW2n5F2mTVTZYTAcCN7cwwijvYxt3S7zcxNL8= 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=M6dmC0iW; 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="M6dmC0iW" 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=cLVc/L58oG2H44CDq5Wuh5Ukd25fBzB5gPMVDtD7VYE=; b=M6dmC0iWIBYRFfPRSfCFnVRZy0 DI12g3JszVYqPnn2WfJ7DmYSz7f2hfnVDdtEwSdT/R6uZStgBZhc3iOQw27gTF2ru+4d4VsGZIe1z lTx5o9pgGhhpRoWu9pm2rJHcZChK0Rdet7JvyMMgxJdbYMrGkqKH3nLAVaj2ILoL7ZLx+J8/VhlAF OuVmE8ORfDRbv+5mm/sM82RVmPdg2OL+5s5FSzkSHZSxdGC5X53M2tgJnELAJxP/7KQHh35zcSyap EgS2/cq5YP623jIHW6l/JDozbljvoPSbo1ZMm1shIYFChoBqP3Hk3uY93j1HXzindVQ4cQvGsEEpJ Ybt7gdhQ==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhW-0000000E5Be-3I6I; Fri, 21 Mar 2025 07:21:55 +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/13] xfs/540: use _scratch_mkfs_xfs Date: Fri, 21 Mar 2025 08:21:32 +0100 Message-ID: <20250321072145.1675257-4-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 like -r zoned or specific RT group configurations. 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 Fri Mar 21 07:21:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024908 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 CAAA31E9B1C; Fri, 21 Mar 2025 07:21:57 +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=1742541719; cv=none; b=RMajcHAbgJbd+E/jEN0/hMajPwDDxPVgj+vXcLA6EJFAoZlatIiFY95stLrlMofa8VOQDKljBstiQRePePlFgknbhuh5PCP5Q81JXtE8wkz0+s1DhqhXinc3QwPZnkCqb6Ef88RxB6FBM7la+Urg+L26vkMQ1Ejojdjh7gySdVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541719; c=relaxed/simple; bh=YoTog3JCYumt7NceQT/JXO/VHQbAtKB+Hy4d/WtQL64=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ob2q6nMOzAwvf/OPPCbdOXdGtz2gzmpPC7Oe990WzL+knZj+7SYpI8ftp0q0ovPfE34fGgFUftJutmA6KsQnqDJEZV8vKM7yVIzud1l5rA/Q8Z85XokMa/GmZg5zmC7XNkp4JvfmK5EYupHwWEfO6aCnI65U1usDplBiSIUXo9U= 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=LklBp96A; 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="LklBp96A" 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=wafHntLpyaWJ78lt1whZXdZjtDmmxOgzVbnXJKeUQbo=; b=LklBp96AOS52g/h0e764D1Oxw9 IKfA6+QVOq5n7Al6kRQ2nfZJvtLkLwaA9Axo2YgNYvsGymO5aXogxXwNACzvABBduxlIWg1Wsx/5r ZVkmtQUmLT6/dDcQpbZhkjEufFONYVVga5wuYuoCgEHXiUoC9sanLV5BTFOl0m14SbmOmcyHjl4w5 1aKGigZ5+Rfzwx6L1F9hOAGeQ8nKyuHcYkTp2nThcf5g/UqVQFu5i48T8iYVZk6ulwSt05DFtY6qt JuBmRAl1/oSeCoL+0tZMMmErOiVmCn3b40+W8UJf8FbCBFSgmqVzXJ9hhTu7UMXZkgYIH+VYnfA2H HEQ/7C2w==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhZ-0000000E5By-0NFd; Fri, 21 Mar 2025 07:21:57 +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/13] common: extend the zoned device checks in _require_dm_target Date: Fri, 21 Mar 2025 08:21:33 +0100 Message-ID: <20250321072145.1675257-5-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 e51686389a78..7cd8d5ffd2e8 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" ] && [ -n "$SCRATCH_RTDEV" ]; then + _require_non_zoned_device ${SCRATCH_RTDEV} + fi + if [ "$FSTYP" = "xfs" ] && [ -n "$SCRATCH_LOGDEV" ]; then + _require_non_zoned_device ${SCRATCH_LOGDEV} + fi ;; esac } From patchwork Fri Mar 21 07:21:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024909 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 1EDB01E9B1C; Fri, 21 Mar 2025 07:22:00 +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=1742541721; cv=none; b=AlnTSJqQWIFkJ0tnY/d1uV6HAl5YXA9/uDJjDK13lWH6Twc9Q6FhAkup4e9C9YmPmlzgkGz4gA19C41tVN36vg30e0yJQFaz2x/QgJsuf1ts0SqGKm9UHZA83UH7Bzs/FruHzuYsJm7HyBs/SH3OPPR5SEsD/bhBxgO4iunXjQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541721; c=relaxed/simple; bh=S9/nZcIo3PEzz1VIKgOUtSLBZAj/c3JI+g15Bfk2gwc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oJuI8+bMFQ8NZtyFDITi6OCnFaBtWCXrmTAxPGtZulfq71urbCls2VVr5p5UPuHHyz/jWeWY/pRNR+a8uVZazAO3GU5o1CLsr7YxIE7UYAup97TCMtNFNHTNgYpOfGj0YaOlhVmIn7qvqO8Xc4XHNNY8kYqHY36VeWT9ndJGXv8= 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=1T0nz1iE; 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="1T0nz1iE" 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=V0meUuAUHYdocnXYZda63A/Wcy3Jp/42ucClUA1A2DA=; b=1T0nz1iE6RrOwc+2ssI6WOsvTm 40Jq/AVZkdBJAYQ4n1/4hD+3Ty+E5LsMfjC6+UXoVzDL+fc41STgxIP7r3Q/TP9re91Y5pbOpMrhJ 6LoJogAShPBkJI86rrPhNFceS7WzHka2GAtblh53+6zBtNtoyaPRSVdAaWLlR9KYfzCBGbtgVB4vL Lt3b9v4YVprAJJ7gIyrr47uE/MSdNt3CGpUGCD5o7XgoRXTkU7qftZ7K6YEuIhFn4raCCP4SQD5np JktN+sJKhcyLL7HRBnrwpGzZ0bFNozZNU9MGskR18o+41Tkm1iESDN2yjSoa/XfmAg/Xgjri9xP1t 66yose+w==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhb-0000000E5CW-29VV; Fri, 21 Mar 2025 07:21:59 +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/13] common: allow _require_non_zoned_device without an argument Date: Fri, 21 Mar 2025 08:21:34 +0100 Message-ID: <20250321072145.1675257-6-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 callers can pass $SCRATCH_RTDEV directly without needing to check that it actually is set. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- common/rc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/rc b/common/rc index 7cd8d5ffd2e8..dc6d4ce01e05 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 Fri Mar 21 07:21:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024910 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 891001E9B1C; Fri, 21 Mar 2025 07:22:02 +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=1742541723; cv=none; b=TlD3XM4fb56n6slFfmF/ZLoI8MSBNLyUN2g12OSdsHo11LwqyP5bEZfoFpNmEMosYvd6ck+yFbY3agmQlT6m41CTel+S1dEamtFbNU2XekGqaAcj98NpIg0930g90YIlgz4zPRT/h9d2UeF0j8pnq5VgcKtcpfibBnMzD3zLvDk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541723; c=relaxed/simple; bh=UAgj2B1opqcPizJH/Pio/SMQ7CfP3Vh1NwsMw9QHgkY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uIDovIl9xevLXQr8dQW550EQCC6a1mCEQFCG5/d+c+esBYDrXF7JtyW2r2lms90HdMv83XuQ0Bl7vOZzsJRSL1LR1p+cmBdjGXvO6+xtYwWM1XqZ+Fbh42513QLRhu/soL0zHVTgswirw1vDLfyisBXQ00L/xCYVTGnxdHPy4/k= 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=R81XMN9u; 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="R81XMN9u" 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=ZPZK+t0sCJumFyAjbfXkHQMfVhEIyylK0lUGLsX1wlI=; b=R81XMN9uj1M7s2bUxt17FGqDwF X0PEEaRDJs14ZBO7RT4ruKoz/BIgfQSPZiubboa6LkhjYYLnLTPOeS2aMeqb8f7QrasnNtobk/Gr1 j2JKT7nLvbEK1/oiR5tcEuP57a6528zxfSHoe2eOgZPfNKgAG2YSbIgMEfCzmTG246UKu7PyfkRRt DGETtFWVrcXcvd1ppW/k3tkz0wwsC+z12GW+4E1bId5NACO5WmiGJbVOiRLh0aGlJbo4SUk6QxF7y 0cpihi3ELgj6gbN1qhvx9i6akjhYiE6I/qlchhXdFY0ChZGpkwq+dgcI/Bf4ACJKbWZG39gaLTxQ5 qbpfnNOQ==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhd-0000000E5Du-3STe; Fri, 21 Mar 2025 07:22:02 +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/13] xfs: add helpers to require zoned/non-zoned file systems Date: Fri, 21 Mar 2025 08:21:35 +0100 Message-ID: <20250321072145.1675257-7-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 93260fdb4599..3663e4cf03bd 100644 --- a/common/xfs +++ b/common/xfs @@ -2071,6 +2071,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 Fri Mar 21 07:21:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024911 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 C0C891E9B1C; Fri, 21 Mar 2025 07:22: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=1742541726; cv=none; b=iLTOMzBD183PAS4NeNfqnM47TJ3nwdRVYoIjg1z2DqcMUqTPnb4KhokRv5lEgfmqQlgCxcwa3tbYEMuS5IUeI3Iyr0Ucmhy02OQ7veRvwFUoGmB9CcN2CFfWkIgj8Nn3YDOAtFBss2ZanAwFgXomr1n2aAZgaD3vt1DRlJxvQBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541726; c=relaxed/simple; bh=+oiblQz8SYHAi8zR00SxuiDl2eTeaaXo80n/As5iLaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VsbnBAG2q6PSmzAaTldxXkzEKrbcd1xytSCJEKqHRJnmHfn7vAyY5QaPzJH1vfU/IkAYSzdEwoG5q40NOnSLlAiWOpp/O+VUmR4aTmH38enchVyP8CDDxyknq6tzHYc/HidDZhRTawZLeAaazv7sY/J1/jpIN73XWXGSeiDerxs= 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=N+eFaTYO; 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="N+eFaTYO" 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=QHj0REmAqKaM449EbJjH/bm59DC4DIvklcSeq9s8HV8=; b=N+eFaTYOtEz6i1vjk64z4qRKy1 LeCy36pjvlPt7F6wBH3cD8yc+bBcOjy0Upbvd5UH4uWyQqEYVX2ULE+uvlzRHEvRDVh28M/Hrq8ti j7dKBa0PxAo6KnV6PrwInTYuYYinfz/aiq0TlykbmjW+TmKZFGaOcagibk9h9pAEnZezRP7fSyjnZ QtE4nbJSb/Cm4Jw4QtQ57d/3TeU6c7ugicWLjJI8phLeHfKHQfwDyzr4KBH5wI56mlrUbV9tpJRZt DKkW60KVijKj3MGy6TFSiK2KahZh5fUNnbUzPbVd4fKnstmxE4Qg43BARkTtk1XFcjgOI1tZL1huW nLKZ0bbg==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhg-0000000E5FH-0itQ; Fri, 21 Mar 2025 07:22:04 +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/13] xfs: handle zoned file systems in _scratch_xfs_force_no_metadir Date: Fri, 21 Mar 2025 08:21:36 +0100 Message-ID: <20250321072145.1675257-8-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 Reviewed-by: "Darrick J. Wong" --- common/xfs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/xfs b/common/xfs index 3663e4cf03bd..c1b4c5577b2b 100644 --- a/common/xfs +++ b/common/xfs @@ -2049,6 +2049,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 @@ -2068,6 +2074,12 @@ _scratch_xfs_force_no_metadir() # that option. if grep -q 'metadir=' $MKFS_XFS_PROG; then MKFS_OPTIONS="-m metadir=0 $MKFS_OPTIONS" + fi + + # Replace any explicit zonedr option with zoned=0 + if echo "$MKFS_OPTIONS" | grep -q 'zoned='; then + MKFS_OPTIONS="$(echo "$MKFS_OPTIONS" | sed -e 's/zoned=[0-9]*/zoned=0/g' -e 's/zoned\([, ]\)/zoned=0\1/g')" + return fi } From patchwork Fri Mar 21 07:21:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024912 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 2E0371EC00C; Fri, 21 Mar 2025 07:22:07 +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=1742541728; cv=none; b=vGOOr+/j/EZtEXuMyFRUwnAFKQWD4Hubb1OHRrMlgfO7Z3f/Q3KpA2XaLcoBpCQkwEvlFq/XggvigzK65LlNtaefNol9Inmi47IA0JkR0A705CZ3Ikug21Y+FLooId5mBlUuRuGpzR9SvCrqBIgMM6J9bCRRSlwgHKF+CbDI88I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541728; c=relaxed/simple; bh=LxmhSlfcBvjcKGqxS4JI0t4XWOQhGKh3Qtydkyo4nz0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i86Ty6AA5VVIqtFJX/0U6+dNKbLL8K0YunoFJmSrKe34GwwV0vTm0yLa5IGwCi45+X9oZozvuf3sJLFTVPr7BL2QarL6B0XpkXT86oo74nLmGaDSCo3NksDovr9ubr1bNRrc4YtntZFgc/Fzg75NKW7+aRmn1HSoOwmC/jA/y3I= 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=ZNFhUHps; 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="ZNFhUHps" 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=0nPUv+T7jaYRuOS0PUXTD32oEmQgdrfp//NX1PXLKB8=; b=ZNFhUHpsj8U4fHU9eDRVWVp5ka LdjmF+Bjm3oH7SQQoGhcmTdSY13udrg/aBzsvzEUuSYy32tXAapzOVvDDYPVsJaj4kiFWy0kyW/va x+IERdpl8F/z/QeUHCLwSePGs/T6998MoW9n6wAbI8krGeYIcUSEKz3ireyy8MtU1BPm0KgF0IruZ L2PWiZhYx2i9S7uKUTxWNED008HKiBe7T/ftyxhGLe2EueMycWQBnO75XLFVHuNMG0RxTLA6um0FB kibSxJoJTUmfOKbYMO8PmgX7e1izobMIXJhKp5No/fn3MUSr9o75gEVeMc5jGmPcNydNb+suifRCG c8Ukqhbw==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhi-0000000E5G7-2L0P; Fri, 21 Mar 2025 07:22: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/13] xfs: no quota support with internal rtdev Date: Fri, 21 Mar 2025 08:21:37 +0100 Message-ID: <20250321072145.1675257-9-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 c1b4c5577b2b..ccf263aeb969 100644 --- a/common/xfs +++ b/common/xfs @@ -2206,7 +2206,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_PROG "$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 Fri Mar 21 07:21:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024913 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 B23E51EC00C; Fri, 21 Mar 2025 07:22:09 +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=1742541731; cv=none; b=svgieLKyCbLVVCXPTOyhoJKkhgdZpYHSyPGMqfH/FDX9nOwpnO0B5eXBjNzNfS5zE3LVFQEu525okYY9iWJG6jLxOMpJj5xValPwiH6n2sO7d8t8kWFUvaSpGVMAJg+Z4eMOEg3xtIKvjGDZch8bAf3tUijn3ky5aU8kdXODasg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541731; c=relaxed/simple; bh=eZRbMJS4BAnVP0zhVO2SbgQOnWJnNSHLUzd3/joIePU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XW2kLz0oeGHVr7K4PdGtyYUXgIxAMI91jBT9MQHiF2/IK8YuW7IhdZ0NaIHBwwllxpo9SeEbN0yV8sA4bgz5KbnpIfNRqUrgl8eAlJ/3fhuDGzA/zytp72THgkVyvj5niHJAtxTY3ddoTX091rWEZQX1eBFsbnwi9ue55jUB27U= 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=F84P+x9N; 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="F84P+x9N" 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=DJE5XIeAyjJDQDJDYxVzZ9Ko35CYlbB+qGmXRE1M4YE=; b=F84P+x9NrAt+SCfKvGIK3Djt0O E10J59fLna7w/F5KFn6+I1zXP2piNx5USgDW1Xu1/1vVKrE7O1044Y5FQL4tea2Li9bbx8iRltCiT 1VYPUT0NEuLT94jnAwNDmb/CwZNMzggDnDPc5t79PiVGqFV741H7Q5oxx3a9IG+ZHz9OqZWiILLm0 qYrYmNCgwd6Fe0lexzJQAWru70e2kBmnMxS1IPzXWUda3+vIonry9/P31db6sTOre9FV1wtLVTJad x5GpwuvGTNdDK7seXnuWfStYg5wcJbgBvk9G/+ny2iWo25jJnOGaKkhNZ2ptG2TZ/kJdObhQ0r1ri itN7FK/g==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhk-0000000E5H9-3h5Y; Fri, 21 Mar 2025 07:22:09 +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/13] xfs: xfs_copy doesn't like RT sections Date: Fri, 21 Mar 2025 08:21:38 +0100 Message-ID: <20250321072145.1675257-10-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 Reviewed-by: "Darrick J. Wong" --- common/xfs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/xfs b/common/xfs index ccf263aeb969..d9999829d3b5 100644 --- a/common/xfs +++ b/common/xfs @@ -1556,6 +1556,9 @@ _require_xfs_copy() [ "$USE_EXTERNAL" = yes ] && \ _notrun "Cannot xfs_copy with external devices" + $XFS_INFO_PROG "$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 Fri Mar 21 07:21:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024914 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 E7D0F1EBFE3; Fri, 21 Mar 2025 07:22: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=1742541733; cv=none; b=PmPQ1sVGHjuMk8Tw53Pu/3XTLrLRSmhOgGCB/eNo/qevM+YMIczxegfJD8Guhkw5mjWJ7Co36E3e4q38zCicvmZnWUtqOs0eyowy/yMkrhtDBHof4PHkGOFcAinVAq01mx4tzCYs7pObJObMDujlUXRoAFzWyi2T2hecIUvCFZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541733; c=relaxed/simple; bh=J8NdVGjLuVcT3mulWVOnqIC/aOhjhTUc3GxvyvYO6lA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aydv9IQGfvUnTKzN6E3Uy+Xp6XdZUh7QXnBkfg4kpreWobASXfLHWBz8FKTvDjqtNlnUAzGLR/7la0tG60dU4/8SzxSMYnzhCkfwXLoe7vZVKaj8fF0Q5TsVQ2d6diHbuLo2dahRRhq2bM0AEk1yIzyBfumi2LOIdX4Qfa9sYb4= 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=lrHau7Ew; 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="lrHau7Ew" 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=oSgj4h4YDOLOkVMeR44E0x7ZiyX7i8jirGdxi0X7Pgs=; b=lrHau7EwFVbILcNPxvgoAI+HAT qfOs+/R1tlrKN2eM7nO/3IIYlNO6wgdKPHkyPQ/Ogvcvk9cj4atQ4r1X8RIS23/SmEGAEmnagZb7g xLxFel4jhq4Uc5vlmDJjdLB+7LVirvq/d8uZkrm2k6RBXAFqbJbenvWgeROO0clB8BLFPvCqMIrD/ JAzSJjHwyJbAEKeye/+DN56tVPa3SUqnMbDdoetT6Nry4M63cRvtKo03TFflZmgq1DnAnSmAT8VH2 qQivc5VjYEcntby3C4miIC02DDZjz3zNOkkw+1M/F8Uv/O+sSe4gSqQLRabz6tHF+S+6iTtLPda7r UH2JmZ6g==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhn-0000000E5ID-0zhe; Fri, 21 Mar 2025 07:22: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/13] xfs: skip filestreams tests on internal RT devices Date: Fri, 21 Mar 2025 08:21:39 +0100 Message-ID: <20250321072145.1675257-11-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 Fri Mar 21 07:21:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024915 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 3B5E11EBFE3; Fri, 21 Mar 2025 07:22:15 +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=1742541736; cv=none; b=sNpm4ePtMmJbHPkjOtO6rt3MHGbCyXJ8VTXxSgJvmuJpLPDtp2YOLAgCyqhfK99NPjC6eWaup87GeXSt0C1+EnDlJ+Qr7mFwPn5gdZTsnN80SwtmVZ6/8donNKB850hdyZrCkUd0KTeCX2gA08DWdrJz3F6bQr2kPE677vNJQrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541736; c=relaxed/simple; bh=dDeqb4WMTElJm2HoTfMI+d/jVSkvqSQ3EO4IgYxUxUE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DEKiMJBeatzdo9UFi3g5K/QrcUZ/AFkQyZtq4a1XFuxA5jWnQxm0GuKHE85yEcOSl3DrKbZspRgI2Q/3dT5uN6fxe8KOe/me8bNcKy3VDIKYMCykcJJWXxFhJhn3yWOd2pbAdUg44qUwvyswIyvj6BEImNgiGOAG8yyN5EVfq5c= 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=zPorzWYF; 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="zPorzWYF" 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=a9TwM0rSH9vfBTssLPJwpMMn1JvCw9/kmUw2gW/j/PQ=; b=zPorzWYF9CoHKsrya9xxN8MI9Y UoYkUUvpN0gyQKBf2wJDAx4ZPWSghJGrrzNY21vtiWYJ+CX49crNE5nNFhrQb4BxtA7VRI6rfvHIi 4+AxvQn3pdj/HVXT73iL+1wSeucGMsw5YVeZP84CTy5WMH4JCGIvI8bMV4WWfdnVjPsMA1EGanLd0 ofNliwzCH+zx4wjsIXTG2QzyhR2dxnE4hWZb3KTPmhx9p4F4rwXYZ0NlFRrIcJMDTG8pfWU5q1MX5 WEIfXtd7oSshTyozUM+jnqWHCW9J/MHHkzdMreLX1Y8Zn0AMIA17MhBVtepCgTzVpi9bd0KSloMOH sghuS2SA==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhq-0000000E5JY-29gc; Fri, 21 Mar 2025 07:22:15 +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/13] xfs: skip various tests when using the zoned allocator Date: Fri, 21 Mar 2025 08:21:40 +0100 Message-ID: <20250321072145.1675257-12-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 Reviewed-by: "Darrick J. Wong" --- 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..d48b753632d5 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 allocator, mkfs still creates an internal RT section 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 Fri Mar 21 07:21:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024916 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 8943C155330; Fri, 21 Mar 2025 07:22:17 +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=1742541738; cv=none; b=t3fW4CThvECCCWuDecPSyfaUqCLTBYXDniu7594UjNNXFEZ/2aH3pRFkgem/GHnMx+x/Tz6odrAvNMZjTCrlep+yFBqwYmhEbZgnST2thi/PTxV1HM7xsABJ93CREFVkEyK5Y7b/GHymkcBb/cQYcwCy44eHRTxeBYCmVq7LmzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541738; c=relaxed/simple; bh=PRaUocvBneQoZ3CEqjrO86YcgJlFKEN0ETfA9TeeJvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rN6HsZ+o4wWGNm9AFyho7WQbk/mv4JZf3VKpYOXWu5k3f4UPkzc+EVUC6Ivc2naQc+EzlchogFTr55WCBvIfPuXJNCzQYisHuHLtoIC8lhZnZhVnGpoFR4NYw50dAdu6oQutcMBxkves1h7lD+fScVDn5JLqD4F41uZb4+TfK/Y= 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=B1/b43u9; 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="B1/b43u9" 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=DWT4a9sY90ntfuGNW1hk7oQu9RIzm2alMhRW3WHtTbc=; b=B1/b43u9s1WGCZlvXo7h4iqp1g M+8DrJxf4UpKnS0dDrSIDdwlGD/zt3JIUH0R4ZBgze7lcWYhZRyKzlL1nx0FbMaEXdsHje+uaItww XYjs3//8Kpy+0+oRoNWp0ec+klm8J7sFhrAQSVE7vLrezynj0dWGGwwFZC8F1DpcnsyVFc94mAdpS FyHxzvPfCNPyel30Hj8mO5xtrieKCS/xN84bLoqqhYY9LhmRkf/yk0zfk1b2IhT1EU5LWsFBDAizE PrbC5AsJVuuRPvxgyyNnHpfAuJg5jOjxIVp1V/0jmPiDwYAu30GZXo9PviXUR9jprKcMx2zvAIs4V 5PEh97lA==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhs-0000000E5Kd-42Bk; Fri, 21 Mar 2025 07:22:17 +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/13] xfs/049: skip on zoned devices Date: Fri, 21 Mar 2025 08:21:41 +0100 Message-ID: <20250321072145.1675257-13-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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 tes creates an ext2 file system, which doesn't support zoned devices. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" --- tests/xfs/049 | 2 ++ 1 file changed, 2 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 From patchwork Fri Mar 21 07:21:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hch X-Patchwork-Id: 14024917 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 65280155330; Fri, 21 Mar 2025 07:22:20 +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=1742541741; cv=none; b=rnnIZJJ6bxYqabg3khyIvgGHCVGGzYwXx42ybX9m2nru5n+aXWS4H4poNppXd9zHS839UeWVc0Nfni+1Kd0hlTCBjsR1WhrUes9pfg8+sugVzCKYp9VB8uzHtHAvG+s4EqILBfwCxIymJhaGVclX6Ln7avymzH7+BlRVrDqLJxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742541741; c=relaxed/simple; bh=EwsG5SHT0er1vi16CnWn5qBPl1CYm4rIhMnCmPzNAw0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jBNttX8D/tZj7DKka+4vPhL+mWUfWFGXTCHWEfBL9VYNpMxRU7wpv6HURoNIwEOMtH7fMUpExEfyqs7mjVBbIGZSqvruD48Npjxe0pL6eG1cQ5xPX1y+cndC3O0Rnd6k3oJJiGQCYR3QDP9oL2l6cgCK5woPnV7Nn5HeHSKP478= 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=3hwNjPyV; 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="3hwNjPyV" 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=Lw7hPiIqwbd11YHqKohhne1m9Y3tugoyzwR/EGKxXQA=; b=3hwNjPyVKyLbMaS7NxBscdghUy nJsWf3KqvnHGEBPyxmgenwQtbdQ1u7QSfmeX7bk/bKnXSQ2LtoIYU4FQ46LiNckol4WQtH6pwdDs/ Xm1eAlVCCdEiEJeNCc81VCta5/YYhvaWuWHTm3CEyTTSNzTLmePXOWB9IrEoNOsPUH5Z1RLwX/0uj AxZEv10K7WgTZQaajspAJQFEb5lx4dzuuxNPoAeviq+GhZCUJ2NQrt1LFtfE0FWXQZ2h9/ybXGHg9 5gLSqnLROeZy0WSWyqYeEWmrp7NAgswUxYqL2I6j6lL5K9dmKBj+QU91jr5N62HtzDXRzgb1qZr8b NNdZpeDA==; Received: from 2a02-8389-2341-5b80-85eb-1a17-b49a-7467.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:85eb:1a17:b49a:7467] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98 #2 (Red Hat Linux)) id 1tvWhv-0000000E5Kn-1u7b; Fri, 21 Mar 2025 07:22:20 +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/13] xfs/206: filter out the zoned line from mkfs output Date: Fri, 21 Mar 2025 08:21:42 +0100 Message-ID: <20250321072145.1675257-14-hch@lst.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321072145.1675257-1-hch@lst.de> References: <20250321072145.1675257-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-xfs@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" }