Skip to content

RFC fscrypt: add per-extent encryption keys

Sweet Tea Dorminy linux-btrfs linux-fscrypt llvm oe-kbuild-all 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 RFC Latest17 patches 10 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17fscrypt: factor accessing inode->i_crypt_infofs/crypto/crypto.c fs/crypto/fname.c fs/crypto/hooks.c +3 more+16 -151 reply
2/17fscrypt: separate getting info for a specific blockfs/crypto/crypto.c fs/crypto/fname.c fs/crypto/fscrypt_private.h +4 more+66 -170 replies
3/17fscrypt: adjust effective lblks based on extentsfs/crypto/crypto.c fs/crypto/inline_crypt.c+17 -90 replies
4/17fscrypt: factor out fscrypt_set_inode_info()fs/crypto/keysetup.c+37 -230 replies
5/17fscrypt: use parent dir's info for extent-based encryption.fs/crypto/fscrypt_private.h fs/crypto/keysetup.c+44 -10 replies
6/17fscrypt: add a super_block pointer to fscrypt_infofs/crypto/fscrypt_private.h fs/crypto/inline_crypt.c fs/crypto/keysetup.c +1 more+13 -110 replies
7/17fscrypt: update comments about inodes to include extentsfs/crypto/fscrypt_private.h fs/crypto/inline_crypt.c fs/crypto/keyring.c +1 more+55 -410 replies
8/17fscrypt: rename mk->mk_decrypted_inodes*fs/crypto/fscrypt_private.h fs/crypto/keyring.c fs/crypto/keysetup.c+27 -270 replies
9/17fscrypt: make fscrypt_setup_encryption_info generic for extentsfs/crypto/keysetup.c+21 -170 replies
10/17fscrypt: let fscrypt_infos be owned by an extentfs/crypto/fscrypt_private.h fs/crypto/keysetup.c+11 -10 replies
11/17fscrypt: update all the *per_file_* function namesfs/crypto/fscrypt_private.h fs/crypto/keysetup.c fs/crypto/keysetup_v1.c+23 -230 replies
12/17fscrypt: notify per-extent infos if master key vanishesfs/crypto/keyring.c+7 -00 replies
13/17fscrypt: use an optional ino equivalent for per-extent infosfs/crypto/crypto.c fs/crypto/fscrypt_private.h fs/crypto/keyring.c +2 more+46 -90 replies
14/17fscrypt: add creation/usage/freeing of per-extent infosfs/crypto/crypto.c fs/crypto/fscrypt_private.h fs/crypto/keysetup.c +1 more+116 -20 replies
15/17fscrypt: allow load/save of extent contextsfs/crypto/keysetup.c fs/crypto/policy.c include/linux/fscrypt.h+87 -06 replies
16/17fscrypt: disable inline encryption for extent-based encryptionfs/crypto/inline_crypt.c+4 -00 replies
17/17fscrypt: update documentation to mention per-extent keys.Documentation/filesystems/fscrypt.rst+32 -60 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [RFC PATCH 00/17] fscrypt: add per-extent encryption keys

Last month, after a discussion of using fscrypt in btrfs, several potential areas for expansion of fscrypt functionality were identified:
specifically, per-extent keys, authenticated encryption, and 'rekeying' a directory tree [1]. These additions will permit btrfs to have better cryptographic characteristics than previous attempts at expanding btrfs to use fscrypt.

This attempts to implement the first of these, per-extent keys (in analogy to the current per-inode keys) in fscrypt. For a filesystem using per-extent keys, the idea is that each regular file inode is linked to its parent directory's fscrypt_info, while each extent in the filesystem -- opaque to fscrypt -- stores a fscrypt_info providing the key for the data in that extent. For non-regular files, the inode has its own fscrypt_info as in current ("inode-based") fscrypt.

IV generation methods using logical block numbers use the logical block number within the extent, and for IV generation methods using inode numbers, such filesystems may optionally implement a method providing an equivalent on a per-extent basis.

Known limitations: change 12 ("fscrypt: notify per-extent infos if master key vanishes") does not sufficiently argue that there cannot be a race between freeing a master key and using it for some pending extent IO. Change 16 ("fscrypt: disable inline encryption for extent-based encryption") merely disables inline encryption, when it should implement generating appropriate inline encryption info for extent infos.

This has not been thoroughly tested against a btrfs implementation of the interfaces -- I've thrown out everything here and tried something new several times, and while I think this interface is a decent one, I would like to get input on it in parallel with finishing the btrfs side of this part, and the other elements of the design mentioned in [1]

[1] https://docs.google.com/document/d/1janjxewlewtVPqctkWOjSa7OhCgB8Gdx7iDaCDQQNZA/edit?usp=sharing

*** BLURB HERE ***

Sweet Tea Dorminy (17):
fscrypt: factor accessing inode->i_crypt_info
fscrypt: separate getting info for a specific block
fscrypt: adjust effective lblks based on extents
fscrypt: factor out fscrypt_set_inode_info()
fscrypt: use parent dir's info for extent-based encryption.
fscrypt: add a super_block pointer to fscrypt_info
fscrypt: update comments about inodes to include extents
fscrypt: rename mk->mk_decrypted_inodes*
fscrypt: make fscrypt_setup_encryption_info generic for extents
fscrypt: let fscrypt_infos be owned by an extent
fscrypt: update all the *per_file_* function names
fscrypt: notify per-extent infos if master key vanishes
fscrypt: use an optional ino equivalent for per-extent infos
fscrypt: add creation/usage/freeing of per-extent infos
fscrypt: allow load/save of extent contexts
fscrypt: disable inline encryption for extent-based encryption
fscrypt: update documentation to mention per-extent keys.

 Documentation/filesystems/fscrypt.rst |  38 +++-
 fs/crypto/crypto.c                    |  17 +-
 fs/crypto/fname.c                     |   9 +-
 fs/crypto/fscrypt_private.h           | 174 +++++++++++++----
 fs/crypto/hooks.c                     |   2 +-
 fs/crypto/inline_crypt.c              |  42 ++--
 fs/crypto/keyring.c                   |  67 ++++---
 fs/crypto/keysetup.c                  | 263 ++++++++++++++++++++------
 fs/crypto/keysetup_v1.c               |  24 +--
 fs/crypto/policy.c                    |  28 ++-
 include/linux/fscrypt.h               |  76 ++++++++
 11 files changed, 580 insertions(+), 160 deletions(-)

base-commit: b7af0635c87ff78d6bd523298ab7471f9ffd3ce5

Signature · 1 line
2.38.1