Skip to content

btrfs: add fscrypt support

Josef Bacik linux-btrfs 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest52 patches 6 repliesIn review
  2. v446 patches 23 repliesSuperseded
  3. v334 patches 0 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v236 patches7 repliesSuperseded
v18 patches1 replySuperseded

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 filesSizeRepliesApplied
1/52fscrypt: add per-extent encryption supportfs/crypto/crypto.c fs/crypto/fscrypt_private.h fs/crypto/inline_crypt.c +3 more+405 -10 replies
2/52fscrypt: allow inline encryption for extent based encryptionfs/crypto/inline_crypt.c+5 -20 replies
3/52fscrypt: add a fscrypt_inode_open helperfs/crypto/hooks.c include/linux/fscrypt.h+43 -110 replies
4/52fscrypt: conditionally don't wipe mk secret until the last active user is donefs/crypto/keyring.c+17 -10 replies
5/52blk-crypto: add a process bio callbackblock/blk-crypto-fallback.c block/blk-crypto-internal.h block/blk-crypto-profile.c +3 more+72 -40 replies
6/52fscrypt: add a process_bio hook to fscrypt_operationsfs/crypto/inline_crypt.c include/linux/fscrypt.h+16 -10 replies
7/52fscrypt: expose fscrypt_nokey_namefs/crypto/fname.c include/linux/fscrypt.h+36 -360 replies
8/52fscrypt: add documentation about extent encryptionDocumentation/filesystems/fscrypt.rst+41 -00 replies
9/52btrfs: add infrastructure for safe em freeingfs/btrfs/extent_map.c fs/btrfs/extent_map.h fs/btrfs/tree-log.c+87 -51 reply
10/52btrfs: disable various operations on encrypted inodesfs/btrfs/inode.c fs/btrfs/reflink.c+9 -11 reply
11/52btrfs: disable verity on encrypted inodesfs/btrfs/verity.c+3 -01 reply
12/52btrfs: start using fscrypt hooksfs/btrfs/Makefile fs/btrfs/btrfs_inode.h fs/btrfs/file.c +4 more+116 -180 replies
13/52btrfs: add inode encryption contextsfs/btrfs/fscrypt.c fs/btrfs/fscrypt.h fs/btrfs/inode.c +2 more+154 -20 replies
14/52btrfs: add new FEATURE_INCOMPAT_ENCRYPT flagfs/btrfs/fs.h fs/btrfs/super.c fs/btrfs/sysfs.c +1 more+14 -10 replies
15/52btrfs: adapt readdir for encrypted and nokey namesfs/btrfs/btrfs_inode.h fs/btrfs/delayed-inode.c fs/btrfs/delayed-inode.h +10 more+321 -730 replies
16/52btrfs: handle nokey names.fs/btrfs/dir-item.c fs/btrfs/fscrypt.c fs/btrfs/fscrypt.h+73 -20 replies
17/52btrfs: implement fscrypt ioctlsfs/btrfs/ioctl.c+28 -00 replies
18/52btrfs: gate encryption behind BTRFS_DEBUGfs/btrfs/ioctl.c+2 -00 replies
19/52btrfs: select encryption dependencies if FS_ENCRYPTIONfs/btrfs/Kconfig+3 -00 replies
20/52btrfs: add get_devices hook for fscryptfs/btrfs/fscrypt.c+37 -00 replies
21/52btrfs: set file extent encryption excplicitlyfs/btrfs/accessors.h fs/btrfs/inode.c fs/btrfs/tree-checker.c +2 more+22 -60 replies
22/52btrfs: add fscrypt_info and encryption_type to extent_mapfs/btrfs/extent_map.c fs/btrfs/extent_map.h fs/btrfs/file-item.c +1 more+49 -30 replies
23/52btrfs: add fscrypt_info and encryption_type to ordered_extentfs/btrfs/ordered-data.c fs/btrfs/ordered-data.h+8 -00 replies
24/52btrfs: plumb through setting the fscrypt_info for ordered extentsfs/btrfs/inode.c fs/btrfs/ordered-data.c fs/btrfs/ordered-data.h+36 -250 replies
25/52btrfs: plumb the fscrypt extent context through create_io_emfs/btrfs/inode.c+20 -160 replies
26/52btrfs: populate the ordered_extent with the fscrypt contextfs/btrfs/inode.c+56 -210 replies
27/52btrfs: keep track of fscrypt info and orig_start for dio readsfs/btrfs/inode.c+11 -00 replies
28/52btrfs: add an optional encryption context to the end of file extentsfs/btrfs/accessors.h fs/btrfs/tree-checker.c include/uapi/linux/btrfs_tree.h+113 -100 replies
29/52btrfs: explicitly track file extent length for replace and dropfs/btrfs/ctree.h fs/btrfs/file.c fs/btrfs/inode.c +2 more+13 -60 replies
30/52btrfs: pass through fscrypt_extent_info to the file extent helpersfs/btrfs/inode.c fs/btrfs/tree-log.c+12 -80 replies
31/52btrfs: implement the fscrypt extent encryption hooksfs/btrfs/ctree.h fs/btrfs/defrag.c fs/btrfs/file-item.c +6 more+171 -70 replies
32/52btrfs: setup fscrypt_extent_info for new extentsfs/btrfs/inode.c+33 -10 replies
33/52btrfs: populate ordered_extent with the orig offsetfs/btrfs/inode.c fs/btrfs/ordered-data.c fs/btrfs/ordered-data.h+41 -180 replies
34/52btrfs: set the bio fscrypt context when applicablefs/btrfs/compression.c fs/btrfs/extent_io.c fs/btrfs/fscrypt.c +2 more+149 -10 replies
35/52btrfs: add a bio argument to btrfs_csum_one_biofs/btrfs/bio.c fs/btrfs/file-item.c fs/btrfs/file-item.h+3 -40 replies
36/52btrfs: add orig_logical to btrfs_biofs/btrfs/bio.c fs/btrfs/bio.h fs/btrfs/file-item.c+14 -10 replies
37/52btrfs: limit encrypted writes to 256 segmentsfs/btrfs/bio.c fs/btrfs/fscrypt.c fs/btrfs/fscrypt.h+58 -10 replies
38/52btrfs: implement process_bio cb for fscryptfs/btrfs/bio.c fs/btrfs/bio.h fs/btrfs/file-item.c +1 more+81 -40 replies
39/52btrfs: implement read repair for encryptionfs/btrfs/bio.c fs/btrfs/bio.h fs/btrfs/compression.c +2 more+91 -100 replies
40/52btrfs: add test_dummy_encryption supportfs/btrfs/disk-io.c fs/btrfs/fs.h fs/btrfs/fscrypt.c +1 more+74 -00 replies
41/52btrfs: don't rewrite ret from inode_permissionfs/btrfs/ioctl.c+1 -30 replies
42/52btrfs: move inode_to_path higher in backref.cfs/btrfs/backref.c+33 -360 replies
43/52btrfs: make btrfs_ref_to_path handle encrypted filenamesfs/btrfs/backref.c fs/btrfs/fscrypt.c fs/btrfs/fscrypt.h+98 -40 replies
44/52btrfs: don't search back for dir inode item in INO_LOOKUP_USERfs/btrfs/ioctl.c+3 -200 replies
45/52btrfs: deal with encrypted symlinks in sendfs/btrfs/send.c+44 -30 replies
46/52btrfs: decrypt file names for sendfs/btrfs/send.c+41 -100 replies
47/52btrfs: load the inode context before sending writesfs/btrfs/send.c+35 -10 replies
48/52btrfs: set the appropriate free space settings in reconfigurefs/btrfs/disk-io.c fs/btrfs/super.c fs/btrfs/super.h+19 -150 replies
49/52btrfs: support encryption with log replayfs/btrfs/fscrypt.c fs/btrfs/tree-log.c+8 -30 replies
50/52btrfs: disable auto defrag on encrypted filesfs/btrfs/defrag.c+8 -00 replies
51/52btrfs: disable encryption on RAID5/6fs/btrfs/ioctl.c fs/btrfs/super.c+10 -00 replies
52/52btrfs: disable send if we have encryption enabledfs/btrfs/send.c+6 -01 reply

Reviews trailers per patch

4 of 52 patches have a Reviewed-by or Acked-by.

PatchBoris Burkov
1/52
2/52
3/52
4/52
5/52
6/52
7/52
8/52
9/52R-b
10/52R-b
11/52R-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/52R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

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