Hi all,
This is V2 of fs-verity support in XFS. In this series I did
numerous changes from V1 which are described below.
This patchset introduces fs-verity [5] support for XFS. This
implementation utilizes extended attributes to store fs-verity
metadata. The Merkle tree blocks are stored in the remote extended
attributes.
A few key points:
- fs-verity metadata is stored in extended attributes
- Direct path and DAX are disabled for inodes with fs-verity
- Pages are verified in iomap's read IO path (offloaded to
workqueue)
- New workqueue for verification processing
- New ro-compat flag
- Inodes with fs-verity have new on-disk diflag
- xfs_attr_get() can return buffer with the attribute
The patchset is tested with xfstests -g auto on xfs_1k, xfs_4k,
xfs_1k_quota, and xfs_4k_quota. Haven't found any major failures.
Patches [6/23] and [7/23] touch ext4, f2fs, btrfs, and patch [8/23]
touches erofs, gfs2, and zonefs.
The patchset consist of four parts:
- [1..4]: Patches from Parent Pointer patchset which add binary
xattr names with a few deps
- [5..7]: Improvements to core fs-verity
- [8..9]: Add read path verification to iomap
- [10..23]: Integration of fs-verity to xfs
Changes from V1:
- Added parent pointer patches for easier testing
- Many issues and refactoring points fixed from the V1 review
- Adjusted for recent changes in fs-verity core (folios, non-4k)
- Dropped disabling of large folios
- Completely new fsverity patches (fix, callout, log_blocksize)
- Change approach to verification in iomap to the same one as in
write path. Callouts to fs instead of direct fs-verity use.
- New XFS workqueue for post read folio verification
- xfs_attr_get() can return underlying xfs_buf
- xfs_bufs are marked with XBF_VERITY_CHECKED to track verified
blocks
kernel:
[1]: https://github.com/alberand/linux/tree/xfs-verity-v2
xfsprogs:
[2]: https://github.com/alberand/xfsprogs/tree/fsverity-v2
xfstests:
[3]: https://github.com/alberand/xfstests/tree/fsverity-v2
v1:
[4]: https://lore.kernel.org/linux-xfs/20221213172935.680971-1-aalbersh@xxxxxxxxxx/
fs-verity:
[5]: https://www.kernel.org/doc/html/latest/filesystems/fsverity.html
Thanks,
Andrey
Allison Henderson (4):
xfs: Add new name to attri/d
xfs: add parent pointer support to attribute code
xfs: define parent pointer xattr format
xfs: Add xfs_verify_pptr
Andrey Albershteyn (19):
fsverity: make fsverity_verify_folio() accept folio's offset and size
fsverity: add drop_page() callout
fsverity: pass Merkle tree block size to ->read_merkle_tree_page()
iomap: hoist iomap_readpage_ctx from the iomap_readahead/_folio
iomap: allow filesystem to implement read path verification
xfs: add XBF_VERITY_CHECKED xfs_buf flag
xfs: add XFS_DA_OP_BUFFER to make xfs_attr_get() return buffer
xfs: introduce workqueue for post read IO work
xfs: add iomap's readpage operations
xfs: add attribute type for fs-verity
xfs: add fs-verity ro-compat flag
xfs: add inode on-disk VERITY flag
xfs: initialize fs-verity on file open and cleanup on inode
destruction
xfs: don't allow to enable DAX on fs-verity sealsed inode
xfs: disable direct read path for fs-verity sealed files
xfs: add fs-verity support
xfs: handle merkle tree block size != fs blocksize != PAGE_SIZE
xfs: add fs-verity ioctls
xfs: enable ro-compat fs-verity flag
fs/btrfs/verity.c | 15 +-
fs/erofs/data.c | 12 +-
fs/ext4/verity.c | 9 +-
fs/f2fs/verity.c | 9 +-
fs/gfs2/aops.c | 10 +-
fs/ioctl.c | 4 +
fs/iomap/buffered-io.c | 89 ++++++-----
fs/verity/read_metadata.c | 7 +-
fs/verity/verify.c | 9 +-
fs/xfs/Makefile | 1 +
fs/xfs/libxfs/xfs_attr.c | 81 +++++++++-
fs/xfs/libxfs/xfs_attr.h | 7 +-
fs/xfs/libxfs/xfs_attr_leaf.c | 7 +
fs/xfs/libxfs/xfs_attr_remote.c | 13 +-
fs/xfs/libxfs/xfs_da_btree.h | 7 +-
fs/xfs/libxfs/xfs_da_format.h | 46 +++++-
fs/xfs/libxfs/xfs_format.h | 14 +-
fs/xfs/libxfs/xfs_log_format.h | 8 +-
fs/xfs/libxfs/xfs_sb.c | 2 +
fs/xfs/scrub/attr.c | 4 +-
fs/xfs/xfs_aops.c | 61 +++++++-
fs/xfs/xfs_attr_item.c | 142 +++++++++++++++---
fs/xfs/xfs_attr_item.h | 1 +
fs/xfs/xfs_attr_list.c | 17 ++-
fs/xfs/xfs_buf.h | 17 ++-
fs/xfs/xfs_file.c | 22 ++-
fs/xfs/xfs_inode.c | 2 +
fs/xfs/xfs_inode.h | 3 +-
fs/xfs/xfs_ioctl.c | 22 +++
fs/xfs/xfs_iomap.c | 14 ++
fs/xfs/xfs_iops.c | 4 +
fs/xfs/xfs_linux.h | 1 +
fs/xfs/xfs_mount.h | 3 +
fs/xfs/xfs_ondisk.h | 4 +
fs/xfs/xfs_super.c | 19 +++
fs/xfs/xfs_trace.h | 1 +
fs/xfs/xfs_verity.c | 256 ++++++++++++++++++++++++++++++++
fs/xfs/xfs_verity.h | 27 ++++
fs/xfs/xfs_xattr.c | 9 ++
fs/zonefs/file.c | 12 +-
include/linux/fsverity.h | 18 ++-
include/linux/iomap.h | 39 ++++-
include/uapi/linux/fs.h | 1 +
43 files changed, 923 insertions(+), 126 deletions(-)
create mode 100644 fs/xfs/xfs_verity.c
create mode 100644 fs/xfs/xfs_verity.h
--
2.38.4
