| Message ID | 20231006184922.252188-14-aalbersh@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fs-verity support for XFS | expand |
On Fri, Oct 06, 2023 at 08:49:07PM +0200, Andrey Albershteyn wrote: > One of essential ideas of fs-verity is that pages which are already > verified won't need to be re-verified if they still in page cache. > > XFS will store Merkle tree blocks in extended attributes. Each > attribute has one Merkle tree block. When read extended attribute > data is put into xfs_buf. > > The data in the buffer is not aligned with xfs_buf pages and we > don't have a reference to these pages. Moreover, these pages are > released when value is copied out in xfs_attr code. In other words, > we can not directly mark underlying xfs_buf's pages as verified. /me wonders why the fs/verity code itself doesn't track which parts of the merkle tree have been verified. > One way to track that these pages were verified is to mark xattr's > buffer as verified instead. If buffer is evicted the incore > XBF_VERITY_CHECKED flag is lost. When the xattr is read again > xfs_attr_get() returns new buffer without the flag. The xfs_buf's > flag is then used to tell fs-verity if it's new page or cached one. > > The meaning of the flag is that value of the extended attribute in > the buffer is verified. Can there be multiple blocks from distant parts of the merkle tree stored in a single xattr leaf block? I'm imagining the case where merkle tree blocks are 4K each, but the fs block size is 64k. (Or: what is the relationship between merkle tree blocks and fs blocksize? Are they always the same, or can they differ?) Or, is there some guarantee that merkle tree blocks will always be stored as remote xattrs? I'm worrying about the case where an xfs_buf might contain 2 merkle tree blocks, we set XBF_VERITY_CHECKED having checked *one* of them but then forget to check any other verity blobs that might be in the same buffer. --D > Note that, the underlying pages have PageChecked() == false (the way > fs-verity identifies verified pages). > > The flag is being used later to SetPageChecked() on pages handed to > the fs-verity. > > Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com> > --- > fs/xfs/xfs_buf.h | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h > index df8f47953bb4..d0fadb6d4b59 100644 > --- a/fs/xfs/xfs_buf.h > +++ b/fs/xfs/xfs_buf.h > @@ -24,14 +24,15 @@ struct xfs_buf; > > #define XFS_BUF_DADDR_NULL ((xfs_daddr_t) (-1LL)) > > -#define XBF_READ (1u << 0) /* buffer intended for reading from device */ > -#define XBF_WRITE (1u << 1) /* buffer intended for writing to device */ > -#define XBF_READ_AHEAD (1u << 2) /* asynchronous read-ahead */ > -#define XBF_NO_IOACCT (1u << 3) /* bypass I/O accounting (non-LRU bufs) */ > -#define XBF_ASYNC (1u << 4) /* initiator will not wait for completion */ > -#define XBF_DONE (1u << 5) /* all pages in the buffer uptodate */ > -#define XBF_STALE (1u << 6) /* buffer has been staled, do not find it */ > -#define XBF_WRITE_FAIL (1u << 7) /* async writes have failed on this buffer */ > +#define XBF_READ (1u << 0) /* buffer intended for reading from device */ > +#define XBF_WRITE (1u << 1) /* buffer intended for writing to device */ > +#define XBF_READ_AHEAD (1u << 2) /* asynchronous read-ahead */ > +#define XBF_NO_IOACCT (1u << 3) /* bypass I/O accounting (non-LRU bufs) */ > +#define XBF_ASYNC (1u << 4) /* initiator will not wait for completion */ > +#define XBF_DONE (1u << 5) /* all pages in the buffer uptodate */ > +#define XBF_STALE (1u << 6) /* buffer has been staled, do not find it */ > +#define XBF_WRITE_FAIL (1u << 7) /* async writes have failed on this buffer */ > +#define XBF_VERITY_CHECKED (1u << 8) /* buffer was verified by fs-verity*/ > > /* buffer type flags for write callbacks */ > #define _XBF_INODES (1u << 16)/* inode buffer */ > -- > 2.40.1 >
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h index df8f47953bb4..d0fadb6d4b59 100644 --- a/fs/xfs/xfs_buf.h +++ b/fs/xfs/xfs_buf.h @@ -24,14 +24,15 @@ struct xfs_buf; #define XFS_BUF_DADDR_NULL ((xfs_daddr_t) (-1LL)) -#define XBF_READ (1u << 0) /* buffer intended for reading from device */ -#define XBF_WRITE (1u << 1) /* buffer intended for writing to device */ -#define XBF_READ_AHEAD (1u << 2) /* asynchronous read-ahead */ -#define XBF_NO_IOACCT (1u << 3) /* bypass I/O accounting (non-LRU bufs) */ -#define XBF_ASYNC (1u << 4) /* initiator will not wait for completion */ -#define XBF_DONE (1u << 5) /* all pages in the buffer uptodate */ -#define XBF_STALE (1u << 6) /* buffer has been staled, do not find it */ -#define XBF_WRITE_FAIL (1u << 7) /* async writes have failed on this buffer */ +#define XBF_READ (1u << 0) /* buffer intended for reading from device */ +#define XBF_WRITE (1u << 1) /* buffer intended for writing to device */ +#define XBF_READ_AHEAD (1u << 2) /* asynchronous read-ahead */ +#define XBF_NO_IOACCT (1u << 3) /* bypass I/O accounting (non-LRU bufs) */ +#define XBF_ASYNC (1u << 4) /* initiator will not wait for completion */ +#define XBF_DONE (1u << 5) /* all pages in the buffer uptodate */ +#define XBF_STALE (1u << 6) /* buffer has been staled, do not find it */ +#define XBF_WRITE_FAIL (1u << 7) /* async writes have failed on this buffer */ +#define XBF_VERITY_CHECKED (1u << 8) /* buffer was verified by fs-verity*/ /* buffer type flags for write callbacks */ #define _XBF_INODES (1u << 16)/* inode buffer */
One of essential ideas of fs-verity is that pages which are already verified won't need to be re-verified if they still in page cache. XFS will store Merkle tree blocks in extended attributes. Each attribute has one Merkle tree block. When read extended attribute data is put into xfs_buf. The data in the buffer is not aligned with xfs_buf pages and we don't have a reference to these pages. Moreover, these pages are released when value is copied out in xfs_attr code. In other words, we can not directly mark underlying xfs_buf's pages as verified. One way to track that these pages were verified is to mark xattr's buffer as verified instead. If buffer is evicted the incore XBF_VERITY_CHECKED flag is lost. When the xattr is read again xfs_attr_get() returns new buffer without the flag. The xfs_buf's flag is then used to tell fs-verity if it's new page or cached one. The meaning of the flag is that value of the extended attribute in the buffer is verified. Note that, the underlying pages have PageChecked() == false (the way fs-verity identifies verified pages). The flag is being used later to SetPageChecked() on pages handed to the fs-verity. Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com> --- fs/xfs/xfs_buf.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)