fscrypt: improve file creation flow
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest13 patches 6 repliesIn review
- v211 patches 2 repliesSuperseded
- v1 RFC8 patches 6 repliesSuperseded
Changes in v3 from the cover letter
- Added patch that changes fscrypt_set_test_dummy_encryption() to take a 'const char *'. (Needed by ceph.)
- Fixed bug where fscrypt_prepare_new_inode() succeeded even if the new inode's key couldn't be set up.
- Fixed bug where fscrypt_prepare_new_inode() wouldn't derive the dirhash key for new casefolded directories.
- Made warning messages account for i_ino possibly being 0 now.
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/13 | fscrypt: add fscrypt_prepare_new_inode() and fscrypt_set_context()fs/ fs/ fs/ +1 more | +223 | 0 replies | |
| 2/13 | ext4: factor out ext4_xattr_credits_for_new_inode()fs/ | +51 | 0 replies | |
| 3/13 | ext4: use fscrypt_prepare_new_inode() and fscrypt_set_context()fs/ | +17 | 0 replies | |
| 4/13 | f2fs: use fscrypt_prepare_new_inode() and fscrypt_set_context()fs/ fs/ fs/ | +7 | 0 replies | |
| 5/13 | ubifs: use fscrypt_prepare_new_inode() and fscrypt_set_context()fs/ | +16 | 0 replies | |
| 6/13 | fscrypt: adjust logging for in-creation inodesfs/ fs/ | +10 | 0 replies | |
| 7/13 | fscrypt: remove fscrypt_inherit_context()fs/ include/ | +0 | 0 replies | |
| 8/13 | fscrypt: require that fscrypt_encrypt_symlink() already has keyfs/ | +7 | 0 replies | |
| 9/13 | fscrypt: stop pretending that key setup is nofs-safefs/ fs/ fs/ | +7 | 0 replies | |
| 10/13 | fscrypt: make "#define fscrypt_policy" user-onlyfs/ include/ | +3 | 0 replies | |
| 11/13 | fscrypt: move fscrypt_prepare_symlink() out-of-linefs/ include/ | +50 | 0 replies | |
| 12/13 | fscrypt: handle test_dummy_encryption in more logical wayfs/ fs/ fs/ +7 more | +134 | 0 replies | |
| 13/13 | fscrypt: make fscrypt_set_test_dummy_encryption() take a 'const char *'fs/ fs/ fs/ +1 more | +9 | 3 replies |
Reviews trailers per patch
2 of 13 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Jaegeuk Kim | Jeff Layton |
|---|---|---|
| Series | A-b | |
| 1/13 | ||
| 2/13 | ||
| 3/13 | ||
| 4/13 | A-b | |
| 5/13 | ||
| 6/13 | ||
| 7/13 | ||
| 8/13 | ||
| 9/13 | ||
| 10/13 | ||
| 11/13 | ||
| 12/13 | A-b | |
| 13/13 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v3 00/13] fscrypt: improve file creation flow
Hello,
This series reworks the implementation of creating new encrypted files by introducing new helper functions that allow filesystems to set up the inodes' keys earlier, prior to taking too many filesystem locks.
This fixes deadlocks that are possible during memory reclaim because fscrypt_get_encryption_info() isn't GFP_NOFS-safe, yet it's called during an ext4 transaction or under f2fs_lock_op(). It also fixes a similar deadlock where f2fs can try to recursively lock a page when the test_dummy_encryption mount option is in use.
It also solves an ordering problem that the ceph support for fscrypt
will have. For more details about this ordering problem, see the
discussion on Jeff Layton's RFC patchsets for ceph fscrypt support
(v1: https://lkml.kernel.org/linux-fscrypt/[email protected]/T/#u
v2: https://lkml.kernel.org/linux-fscrypt/[email protected]/T/#u
v3: https://lkml.kernel.org/linux-fscrypt/[email protected]/T/#u)
Note that v3 of the ceph patchset is based on v2 of this patchset.
Patch 1 adds the above-mentioned new helper functions. Patches 2-5 convert ext4, f2fs, and ubifs to use them, and patches 6-9 clean up a few things afterwards.
Finally, patches 10-13 change the implementation of test_dummy_encryption to no longer set up an encryption key for unencrypted directories, which was confusing and was causing problems.
This patchset applies to the master branch of
https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git.
It can also be retrieved from tag "fscrypt-file-creation-v3" of
https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git.
I'm looking to apply this for 5.10; reviews are greatly appreciated!
Changed v2 => v3:
- Added patch that changes fscrypt_set_test_dummy_encryption() to take a 'const char *'. (Needed by ceph.)
- Fixed bug where fscrypt_prepare_new_inode() succeeded even if the new inode's key couldn't be set up.
- Fixed bug where fscrypt_prepare_new_inode() wouldn't derive the dirhash key for new casefolded directories.
- Made warning messages account for i_ino possibly being 0 now.
Changed v1 => v2:
- Added mention of another deadlock this fixes.
- Added patches to improve the test_dummy_encryption implementation.
- Dropped an ext4 cleanup patch that can be done separately later.
- Lots of small cleanups, and a couple small fixes.
Eric Biggers (13):
fscrypt: add fscrypt_prepare_new_inode() and fscrypt_set_context()
ext4: factor out ext4_xattr_credits_for_new_inode()
ext4: use fscrypt_prepare_new_inode() and fscrypt_set_context()
f2fs: use fscrypt_prepare_new_inode() and fscrypt_set_context()
ubifs: use fscrypt_prepare_new_inode() and fscrypt_set_context()
fscrypt: adjust logging for in-creation inodes
fscrypt: remove fscrypt_inherit_context()
fscrypt: require that fscrypt_encrypt_symlink() already has key
fscrypt: stop pretending that key setup is nofs-safe
fscrypt: make "#define fscrypt_policy" user-only
fscrypt: move fscrypt_prepare_symlink() out-of-line
fscrypt: handle test_dummy_encryption in more logical way
fscrypt: make fscrypt_set_test_dummy_encryption() take a 'const char
*'
fs/crypto/crypto.c | 4 +- fs/crypto/fname.c | 11 +- fs/crypto/fscrypt_private.h | 10 +- fs/crypto/hooks.c | 65 ++++++++---- fs/crypto/inline_crypt.c | 7 +- fs/crypto/keyring.c | 9 +- fs/crypto/keysetup.c | 182 +++++++++++++++++++++++-------- fs/crypto/keysetup_v1.c | 8 +- fs/crypto/policy.c | 200 ++++++++++++++++++++--------------- fs/ext4/ext4.h | 6 +- fs/ext4/ialloc.c | 119 +++++++++++---------- fs/ext4/super.c | 17 +-- fs/f2fs/dir.c | 2 +- fs/f2fs/f2fs.h | 25 +---- fs/f2fs/namei.c | 7 +- fs/f2fs/super.c | 16 +-- fs/ubifs/dir.c | 38 +++---- include/linux/fscrypt.h | 120 +++++++-------------- include/uapi/linux/fscrypt.h | 6 +- 19 files changed, 474 insertions(+), 378 deletions(-)
base-commit: 5e895bd4d5233cb054447d0491d4e63c8496d419
Signature · 8 lines
2.28.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel