Move fscrypt and fsverity info out of struct inode
Get series with b4
b4 am [email protected]Versions newest first
- v5 Latest13 patches 12 repliesIn review
Patches in v5 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/13 | fscrypt: replace raw loads of info pointer with helper functionfs/ fs/ fs/ +4 more | +43 | 0 replies | |
| 2/13 | fscrypt: add support for info in fs-specific part of inodefs/ fs/ include/ | +46 | 0 replies | |
| 3/13 | ext4: move crypt info pointer to fs-specific part of inodefs/ fs/ fs/ | +9 | 1 reply | |
| 4/13 | f2fs: move crypt info pointer to fs-specific part of inodefs/ fs/ | +9 | 0 replies | |
| 5/13 | ubifs: move crypt info pointer to fs-specific part of inodefs/ fs/ | +6 | 0 replies | |
| 6/13 | ceph: move crypt info pointer to fs-specific part of inodefs/ fs/ fs/ | +4 | 0 replies | |
| 7/13 | fs: remove inode::i_crypt_infoinclude/ include/ | +6 | 0 replies | |
| 8/13 | fsverity: add support for info in fs-specific part of inodefs/ fs/ fs/ +2 more | +55 | 0 replies | |
| 9/13 | ext4: move verity info pointer to fs-specific part of inodefs/ fs/ fs/ | +9 | 1 reply | |
| 10/13 | f2fs: move verity info pointer to fs-specific part of inodefs/ fs/ fs/ | +8 | 0 replies | |
| 11/13 | btrfs: move verity info pointer to fs-specific part of inodefs/ fs/ fs/ | +10 | 0 replies | |
| 12/13 | fs: remove inode::i_verity_infoinclude/ include/ | +8 | 0 replies | |
| 13/13 | fsverity: check IS_VERITY() in fsverity_cleanup_inode()include/ | +8 | 0 replies |
Reviews trailers per patch
1 of 13 patches has a Reviewed-by or Acked-by.
| Patch | Theodore Ts'o |
|---|---|
| 1/13 | |
| 2/13 | |
| 3/13 | |
| 4/13 | |
| 5/13 | |
| 6/13 | |
| 7/13 | |
| 8/13 | |
| 9/13 | A-b |
| 10/13 | |
| 11/13 | |
| 12/13 | |
| 13/13 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v5 00/13] Move fscrypt and fsverity info out of struct inode
This is a cleaned-up implementation of moving the i_crypt_info and i_verity_info pointers out of 'struct inode' and into the fs-specific part of the inode, as proposed previously by Christian at
https://lore.kernel.org/r/[email protected]/
The high-level concept is still the same: fs/crypto/ and fs/verity/ locate the pointer by adding an offset to the address of struct inode. The offset is retrieved from fscrypt_operations or fsverity_operations.
I've cleaned up a lot of the details, including:
- Grouped changes into patches differently
- Rewrote commit messages and comments to be clearer
- Adjusted code formatting to be consistent with existing code
- Removed unneeded #ifdefs
- Improved choice and location of VFS_WARN_ON_ONCE() statements
- Added missing kerneldoc for ubifs_inode::i_crypt_info
- Moved field initialization to init_once functions when they exist
- Improved ceph offset calculation and removed unneeded static_asserts
- fsverity_get_info() now checks IS_VERITY() instead of v_ops
- fscrypt_put_encryption_info() no longer checks IS_ENCRYPTED(), since I no longer think it's actually correct there.
- verity_data_blocks() now keeps doing a raw dereference
- Dropped fscrypt_set_inode_info()
- Renamed some functions
- Do offset calculation using int, so we don't rely on unsigned overflow
- And more.
For v4 and earlier, see
https://lore.kernel.org/r/[email protected]/
I'd like to take this series through the fscrypt tree for 6.18. (fsverity normally has a separate tree, but by choosing just one tree for this, we'll avoid conflicts in some places.)
Eric Biggers (13):
fscrypt: replace raw loads of info pointer with helper function
fscrypt: add support for info in fs-specific part of inode
ext4: move crypt info pointer to fs-specific part of inode
f2fs: move crypt info pointer to fs-specific part of inode
ubifs: move crypt info pointer to fs-specific part of inode
ceph: move crypt info pointer to fs-specific part of inode
fs: remove inode::i_crypt_info
fsverity: add support for info in fs-specific part of inode
ext4: move verity info pointer to fs-specific part of inode
f2fs: move verity info pointer to fs-specific part of inode
btrfs: move verity info pointer to fs-specific part of inode
fs: remove inode::i_verity_info
fsverity: check IS_VERITY() in fsverity_cleanup_inode()
fs/btrfs/btrfs_inode.h | 5 ++++ fs/btrfs/inode.c | 3 ++ fs/btrfs/verity.c | 2 ++ fs/ceph/crypto.c | 2 ++ fs/ceph/inode.c | 1 + fs/ceph/super.h | 1 + fs/crypto/bio.c | 2 +- fs/crypto/crypto.c | 14 +++++---- fs/crypto/fname.c | 11 +++---- fs/crypto/fscrypt_private.h | 4 +-- fs/crypto/hooks.c | 2 +- fs/crypto/inline_crypt.c | 12 ++++---- fs/crypto/keysetup.c | 43 ++++++++++++++++----------- fs/crypto/policy.c | 7 +++-- fs/ext4/crypto.c | 2 ++ fs/ext4/ext4.h | 8 +++++ fs/ext4/super.c | 6 ++++ fs/ext4/verity.c | 2 ++ fs/f2fs/f2fs.h | 6 ++++ fs/f2fs/super.c | 10 ++++++- fs/f2fs/verity.c | 2 ++ fs/ubifs/crypto.c | 2 ++ fs/ubifs/ubifs.h | 4 +++ fs/verity/enable.c | 6 ++-- fs/verity/fsverity_private.h | 9 +++--- fs/verity/open.c | 23 ++++++++------- fs/verity/verify.c | 2 +- include/linux/fs.h | 10 ------- include/linux/fscrypt.h | 40 +++++++++++++++++++++++-- include/linux/fsverity.h | 57 +++++++++++++++++++++++++++++------- 30 files changed, 215 insertions(+), 83 deletions(-)
base-commit: 561c80369df0733ba0574882a1635287b20f9de2
Signature · 1 line
2.50.1