Skip to content

Commit 8a2c77b

Browse files
committed
f2fs: support direct I/O with fscrypt using blk-crypto
Encrypted files traditionally haven't supported DIO, due to the need to encrypt/decrypt the data. However, when the encryption is implemented using inline encryption (blk-crypto) instead of the traditional filesystem-layer encryption, it is straightforward to support DIO. Therefore, make f2fs support DIO on files that are using inline encryption. Since f2fs uses iomap for DIO, and fscrypt support was already added to iomap DIO, this just requires two small changes: - Let DIO proceed when supported, by checking fscrypt_dio_supported() instead of assuming that encrypted files never support DIO. - In f2fs_iomap_begin(), use fscrypt_limit_io_blocks() to limit the length of the mapping in the rare case where a DUN discontiguity occurs in the middle of an extent. The iomap DIO implementation requires this, since it assumes that it can submit a bio covering (up to) the whole mapping, without checking fscrypt constraints itself. Co-developed-by: Satya Tangirala <[email protected]> Signed-off-by: Satya Tangirala <[email protected]> Acked-by: Jaegeuk Kim <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Eric Biggers <[email protected]>
1 parent 38ea50d commit 8a2c77b

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

fs/f2fs/data.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4044,6 +4044,13 @@ static int f2fs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
40444044

40454045
iomap->offset = blks_to_bytes(inode, map.m_lblk);
40464046

4047+
/*
4048+
* When inline encryption is enabled, sometimes I/O to an encrypted file
4049+
* has to be broken up to guarantee DUN contiguity. Handle this by
4050+
* limiting the length of the mapping returned.
4051+
*/
4052+
map.m_len = fscrypt_limit_io_blocks(inode, map.m_lblk, map.m_len);
4053+
40474054
if (map.m_flags & (F2FS_MAP_MAPPED | F2FS_MAP_UNWRITTEN)) {
40484055
iomap->length = blks_to_bytes(inode, map.m_len);
40494056
if (map.m_flags & F2FS_MAP_MAPPED) {

fs/f2fs/f2fs.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4371,7 +4371,11 @@ static inline bool f2fs_force_buffered_io(struct inode *inode,
43714371
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
43724372
int rw = iov_iter_rw(iter);
43734373

4374-
if (f2fs_post_read_required(inode))
4374+
if (!fscrypt_dio_supported(iocb, iter))
4375+
return true;
4376+
if (fsverity_active(inode))
4377+
return true;
4378+
if (f2fs_compressed_file(inode))
43754379
return true;
43764380

43774381
/* disallow direct IO if any of devices has unaligned blksize */

0 commit comments

Comments
 (0)