From: Eric Biggers <ebiggers@kernel.org>
To: linux-fscrypt@vger.kernel.org
Cc: linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-mtd@lists.infradead.org,
Chandan Rajendra <chandan@linux.ibm.com>
Subject: [PATCH v2 00/14] fscrypt, ext4: prepare for blocksize != PAGE_SIZE
Date: Mon, 20 May 2019 09:29:38 -0700 [thread overview]
Message-ID: <20190520162952.156212-1-ebiggers@kernel.org> (raw)
Hello,
This patchset prepares fs/crypto/, and partially ext4, for the
'blocksize != PAGE_SIZE' case.
This basically contains the encryption changes from Chandan Rajendra's
patchset "[V2,00/13] Consolidate FS read I/O callbacks code"
(https://patchwork.kernel.org/project/linux-fscrypt/list/?series=111039)
that don't require introducing the read_callbacks and don't depend on
fsverity stuff. But they've been reworked to clean things up a lot.
I'd like to apply this patchset for 5.3 in order to make things forward
for ext4 encryption with 'blocksize != PAGE_SIZE'.
AFAICT, after this patchset the only thing stopping ext4 encryption from
working with blocksize != PAGE_SIZE is the lack of encryption support in
block_read_full_page(), which the read_callbacks will address.
This patchset applies to v5.2-rc1, and it can also be retrieved from git
at https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git
branch "fscrypt-subpage-blocks-prep".
Changed since v1 (minor cleanups only):
- In "fscrypt: simplify bounce page handling", also remove
the definition of FS_CTX_HAS_BOUNCE_BUFFER_FL.
- In "ext4: decrypt only the needed blocks in ext4_block_write_begin()",
simplify the code slightly by moving the IS_ENCRYPTED() check.
- Change __fscrypt_decrypt_bio() in a separate patch rather than as part
of "fscrypt: support decrypting multiple filesystem blocks per page".
The resulting code is the same, so I kept Chandan's Reviewed-by.
- Improve the commit message of
"fscrypt: introduce fscrypt_decrypt_block_inplace()".
Chandan Rajendra (3):
ext4: clear BH_Uptodate flag on decryption error
ext4: decrypt only the needed blocks in ext4_block_write_begin()
ext4: decrypt only the needed block in __ext4_block_zero_page_range()
Eric Biggers (11):
fscrypt: simplify bounce page handling
fscrypt: remove the "write" part of struct fscrypt_ctx
fscrypt: rename fscrypt_do_page_crypto() to fscrypt_crypt_block()
fscrypt: clean up some BUG_ON()s in block encryption/decryption
fscrypt: introduce fscrypt_encrypt_block_inplace()
fscrypt: support encrypting multiple filesystem blocks per page
fscrypt: handle blocksize < PAGE_SIZE in fscrypt_zeroout_range()
fscrypt: introduce fscrypt_decrypt_block_inplace()
fscrypt: support decrypting multiple filesystem blocks per page
fscrypt: decrypt only the needed blocks in __fscrypt_decrypt_bio()
ext4: encrypt only up to last block in ext4_bio_write_page()
fs/crypto/bio.c | 73 +++------
fs/crypto/crypto.c | 299 ++++++++++++++++++++----------------
fs/crypto/fscrypt_private.h | 15 +-
fs/ext4/inode.c | 37 +++--
fs/ext4/page-io.c | 44 +++---
fs/f2fs/data.c | 17 +-
fs/ubifs/crypto.c | 19 +--
include/linux/fscrypt.h | 96 ++++++++----
8 files changed, 319 insertions(+), 281 deletions(-)
--
2.21.0.1020.gf2820cf01a-goog
next reply other threads:[~2019-05-20 16:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 16:29 Eric Biggers [this message]
2019-05-20 16:29 ` [PATCH v2 01/14] fscrypt: simplify bounce page handling Eric Biggers
2019-05-20 16:29 ` [PATCH v2 02/14] fscrypt: remove the "write" part of struct fscrypt_ctx Eric Biggers
2019-05-20 16:29 ` [PATCH v2 03/14] fscrypt: rename fscrypt_do_page_crypto() to fscrypt_crypt_block() Eric Biggers
2019-05-20 16:29 ` [PATCH v2 04/14] fscrypt: clean up some BUG_ON()s in block encryption/decryption Eric Biggers
2019-05-20 16:29 ` [PATCH v2 05/14] fscrypt: introduce fscrypt_encrypt_block_inplace() Eric Biggers
2019-05-20 16:29 ` [PATCH v2 06/14] fscrypt: support encrypting multiple filesystem blocks per page Eric Biggers
2019-05-20 16:29 ` [PATCH v2 07/14] fscrypt: handle blocksize < PAGE_SIZE in fscrypt_zeroout_range() Eric Biggers
2019-05-20 16:29 ` [PATCH v2 08/14] fscrypt: introduce fscrypt_decrypt_block_inplace() Eric Biggers
2019-05-20 16:29 ` [PATCH v2 09/14] fscrypt: support decrypting multiple filesystem blocks per page Eric Biggers
2019-05-20 16:29 ` [PATCH v2 10/14] fscrypt: decrypt only the needed blocks in __fscrypt_decrypt_bio() Eric Biggers
2019-05-20 16:29 ` [PATCH v2 11/14] ext4: clear BH_Uptodate flag on decryption error Eric Biggers
2019-05-20 16:29 ` [PATCH v2 12/14] ext4: decrypt only the needed blocks in ext4_block_write_begin() Eric Biggers
2019-05-20 16:29 ` [PATCH v2 13/14] ext4: decrypt only the needed block in __ext4_block_zero_page_range() Eric Biggers
2019-05-20 16:29 ` [PATCH v2 14/14] ext4: encrypt only up to last block in ext4_bio_write_page() Eric Biggers
2019-05-29 20:47 ` [PATCH v2 00/14] fscrypt, ext4: prepare for blocksize != PAGE_SIZE Eric Biggers
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=20190520162952.156212-1-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=chandan@linux.ibm.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-mtd@lists.infradead.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 NNTP newsgroup(s).