diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-01-27 14:25:14 -0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-01-28 15:10:12 -0800 |
| commit | 51e4e3153ebc32d3280d5d17418ae6f1a44f1ec1 (patch) | |
| tree | 55d0a9d3b02a0a403034e6130829e0901e6f93fa /fs/ext4 | |
| parent | 5d0f0e57ed900917836385527ce5b122fa1425a3 (diff) | |
| download | linux-rpi-51e4e3153ebc32d3280d5d17418ae6f1a44f1ec1.tar.gz linux-rpi-51e4e3153ebc32d3280d5d17418ae6f1a44f1ec1.tar.bz2 linux-rpi-51e4e3153ebc32d3280d5d17418ae6f1a44f1ec1.zip | |
fscrypt: support decrypting data from large folios
Try to make the filesystem-level decryption functions in fs/crypto/
aware of large folios. This includes making fscrypt_decrypt_bio()
support the case where the bio contains large folios, and making
fscrypt_decrypt_pagecache_blocks() take a folio instead of a page.
There's no way to actually test this with large folios yet, but I've
tested that this doesn't cause any regressions.
Note that this patch just handles *decryption*, not encryption which
will be a little more difficult.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20230127224202.355629-1-ebiggers@kernel.org
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9d9f414f99fe..0fe1b746fe86 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1136,7 +1136,8 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, for (i = 0; i < nr_wait; i++) { int err2; - err2 = fscrypt_decrypt_pagecache_blocks(page, blocksize, + err2 = fscrypt_decrypt_pagecache_blocks(page_folio(page), + blocksize, bh_offset(wait[i])); if (err2) { clear_buffer_uptodate(wait[i]); @@ -3858,7 +3859,8 @@ static int __ext4_block_zero_page_range(handle_t *handle, if (fscrypt_inode_uses_fs_layer_crypto(inode)) { /* We expect the key to be set. */ BUG_ON(!fscrypt_has_encryption_key(inode)); - err = fscrypt_decrypt_pagecache_blocks(page, blocksize, + err = fscrypt_decrypt_pagecache_blocks(page_folio(page), + blocksize, bh_offset(bh)); if (err) { clear_buffer_uptodate(bh); |