{"id":2225138,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2225138/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20260420114714.1621982-22-aalbersh@kernel.org/","project":{"id":8,"url":"http://patchwork.ozlabs.org/api/1.1/projects/8/?format=json","name":"Linux ext4 filesystem development","link_name":"linux-ext4","list_id":"linux-ext4.vger.kernel.org","list_email":"linux-ext4@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260420114714.1621982-22-aalbersh@kernel.org>","date":"2026-04-20T11:47:08","name":"[v8,21/22] xfs: introduce health state for corrupted fsverity metadata","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"1bba67fcfca9046292fbe4d8dc060c82cfde29a3","submitter":{"id":92821,"url":"http://patchwork.ozlabs.org/api/1.1/people/92821/?format=json","name":"Andrey Albershteyn","email":"aalbersh@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20260420114714.1621982-22-aalbersh@kernel.org/mbox/","series":[{"id":500600,"url":"http://patchwork.ozlabs.org/api/1.1/series/500600/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/list/?series=500600","date":"2026-04-20T11:46:51","name":"fs-verity support for XFS with post EOF merkle tree","version":8,"mbox":"http://patchwork.ozlabs.org/series/500600/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225138/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225138/checks/","tags":{},"headers":{"Return-Path":"\n <SRS0=Cbom=CT=vger.kernel.org=linux-ext4+bounces-15934-patchwork-incoming=ozlabs.org@ozlabs.org>","X-Original-To":["incoming@patchwork.ozlabs.org","linux-ext4@vger.kernel.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","patchwork-incoming@ozlabs.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=Nivxlqcw;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org\n (client-ip=2404:9400:2221:ea00::3; helo=mail.ozlabs.org;\n envelope-from=srs0=cbom=ct=vger.kernel.org=linux-ext4+bounces-15934-patchwork-incoming=ozlabs.org@ozlabs.org;\n receiver=patchwork.ozlabs.org)","gandalf.ozlabs.org;\n arc=pass smtp.remote-ip=\"2600:3c04:e001:36c::12fc:5321\"\n arc.chain=subspace.kernel.org","gandalf.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org","gandalf.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=Nivxlqcw;\n\tdkim-atps=neutral","gandalf.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c04:e001:36c::12fc:5321; helo=tor.lore.kernel.org;\n envelope-from=linux-ext4+bounces-15934-patchwork-incoming=ozlabs.org@vger.kernel.org;\n receiver=ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=\"Nivxlqcw\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=10.30.226.201"],"Received":["from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fzkSP60XMz1yD4\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 20 Apr 2026 21:55:01 +1000 (AEST)","from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])\n\tby gandalf.ozlabs.org (Postfix) with ESMTP id 4fzkSP5Vvgz4wCx\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 20 Apr 2026 21:55:01 +1000 (AEST)","by gandalf.ozlabs.org (Postfix)\n\tid 4fzkSP5R5Kz4wDm; Mon, 20 Apr 2026 21:55:01 +1000 (AEST)","from tor.lore.kernel.org (tor.lore.kernel.org\n [IPv6:2600:3c04:e001:36c::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby gandalf.ozlabs.org (Postfix) with ESMTPS id 4fzkSL0mJqz4wCx\n\tfor <patchwork-incoming@ozlabs.org>; Mon, 20 Apr 2026 21:54:58 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby tor.lore.kernel.org (Postfix) with ESMTP id 97D8F308A041\n\tfor <patchwork-incoming@ozlabs.org>; Mon, 20 Apr 2026 11:49:00 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 860FD39F181;\n\tMon, 20 Apr 2026 11:48:38 +0000 (UTC)","from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org\n [10.30.226.201])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 4414839EF05;\n\tMon, 20 Apr 2026 11:48:38 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 81266C19425;\n\tMon, 20 Apr 2026 11:48:35 +0000 (UTC)"],"ARC-Seal":["i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1776686101; cv=pass;\n\tb=eq+Bvuq1/r0A3gshEFYEEbEhYFoMkd6+G8lJVSIlUO3JHe1cZghnPrStsIB0t+GMQeV+8QKUEnZcp2RwrNdC2TfQdfGz0iKsxbYnK5zf3inHN3KpVBjsmcuHJfH8H6o50bXLDDDxcxHK0VOAjbVcrkHeAum08mC/BnxpyHEYB+EF0MOefYXT1S/OwC/jz/lr8BJkSUs30T8/5giPQiX9BPZf+eEKWlWZlnluqbPb5A+RxHmYj4MTht9MIfwUiKFliKwBEBcHrszAQVmD0QTB9VXSxHHwXhoKwq9W8++LeDUOuzJCtg8FpMnHE3HUbM9wOBs9oXtN/tzZs8A/+BA4CQ==","i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776685718; cv=none;\n b=irGfQnie/IOMlVU6vsJ4qzn9du9plqWYMx2somaz50neK2jc88NhbC1CUi5fjuHENETJL0u2CPUUuoJER7Wim5QrExl1SPMcRHbRUAPL1YQxca6hw/56gTvr/Swk/d2mI8YJPpEUKpgZfb9pxnpd9CqU9L2iqh3AS5J32EpzCAM="],"ARC-Message-Signature":["i=2; a=rsa-sha256; d=ozlabs.org; s=201707;\n\tt=1776686101; c=relaxed/relaxed;\n\tbh=FdF4wO1tH9niInRa84s0Z6qYIXLGKm5YmwsFxFfvcUg=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=qm/faFg8yC7P9PaCnpHz3O5iBIv9XhlIU1W/8d+lHnLpIiwsBNJv/e8VrBpRTYg/3YuMzuxq0wTafFaHAj23wpfy1qFiF6v/2U8hh1ggT+zvfzUhuJZAuj/sHpCF/Ps936YULnQKL90Sw0SjuQYnl8KHGzbMEb6Fsn96zrGy5UVbaiMaIbGmHEspOnXuyM+gebyNBaY5I+R/4NWRBRIPWrXRAiIKWkZkc+/3hYG3UyN3AEeFfdkEzFDhjwCgkFnHfZGYNotDdRnJj366Xf1OujE5n/omEH19RI+6f9lnEH/VuFPfA0GiJeFHCTEB1XxOm61SwbhZIyNmjh9vhlPv0w==","i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776685718; c=relaxed/simple;\n\tbh=/vx1RWsF+Uaiiv5red15C2vOObvMVh77Hq64PoVqJ8A=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=S6BEULwzylPtbrKfUN8rc9RuZ5RToeGXLl+Fh4aQvnoWIjTlEnz8bqTc0HXgTsNOHSNo0WwkqSdbrv2pthcJkVAC6SJ3bews+Vyot8/xSs7mpMk/uljfLC5sjTUVx0QOJ8tfIUEgNzIyk+cjyfYJLOmxfG3JuItsancUjkkHoek="],"ARC-Authentication-Results":["i=2; gandalf.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org;\n dkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=Nivxlqcw; dkim-atps=neutral;\n spf=pass (client-ip=2600:3c04:e001:36c::12fc:5321; helo=tor.lore.kernel.org;\n envelope-from=linux-ext4+bounces-15934-patchwork-incoming=ozlabs.org@vger.kernel.org;\n receiver=ozlabs.org) smtp.mailfrom=vger.kernel.org","i=1; smtp.subspace.kernel.org;\n dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=Nivxlqcw; arc=none smtp.client-ip=10.30.226.201"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1776685718;\n\tbh=/vx1RWsF+Uaiiv5red15C2vOObvMVh77Hq64PoVqJ8A=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=NivxlqcwF8Hwo8bupThfvciVKOAeOCXOoHLnBC4ATv8eiP5UpHCXBw5JZRJTLL2Ps\n\t VZ5Kzd3hVikwUfm92++yEH6K+pueFoDueQZ7ITJI3QNlK7NJWhPE1LLVLSHcRGxEKJ\n\t 6Bxz8YvHdChiWb/84CamhhBFplE5JukLPcsdNGrTGFaYL9GLBnvYsRj6+rnUsk04rx\n\t YfLszmkvItSyI9t2MZXPf6Ep3LVYXMN1oOd8q7YrGCoOhEkOsmKObQWhO6MSvztdKm\n\t IteTjHzBzwLYradEaMEhJAvu3pIIwtXY08cklH7rdCO29g27KlKtq9TuPffzBL3TXs\n\t YspbbZhTNXuug==","From":"Andrey Albershteyn <aalbersh@kernel.org>","To":"linux-xfs@vger.kernel.org,\n\tfsverity@lists.linux.dev,\n\tlinux-fsdevel@vger.kernel.org,\n\tebiggers@kernel.org","Cc":"Andrey Albershteyn <aalbersh@kernel.org>,\n\thch@lst.de,\n\tlinux-ext4@vger.kernel.org,\n\tlinux-f2fs-devel@lists.sourceforge.net,\n\tlinux-btrfs@vger.kernel.org,\n\tlinux-unionfs@vger.kernel.org,\n\tdjwong@kernel.org","Subject":"[PATCH v8 21/22] xfs: introduce health state for corrupted fsverity\n metadata","Date":"Mon, 20 Apr 2026 13:47:08 +0200","Message-ID":"<20260420114714.1621982-22-aalbersh@kernel.org>","X-Mailer":"git-send-email 2.51.2","In-Reply-To":"<20260420114714.1621982-1-aalbersh@kernel.org>","References":"<20260420114714.1621982-1-aalbersh@kernel.org>","Precedence":"bulk","X-Mailing-List":"linux-ext4@vger.kernel.org","List-Id":"<linux-ext4.vger.kernel.org>","List-Subscribe":"<mailto:linux-ext4+subscribe@vger.kernel.org>","List-Unsubscribe":"<mailto:linux-ext4+unsubscribe@vger.kernel.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Spam-Status":"No, score=-1.2 required=5.0 tests=ARC_SIGNED,ARC_VALID,\n\tDKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DMARC_PASS,\n\tMAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=disabled\n\tversion=4.0.1","X-Spam-Checker-Version":"SpamAssassin 4.0.1 (2024-03-25) on gandalf.ozlabs.org"},"content":"Report corrupted fsverity descriptor through health system.\n\nReviewed-by: Darrick J. Wong <djwong@kernel.org>\nReviewed-by: Christoph Hellwig <hch@lst.de>\nSigned-off-by: Andrey Albershteyn <aalbersh@kernel.org>\n---\n fs/xfs/libxfs/xfs_fs.h     |  1 +\n fs/xfs/libxfs/xfs_health.h |  4 +++-\n fs/xfs/xfs_fsverity.c      | 13 ++++++++++---\n fs/xfs/xfs_health.c        |  1 +\n 4 files changed, 15 insertions(+), 4 deletions(-)","diff":"diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h\nindex ebf17a0b0722..cece31ecee81 100644\n--- a/fs/xfs/libxfs/xfs_fs.h\n+++ b/fs/xfs/libxfs/xfs_fs.h\n@@ -422,6 +422,7 @@ struct xfs_bulkstat {\n #define XFS_BS_SICK_SYMLINK\t(1 << 6)  /* symbolic link remote target */\n #define XFS_BS_SICK_PARENT\t(1 << 7)  /* parent pointers */\n #define XFS_BS_SICK_DIRTREE\t(1 << 8)  /* directory tree structure */\n+#define XFS_BS_SICK_FSVERITY\t(1 << 9)  /* fsverity metadata */\n \n /*\n  * Project quota id helpers (previously projid was 16bit only\ndiff --git a/fs/xfs/libxfs/xfs_health.h b/fs/xfs/libxfs/xfs_health.h\nindex 1d45cf5789e8..932b447190da 100644\n--- a/fs/xfs/libxfs/xfs_health.h\n+++ b/fs/xfs/libxfs/xfs_health.h\n@@ -104,6 +104,7 @@ struct xfs_rtgroup;\n /* Don't propagate sick status to ag health summary during inactivation */\n #define XFS_SICK_INO_FORGET\t(1 << 12)\n #define XFS_SICK_INO_DIRTREE\t(1 << 13)  /* directory tree structure */\n+#define XFS_SICK_INO_FSVERITY\t(1 << 14)  /* fsverity metadata */\n \n /* Primary evidence of health problems in a given group. */\n #define XFS_SICK_FS_PRIMARY\t(XFS_SICK_FS_COUNTERS | \\\n@@ -140,7 +141,8 @@ struct xfs_rtgroup;\n \t\t\t\t XFS_SICK_INO_XATTR | \\\n \t\t\t\t XFS_SICK_INO_SYMLINK | \\\n \t\t\t\t XFS_SICK_INO_PARENT | \\\n-\t\t\t\t XFS_SICK_INO_DIRTREE)\n+\t\t\t\t XFS_SICK_INO_DIRTREE | \\\n+\t\t\t\t XFS_SICK_INO_FSVERITY)\n \n #define XFS_SICK_INO_ZAPPED\t(XFS_SICK_INO_BMBTD_ZAPPED | \\\n \t\t\t\t XFS_SICK_INO_BMBTA_ZAPPED | \\\ndiff --git a/fs/xfs/xfs_fsverity.c b/fs/xfs/xfs_fsverity.c\nindex ef5cf97ad700..8ac810f0ffa1 100644\n--- a/fs/xfs/xfs_fsverity.c\n+++ b/fs/xfs/xfs_fsverity.c\n@@ -84,16 +84,23 @@ xfs_fsverity_get_descriptor(\n \t\treturn error;\n \n \tdesc_size = be32_to_cpu(d_desc_size);\n-\tif (XFS_IS_CORRUPT(mp, desc_size > FS_VERITY_MAX_DESCRIPTOR_SIZE))\n+\tif (XFS_IS_CORRUPT(mp, desc_size > FS_VERITY_MAX_DESCRIPTOR_SIZE)) {\n+\t\txfs_inode_mark_sick(XFS_I(inode), XFS_SICK_INO_FSVERITY);\n \t\treturn -ERANGE;\n-\tif (XFS_IS_CORRUPT(mp, desc_size > desc_size_pos))\n+\t}\n+\n+\tif (XFS_IS_CORRUPT(mp, desc_size > desc_size_pos)) {\n+\t\txfs_inode_mark_sick(XFS_I(inode), XFS_SICK_INO_FSVERITY);\n \t\treturn -ERANGE;\n+\t}\n \n \tif (!buf_size)\n \t\treturn desc_size;\n \n-\tif (XFS_IS_CORRUPT(mp, desc_size > buf_size))\n+\tif (XFS_IS_CORRUPT(mp, desc_size > buf_size)) {\n+\t\txfs_inode_mark_sick(XFS_I(inode), XFS_SICK_INO_FSVERITY);\n \t\treturn -ERANGE;\n+\t}\n \n \tdesc_pos = round_down(desc_size_pos - desc_size, blocksize);\n \terror = fsverity_pagecache_read(inode, buf, desc_size, desc_pos);\ndiff --git a/fs/xfs/xfs_health.c b/fs/xfs/xfs_health.c\nindex 239b843e83d4..be66760fb120 100644\n--- a/fs/xfs/xfs_health.c\n+++ b/fs/xfs/xfs_health.c\n@@ -625,6 +625,7 @@ static const struct ioctl_sick_map ino_map[] = {\n \t{ XFS_SICK_INO_DIR_ZAPPED,\tXFS_BS_SICK_DIR },\n \t{ XFS_SICK_INO_SYMLINK_ZAPPED,\tXFS_BS_SICK_SYMLINK },\n \t{ XFS_SICK_INO_DIRTREE,\tXFS_BS_SICK_DIRTREE },\n+\t{ XFS_SICK_INO_FSVERITY,\tXFS_BS_SICK_FSVERITY },\n };\n \n /* Fill out bulkstat health info. */\n","prefixes":["v8","21/22"]}