From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com,
linux-fsdevel@vger.kernel.org
Subject: [PATCH v4 00/46] btrfs: add fscrypt support
Date: Fri, 1 Dec 2023 17:10:57 -0500 [thread overview]
Message-ID: <cover.1701468305.git.josef@toxicpanda.com> (raw)
Hello,
v3 can be found here
https://lore.kernel.org/linux-btrfs/cover.1697480198.git.josef@toxicpanda.com/
There's been a longer delay between versions than I'd like, this was mostly due
to Plumbers, Holidays, and then uncovering a bunch of new issues with '-o
test_dummy_encryption'. I'm still working through some of the btrfs specific
failures, but the fscrypt side appears to be stable. I had to add a few changes
to fscrypt since the last time, but nothing earth shattering, just moving the
keyring destruction and adding a helper we need for btrfs send to work properly.
This is passing a good chunk of the fstests, at this point the majority appear
to be cases where I need to exclude the test when using test_dummy_encryption
because of various limitations of our tools or other infrastructure related
things.
I likely will have a follow-up series with more fixes, but the bulk of this is
unchanged since the last posting. There were some bug fixes and such but the
overall design remains the same. Thanks,
Josef
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 (31):
fs: move fscrypt keyring destruction to after ->put_super
fscrypt: add per-extent encryption support
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 documentation about extent encryption
btrfs: add infrastructure for safe em freeing
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: pass the fscrypt_info through the replace extent infrastructure
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: 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
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 (8):
btrfs: disable verity on encrypted inodes
btrfs: handle nokey names.
btrfs: add encryption to CONFIG_BTRFS_DEBUG
btrfs: add get_devices hook for fscrypt
btrfs: turn on inlinecrypt mount option for encrypt
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 | 40 ++
block/blk-crypto-internal.h | 8 +
block/blk-crypto-profile.c | 2 +
block/blk-crypto.c | 6 +-
fs/btrfs/Makefile | 1 +
fs/btrfs/accessors.h | 50 +++
fs/btrfs/backref.c | 114 ++++--
fs/btrfs/bio.c | 75 +++-
fs/btrfs/bio.h | 6 +
fs/btrfs/btrfs_inode.h | 3 +-
fs/btrfs/compression.c | 6 +
fs/btrfs/ctree.h | 4 +
fs/btrfs/defrag.c | 10 +-
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 | 1 +
fs/btrfs/extent_io.c | 114 +++++-
fs/btrfs/extent_io.h | 3 +
fs/btrfs/extent_map.c | 102 ++++-
fs/btrfs/extent_map.h | 12 +
fs/btrfs/file-item.c | 17 +-
fs/btrfs/file-item.h | 7 +-
fs/btrfs/file.c | 16 +-
fs/btrfs/fs.h | 6 +-
fs/btrfs/fscrypt.c | 412 ++++++++++++++++++++
fs/btrfs/fscrypt.h | 112 ++++++
fs/btrfs/inode.c | 518 ++++++++++++++++++++------
fs/btrfs/ioctl.c | 68 ++--
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 | 133 ++++++-
fs/btrfs/super.c | 75 ++++
fs/btrfs/sysfs.c | 6 +
fs/btrfs/tree-checker.c | 66 +++-
fs/btrfs/tree-log.c | 26 +-
fs/btrfs/verity.c | 3 +
fs/crypto/crypto.c | 10 +-
fs/crypto/fname.c | 39 +-
fs/crypto/fscrypt_private.h | 44 +++
fs/crypto/hooks.c | 42 +++
fs/crypto/inline_crypt.c | 87 ++++-
fs/crypto/keyring.c | 18 +-
fs/crypto/keysetup.c | 155 ++++++++
fs/crypto/policy.c | 59 +++
fs/super.c | 12 +-
include/linux/blk-crypto.h | 9 +-
include/linux/fscrypt.h | 130 +++++++
include/uapi/linux/btrfs.h | 1 +
include/uapi/linux/btrfs_tree.h | 35 +-
55 files changed, 2619 insertions(+), 314 deletions(-)
create mode 100644 fs/btrfs/fscrypt.c
create mode 100644 fs/btrfs/fscrypt.h
--
2.41.0
next reply other threads:[~2023-12-01 22:11 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-01 22:10 Josef Bacik [this message]
2023-12-01 22:10 ` [PATCH v4 01/46] fs: move fscrypt keyring destruction to after ->put_super Josef Bacik
2023-12-05 1:58 ` Eric Biggers
2023-12-05 22:48 ` Josef Bacik
2023-12-06 0:01 ` Eric Biggers
2023-12-01 22:10 ` [PATCH v4 02/46] fscrypt: add per-extent encryption support Josef Bacik
2023-12-05 3:58 ` Eric Biggers
2023-12-05 22:48 ` Josef Bacik
2023-12-05 23:57 ` Eric Biggers
2023-12-13 4:16 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 03/46] fscrypt: add a fscrypt_inode_open helper Josef Bacik
2023-12-05 4:14 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 04/46] fscrypt: conditionally don't wipe mk secret until the last active user is done Josef Bacik
2023-12-01 22:11 ` [PATCH v4 05/46] blk-crypto: add a process bio callback Josef Bacik
2023-12-05 4:54 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 06/46] fscrypt: expose fscrypt_nokey_name Josef Bacik
2023-12-05 5:03 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 07/46] fscrypt: add documentation about extent encryption Josef Bacik
2023-12-01 22:11 ` [PATCH v4 08/46] btrfs: add infrastructure for safe em freeing Josef Bacik
2023-12-01 22:11 ` [PATCH v4 09/46] btrfs: disable various operations on encrypted inodes Josef Bacik
2023-12-01 22:11 ` [PATCH v4 10/46] btrfs: disable verity " Josef Bacik
2023-12-05 5:07 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 11/46] btrfs: start using fscrypt hooks Josef Bacik
2023-12-01 22:11 ` [PATCH v4 12/46] btrfs: add inode encryption contexts Josef Bacik
2023-12-05 5:22 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 13/46] btrfs: add new FEATURE_INCOMPAT_ENCRYPT flag Josef Bacik
2023-12-01 22:11 ` [PATCH v4 14/46] btrfs: adapt readdir for encrypted and nokey names Josef Bacik
2023-12-01 22:11 ` [PATCH v4 15/46] btrfs: handle " Josef Bacik
2023-12-05 5:29 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 16/46] btrfs: implement fscrypt ioctls Josef Bacik
2023-12-01 22:11 ` [PATCH v4 17/46] btrfs: add encryption to CONFIG_BTRFS_DEBUG Josef Bacik
2023-12-05 5:11 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 18/46] btrfs: add get_devices hook for fscrypt Josef Bacik
2023-12-01 22:11 ` [PATCH v4 19/46] btrfs: turn on inlinecrypt mount option for encrypt Josef Bacik
2023-12-05 5:41 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 20/46] btrfs: set file extent encryption excplicitly Josef Bacik
2023-12-01 22:11 ` [PATCH v4 21/46] btrfs: add fscrypt_info and encryption_type to extent_map Josef Bacik
2023-12-01 22:11 ` [PATCH v4 22/46] btrfs: add fscrypt_info and encryption_type to ordered_extent Josef Bacik
2023-12-01 22:11 ` [PATCH v4 23/46] btrfs: plumb through setting the fscrypt_info for ordered extents Josef Bacik
2023-12-01 22:11 ` [PATCH v4 24/46] btrfs: plumb the fscrypt extent context through create_io_em Josef Bacik
2023-12-01 22:11 ` [PATCH v4 25/46] btrfs: populate the ordered_extent with the fscrypt context Josef Bacik
2023-12-01 22:11 ` [PATCH v4 26/46] btrfs: keep track of fscrypt info and orig_start for dio reads Josef Bacik
2023-12-05 5:44 ` Eric Biggers
2023-12-01 22:11 ` [PATCH v4 27/46] btrfs: add an optional encryption context to the end of file extents Josef Bacik
2023-12-01 22:11 ` [PATCH v4 28/46] btrfs: explicitly track file extent length for replace and drop Josef Bacik
2023-12-01 22:11 ` [PATCH v4 29/46] btrfs: pass through fscrypt_extent_info to the file extent helpers Josef Bacik
2023-12-01 22:11 ` [PATCH v4 30/46] btrfs: pass the fscrypt_info through the replace extent infrastructure Josef Bacik
2023-12-01 22:11 ` [PATCH v4 31/46] btrfs: implement the fscrypt extent encryption hooks Josef Bacik
2023-12-01 22:11 ` [PATCH v4 32/46] btrfs: setup fscrypt_extent_info for new extents Josef Bacik
2023-12-01 22:11 ` [PATCH v4 33/46] btrfs: populate ordered_extent with the orig offset Josef Bacik
2023-12-01 22:11 ` [PATCH v4 34/46] btrfs: set the bio fscrypt context when applicable Josef Bacik
2023-12-01 22:11 ` [PATCH v4 35/46] btrfs: add a bio argument to btrfs_csum_one_bio Josef Bacik
2023-12-01 22:11 ` [PATCH v4 36/46] btrfs: add orig_logical to btrfs_bio Josef Bacik
2023-12-01 22:11 ` [PATCH v4 37/46] btrfs: limit encrypted writes to 256 segments Josef Bacik
2023-12-01 22:11 ` [PATCH v4 38/46] btrfs: implement process_bio cb for fscrypt Josef Bacik
2023-12-01 22:11 ` [PATCH v4 39/46] btrfs: add test_dummy_encryption support Josef Bacik
2023-12-01 22:11 ` [PATCH v4 40/46] btrfs: don't rewrite ret from inode_permission Josef Bacik
2023-12-01 22:11 ` [PATCH v4 41/46] btrfs: move inode_to_path higher in backref.c Josef Bacik
2023-12-01 22:11 ` [PATCH v4 42/46] btrfs: make btrfs_ref_to_path handle encrypted filenames Josef Bacik
2023-12-01 22:11 ` [PATCH v4 43/46] btrfs: don't search back for dir inode item in INO_LOOKUP_USER Josef Bacik
2023-12-01 22:11 ` [PATCH v4 44/46] btrfs: deal with encrypted symlinks in send Josef Bacik
2023-12-01 22:11 ` [PATCH v4 45/46] btrfs: decrypt file names for send Josef Bacik
2023-12-01 22:11 ` [PATCH v4 46/46] btrfs: load the inode context before sending writes Josef Bacik
2023-12-05 5:54 ` Eric Biggers
2023-12-01 22:15 ` [PATCH v4 00/46] btrfs: add fscrypt support Josef Bacik
2023-12-05 1:49 ` Eric Biggers
2023-12-05 14:16 ` David Sterba
2023-12-05 20:02 ` Eric Biggers
2024-04-09 23:42 ` Eric Biggers
2024-04-11 18:45 ` Josef Bacik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1701468305.git.josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).