From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B21B945BD7A; Tue, 31 Mar 2026 21:29:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774992578; cv=none; b=HquLDwUi154v3FxzXkcFax1RjiPKePRyTH+4Gvf+zsZz2pP63lz8bOS5ThB/NKfvssrKCH/7X1uzIqIGa1J14H5dVU6/QnKDib8vMwaOv1KA+clnaMddysN5kgCQTVIYxKwz/UeOwDxYHSMYKONXLpxGp7AiX8isQnPTvdnC1tI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774992578; c=relaxed/simple; bh=jU8tUIfyDbVmI340bc16qdopl8bEAtAs/sdw4PSwkzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d3HMgEzf5WJZk9Lsd2Bte9/63Qp+cRBQbB/VNvNWq/JGJkgF6Trd6K3ucEc7Lf4wuCzRrwf3U1xXzYfvbY08my5f+MabtlWe66Q78Xzo9qzDwF4AsbyHsFoHiVXEugPNcosIauZVwXx1ukxXcJUogYJqL2QmMAWesdH77/BkX2w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=u4rU3/l2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="u4rU3/l2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4023C2BC9E; Tue, 31 Mar 2026 21:29:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774992578; bh=jU8tUIfyDbVmI340bc16qdopl8bEAtAs/sdw4PSwkzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u4rU3/l2AYG2PYxbh58mennpg25Nh9feBtGxyxWzlLyBFNVOe++xtB9d1y+f9wlNI RDJieKNlxnpIMIjHVlsZnu7IG7HzHfR2cjL25DlQfXzAF3Kl+Jh+XKOnHHalsi3/De 0lLcF23GHcr1YBmwDCMCa01Sj/Hpbqr1t7g++a+WtJvX31x8IVo0vq4da4uCTihtED Wwg7WjJ1Q5kDiDDoWTOlUTMJ2Z+vBDL8zwokUieiNkBc1RPGjm+oMAi7xyVCXM6peW 2pxdui60fS5q9dMsuKrr2cSF+bKXjrupVzpBzSJzF7+O1+kh6uzrp2jQf16cYbZQLh l47tNKHURyhkw== From: Andrey Albershteyn To: linux-xfs@vger.kernel.org, fsverity@lists.linux.dev, linux-fsdevel@vger.kernel.org, ebiggers@kernel.org Cc: Andrey Albershteyn , hch@lst.de, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-btrfs@vger.kernel.org, djwong@kernel.org Subject: [PATCH v6 21/22] xfs: add fsverity traces Date: Tue, 31 Mar 2026 23:28:22 +0200 Message-ID: <20260331212827.2631020-22-aalbersh@kernel.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20260331212827.2631020-1-aalbersh@kernel.org> References: <20260331212827.2631020-1-aalbersh@kernel.org> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Even though fsverity has traces, debugging issues with varying block sizes could be a bit less transparent without read/write traces. Signed-off-by: Andrey Albershteyn Reviewed-by: "Darrick J. Wong" --- fs/xfs/xfs_fsverity.c | 6 ++++++ fs/xfs/xfs_trace.h | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/fs/xfs/xfs_fsverity.c b/fs/xfs/xfs_fsverity.c index ecc66ee8bac5..6db8113da52f 100644 --- a/fs/xfs/xfs_fsverity.c +++ b/fs/xfs/xfs_fsverity.c @@ -64,6 +64,8 @@ xfs_fsverity_get_descriptor( uint32_t blocksize = i_blocksize(VFS_I(ip)); xfs_fileoff_t last_block_offset; + trace_xfs_fsverity_get_descriptor(ip); + ASSERT(inode->i_flags & S_VERITY); error = xfs_bmap_last_extent(NULL, ip, XFS_DATA_FORK, &rec, &is_empty); if (error) @@ -377,6 +379,7 @@ xfs_fsverity_read_merkle( pgoff_t index) { index += xfs_fsverity_metadata_offset(XFS_I(inode)) >> PAGE_SHIFT; + trace_xfs_fsverity_read_merkle(XFS_I(inode), index, PAGE_SIZE); return generic_read_merkle_tree_page(inode, index); } @@ -391,6 +394,7 @@ xfs_fsverity_readahead_merkle_tree( unsigned long nr_pages) { index += xfs_fsverity_metadata_offset(XFS_I(inode)) >> PAGE_SHIFT; + trace_xfs_fsverity_read_merkle(XFS_I(inode), index, PAGE_SIZE); generic_readahead_merkle_tree(inode, index, nr_pages); } @@ -414,6 +418,8 @@ xfs_fsverity_write_merkle( const char *p; unsigned int i; + trace_xfs_fsverity_write_merkle(XFS_I(inode), position, size); + if (position + size > inode->i_sb->s_maxbytes) return -EFBIG; diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 5e8190fe2be9..d05f79ec92db 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -6440,6 +6440,52 @@ TRACE_EVENT(xfs_verify_media_error, __entry->error) ); +TRACE_EVENT(xfs_fsverity_get_descriptor, + TP_PROTO(struct xfs_inode *ip), + TP_ARGS(ip), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(xfs_ino_t, ino) + ), + TP_fast_assign( + __entry->dev = VFS_I(ip)->i_sb->s_dev; + __entry->ino = ip->i_ino; + ), + TP_printk("dev %d:%d ino 0x%llx", + MAJOR(__entry->dev), MINOR(__entry->dev), + __entry->ino) +); + +DECLARE_EVENT_CLASS(xfs_fsverity_class, + TP_PROTO(struct xfs_inode *ip, u64 pos, size_t length), + TP_ARGS(ip, pos, length), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(xfs_ino_t, ino) + __field(u64, pos) + __field(size_t, length) + ), + TP_fast_assign( + __entry->dev = VFS_I(ip)->i_sb->s_dev; + __entry->ino = ip->i_ino; + __entry->pos = pos; + __entry->length = length; + ), + TP_printk("dev %d:%d ino 0x%llx pos 0x%llx length 0x%zx", + MAJOR(__entry->dev), MINOR(__entry->dev), + __entry->ino, + __entry->pos, + __entry->length) +) + +#define DEFINE_FSVERITY_EVENT(name) \ +DEFINE_EVENT(xfs_fsverity_class, name, \ + TP_PROTO(struct xfs_inode *ip, u64 pos, size_t length), \ + TP_ARGS(ip, pos, length)) +DEFINE_FSVERITY_EVENT(xfs_fsverity_read_merkle); +DEFINE_FSVERITY_EVENT(xfs_fsverity_write_merkle); +DEFINE_FSVERITY_EVENT(xfs_fsverity_file_corrupt); + #endif /* _TRACE_XFS_H */ #undef TRACE_INCLUDE_PATH -- 2.51.2