btrfs: add fscrypt support
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v5 Latest52 patches 6 repliesIn review
- v446 patches 23 repliesSuperseded
- v334 patches 0 repliesSuperseded
Earlier versions · 2
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v2 | 36 patches | 7 replies | Superseded | |
| v1 | 8 patches | 1 reply | Superseded |
Changes in v5 from the cover letter
- Addressed all the comments from Eric and then reworked the rest of the code to handle the various changes.
- Fixed read repair.
- Fixed log replay.
- Disabled send for encrypted file systems.
- Disabled turning on encryption on RAID5/6 file systems.
Patches in v5 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/52 | fscrypt: add per-extent encryption supportfs/ fs/ fs/ +3 more | +405 | 0 replies | |
| 2/52 | fscrypt: allow inline encryption for extent based encryptionfs/ | +5 | 0 replies | |
| 3/52 | fscrypt: add a fscrypt_inode_open helperfs/ include/ | +43 | 0 replies | |
| 4/52 | fscrypt: conditionally don't wipe mk secret until the last active user is donefs/ | +17 | 0 replies | |
| 5/52 | blk-crypto: add a process bio callbackblock/ block/ block/ +3 more | +72 | 0 replies | |
| 6/52 | fscrypt: add a process_bio hook to fscrypt_operationsfs/ include/ | +16 | 0 replies | |
| 7/52 | fscrypt: expose fscrypt_nokey_namefs/ include/ | +36 | 0 replies | |
| 8/52 | fscrypt: add documentation about extent encryptionDocumentation/ | +41 | 0 replies | |
| 9/52 | btrfs: add infrastructure for safe em freeingfs/ fs/ fs/ | +87 | 1 reply | |
| 10/52 | btrfs: disable various operations on encrypted inodesfs/ fs/ | +9 | 1 reply | |
| 11/52 | btrfs: disable verity on encrypted inodesfs/ | +3 | 1 reply | |
| 12/52 | btrfs: start using fscrypt hooksfs/ fs/ fs/ +4 more | +116 | 0 replies | |
| 13/52 | btrfs: add inode encryption contextsfs/ fs/ fs/ +2 more | +154 | 0 replies | |
| 14/52 | btrfs: add new FEATURE_INCOMPAT_ENCRYPT flagfs/ fs/ fs/ +1 more | +14 | 0 replies | |
| 15/52 | btrfs: adapt readdir for encrypted and nokey namesfs/ fs/ fs/ +10 more | +321 | 0 replies | |
| 16/52 | btrfs: handle nokey names.fs/ fs/ fs/ | +73 | 0 replies | |
| 17/52 | btrfs: implement fscrypt ioctlsfs/ | +28 | 0 replies | |
| 18/52 | btrfs: gate encryption behind BTRFS_DEBUGfs/ | +2 | 0 replies | |
| 19/52 | btrfs: select encryption dependencies if FS_ENCRYPTIONfs/ | +3 | 0 replies | |
| 20/52 | btrfs: add get_devices hook for fscryptfs/ | +37 | 0 replies | |
| 21/52 | btrfs: set file extent encryption excplicitlyfs/ fs/ fs/ +2 more | +22 | 0 replies | |
| 22/52 | btrfs: add fscrypt_info and encryption_type to extent_mapfs/ fs/ fs/ +1 more | +49 | 0 replies | |
| 23/52 | btrfs: add fscrypt_info and encryption_type to ordered_extentfs/ fs/ | +8 | 0 replies | |
| 24/52 | btrfs: plumb through setting the fscrypt_info for ordered extentsfs/ fs/ fs/ | +36 | 0 replies | |
| 25/52 | btrfs: plumb the fscrypt extent context through create_io_emfs/ | +20 | 0 replies | |
| 26/52 | btrfs: populate the ordered_extent with the fscrypt contextfs/ | +56 | 0 replies | |
| 27/52 | btrfs: keep track of fscrypt info and orig_start for dio readsfs/ | +11 | 0 replies | |
| 28/52 | btrfs: add an optional encryption context to the end of file extentsfs/ fs/ include/ | +113 | 0 replies | |
| 29/52 | btrfs: explicitly track file extent length for replace and dropfs/ fs/ fs/ +2 more | +13 | 0 replies | |
| 30/52 | btrfs: pass through fscrypt_extent_info to the file extent helpersfs/ fs/ | +12 | 0 replies | |
| 31/52 | btrfs: implement the fscrypt extent encryption hooksfs/ fs/ fs/ +6 more | +171 | 0 replies | |
| 32/52 | btrfs: setup fscrypt_extent_info for new extentsfs/ | +33 | 0 replies | |
| 33/52 | btrfs: populate ordered_extent with the orig offsetfs/ fs/ fs/ | +41 | 0 replies | |
| 34/52 | btrfs: set the bio fscrypt context when applicablefs/ fs/ fs/ +2 more | +149 | 0 replies | |
| 35/52 | btrfs: add a bio argument to btrfs_csum_one_biofs/ fs/ fs/ | +3 | 0 replies | |
| 36/52 | btrfs: add orig_logical to btrfs_biofs/ fs/ fs/ | +14 | 0 replies | |
| 37/52 | btrfs: limit encrypted writes to 256 segmentsfs/ fs/ fs/ | +58 | 0 replies | |
| 38/52 | btrfs: implement process_bio cb for fscryptfs/ fs/ fs/ +1 more | +81 | 0 replies | |
| 39/52 | btrfs: implement read repair for encryptionfs/ fs/ fs/ +2 more | +91 | 0 replies | |
| 40/52 | btrfs: add test_dummy_encryption supportfs/ fs/ fs/ +1 more | +74 | 0 replies | |
| 41/52 | btrfs: don't rewrite ret from inode_permissionfs/ | +1 | 0 replies | |
| 42/52 | btrfs: move inode_to_path higher in backref.cfs/ | +33 | 0 replies | |
| 43/52 | btrfs: make btrfs_ref_to_path handle encrypted filenamesfs/ fs/ fs/ | +98 | 0 replies | |
| 44/52 | btrfs: don't search back for dir inode item in INO_LOOKUP_USERfs/ | +3 | 0 replies | |
| 45/52 | btrfs: deal with encrypted symlinks in sendfs/ | +44 | 0 replies | |
| 46/52 | btrfs: decrypt file names for sendfs/ | +41 | 0 replies | |
| 47/52 | btrfs: load the inode context before sending writesfs/ | +35 | 0 replies | |
| 48/52 | btrfs: set the appropriate free space settings in reconfigurefs/ fs/ fs/ | +19 | 0 replies | |
| 49/52 | btrfs: support encryption with log replayfs/ fs/ | +8 | 0 replies | |
| 50/52 | btrfs: disable auto defrag on encrypted filesfs/ | +8 | 0 replies | |
| 51/52 | btrfs: disable encryption on RAID5/6fs/ fs/ | +10 | 0 replies | |
| 52/52 | btrfs: disable send if we have encryption enabledfs/ | +6 | 1 reply |
Reviews trailers per patch
4 of 52 patches have a Reviewed-by or Acked-by.
| Patch | Boris Burkov |
|---|---|
| 1/52 | |
| 2/52 | |
| 3/52 | |
| 4/52 | |
| 5/52 | |
| 6/52 | |
| 7/52 | |
| 8/52 | |
| 9/52 | R-b |
| 10/52 | R-b |
| 11/52 | R-b |
| 12/52 | |
| 13/52 | |
| 14/52 | |
| 15/52 | |
| 16/52 | |
| 17/52 | |
| 18/52 | |
| 19/52 | |
| 20/52 | |
| 21/52 | |
| 22/52 | |
| 23/52 | |
| 24/52 | |
| 25/52 | |
| 26/52 | |
| 27/52 | |
| 28/52 | |
| 29/52 | |
| 30/52 | |
| 31/52 | |
| 32/52 | |
| 33/52 | |
| 34/52 | |
| 35/52 | |
| 36/52 | |
| 37/52 | |
| 38/52 | |
| 39/52 | |
| 40/52 | |
| 41/52 | |
| 42/52 | |
| 43/52 | |
| 44/52 | |
| 45/52 | |
| 46/52 | |
| 47/52 | |
| 48/52 | |
| 49/52 | |
| 50/52 | |
| 51/52 | |
| 52/52 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v5 00/52] btrfs: add fscrypt support
Hello,
This is based on
https://github.com/btrfs/linux.git for-next
which has the recent pull from the fscrypt tree.
I've reworked a lot of this to incorporate Eric's suggestions. There are a few more patches because of bugs I've found in testing, and I've disabled a few features, namely RAID5/6 and send, as they will require more work to support with encryption and that can be done after the core work is merged.
Thanks,
Josef
v4->v5:
- Addressed all the comments from Eric and then reworked the rest of the code to handle the various changes.
- Fixed read repair.
- Fixed log replay.
- Disabled send for encrypted file systems.
- Disabled turning on encryption on RAID5/6 file systems.
v3->v4:
- Added support for '-o test_dummy_encryption' at Eric's suggestion, this uncovered a load of issues.
- Preliminary work to support decrypting names for our various name resolution ioctls. I didn't get everything but I got the ones we depend on in fstests.
- Preliminary work for send of an encrypted directory with the key loaded. There's probably still bugs in here, but it doesn't crash anymore.
- Fixed how we limit the bio size to work with direct and buffered io.
- Fixed using the wrong fscrypt extent context for writes into prealloc extents.
Josef Bacik (38):
fscrypt: add per-extent encryption support
fscrypt: allow inline encryption for extent based encryption
fscrypt: add a fscrypt_inode_open helper
fscrypt: conditionally don't wipe mk secret until the last active user
is done
blk-crypto: add a process bio callback
fscrypt: add a process_bio hook to fscrypt_operations
fscrypt: add documentation about extent encryption
btrfs: add infrastructure for safe em freeing
btrfs: select encryption dependencies if FS_ENCRYPTION
btrfs: add fscrypt_info and encryption_type to ordered_extent
btrfs: plumb through setting the fscrypt_info for ordered extents
btrfs: plumb the fscrypt extent context through create_io_em
btrfs: populate the ordered_extent with the fscrypt context
btrfs: keep track of fscrypt info and orig_start for dio reads
btrfs: add an optional encryption context to the end of file extents
btrfs: pass through fscrypt_extent_info to the file extent helpers
btrfs: implement the fscrypt extent encryption hooks
btrfs: setup fscrypt_extent_info for new extents
btrfs: populate ordered_extent with the orig offset
btrfs: set the bio fscrypt context when applicable
btrfs: add a bio argument to btrfs_csum_one_bio
btrfs: add orig_logical to btrfs_bio
btrfs: limit encrypted writes to 256 segments
btrfs: implement process_bio cb for fscrypt
btrfs: implement read repair for encryption
btrfs: add test_dummy_encryption support
btrfs: don't rewrite ret from inode_permission
btrfs: move inode_to_path higher in backref.c
btrfs: make btrfs_ref_to_path handle encrypted filenames
btrfs: don't search back for dir inode item in INO_LOOKUP_USER
btrfs: deal with encrypted symlinks in send
btrfs: decrypt file names for send
btrfs: load the inode context before sending writes
btrfs: set the appropriate free space settings in reconfigure
btrfs: support encryption with log replay
btrfs: disable auto defrag on encrypted files
btrfs: disable encryption on RAID5/6
btrfs: disable send if we have encryption enabled
Omar Sandoval (7):
fscrypt: expose fscrypt_nokey_name
btrfs: disable various operations on encrypted inodes
btrfs: start using fscrypt hooks
btrfs: add inode encryption contexts
btrfs: add new FEATURE_INCOMPAT_ENCRYPT flag
btrfs: adapt readdir for encrypted and nokey names
btrfs: implement fscrypt ioctls
Sweet Tea Dorminy (7):
btrfs: disable verity on encrypted inodes
btrfs: handle nokey names.
btrfs: gate encryption behind BTRFS_DEBUG
btrfs: add get_devices hook for fscrypt
btrfs: set file extent encryption excplicitly
btrfs: add fscrypt_info and encryption_type to extent_map
btrfs: explicitly track file extent length for replace and drop
Documentation/filesystems/fscrypt.rst | 41 ++ block/blk-crypto-fallback.c | 43 +++ block/blk-crypto-internal.h | 8 + block/blk-crypto-profile.c | 2 + block/blk-crypto.c | 6 +- fs/btrfs/Kconfig | 3 + fs/btrfs/Makefile | 1 + fs/btrfs/accessors.h | 50 +++ fs/btrfs/backref.c | 114 ++++-- fs/btrfs/bio.c | 163 +++++++- fs/btrfs/bio.h | 16 +- fs/btrfs/btrfs_inode.h | 3 +- fs/btrfs/compression.c | 9 + fs/btrfs/ctree.h | 5 + fs/btrfs/defrag.c | 18 +- fs/btrfs/delayed-inode.c | 29 +- fs/btrfs/delayed-inode.h | 6 +- fs/btrfs/dir-item.c | 108 +++++- fs/btrfs/dir-item.h | 11 +- fs/btrfs/disk-io.c | 3 +- fs/btrfs/extent_io.c | 120 +++++- fs/btrfs/extent_io.h | 3 + fs/btrfs/extent_map.c | 104 ++++- fs/btrfs/extent_map.h | 26 ++ fs/btrfs/file-item.c | 33 +- fs/btrfs/file-item.h | 7 +- fs/btrfs/file.c | 12 +- fs/btrfs/fs.h | 6 +- fs/btrfs/fscrypt.c | 423 ++++++++++++++++++++ fs/btrfs/fscrypt.h | 116 ++++++ fs/btrfs/inode.c | 529 ++++++++++++++++++++------ fs/btrfs/ioctl.c | 69 ++-- fs/btrfs/ordered-data.c | 36 +- fs/btrfs/ordered-data.h | 21 +- fs/btrfs/reflink.c | 8 + fs/btrfs/root-tree.c | 8 +- fs/btrfs/root-tree.h | 2 +- fs/btrfs/send.c | 140 ++++++- fs/btrfs/super.c | 106 +++++- fs/btrfs/super.h | 3 +- fs/btrfs/sysfs.c | 6 + fs/btrfs/tree-checker.c | 66 +++- fs/btrfs/tree-log.c | 37 +- fs/btrfs/verity.c | 3 + fs/crypto/crypto.c | 10 +- fs/crypto/fname.c | 36 -- fs/crypto/fscrypt_private.h | 42 ++ fs/crypto/hooks.c | 46 ++- fs/crypto/inline_crypt.c | 84 +++- fs/crypto/keyring.c | 18 +- fs/crypto/keysetup.c | 166 ++++++++ fs/crypto/policy.c | 47 +++ include/linux/blk-crypto.h | 15 +- include/linux/fscrypt.h | 125 ++++++ include/uapi/linux/btrfs.h | 1 + include/uapi/linux/btrfs_tree.h | 35 +- 56 files changed, 2798 insertions(+), 350 deletions(-) create mode 100644 fs/btrfs/fscrypt.c create mode 100644 fs/btrfs/fscrypt.h
Signature · 1 line
2.43.0