On Mon, Jul 20, 2020 at 11:37:35PM +0000, Satya Tangirala wrote:
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> Wire up iomap direct I/O with the fscrypt additions for direct I/O.
> This allows ext4 to support direct I/O on encrypted files when inline
> encryption is enabled.
>
> This change consists of two parts:
>
> - Set a bio_crypt_ctx on bios for encrypted files, so that the file
> contents get encrypted (or decrypted).
>
> - Ensure that encryption data unit numbers (DUNs) are contiguous within
> each bio. Use the new function fscrypt_limit_io_pages() for this,
> since the iomap code works directly with logical ranges and thus
> doesn't have a chance to call fscrypt_mergeable_bio() on each page.
>
> Note that fscrypt_limit_io_pages() is normally a no-op, as normally the
> DUNs simply increment along with the logical blocks. But it's needed to
> handle an edge case in one of the fscrypt IV generation methods.
>
> Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
> Co-developed-by: Satya Tangirala <satyat@xxxxxxxxxx>
> Signed-off-by: Satya Tangirala <satyat@xxxxxxxxxx>
> ---
> fs/iomap/direct-io.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
> index ec7b78e6feca..12064daa3e3d 100644
> --- a/fs/iomap/direct-io.c
> +++ b/fs/iomap/direct-io.c
> @@ -6,6 +6,7 @@
> #include <linux/module.h>
> #include <linux/compiler.h>
> #include <linux/fs.h>
> +#include <linux/fscrypt.h>
> #include <linux/iomap.h>
> #include <linux/backing-dev.h>
> #include <linux/uio.h>
> @@ -183,11 +184,16 @@ static void
> iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos,
> unsigned len)
> {
> + struct inode *inode = file_inode(dio->iocb->ki_filp);
> struct page *page = ZERO_PAGE(0);
> int flags = REQ_SYNC | REQ_IDLE;
> struct bio *bio;
>
> bio = bio_alloc(GFP_KERNEL, 1);
> +
> + /* encrypted direct I/O is guaranteed to be fs-block aligned */
> + WARN_ON_ONCE(fscrypt_needs_contents_encryption(inode));
Which means you are now placing a new constraint on this code in
that we cannot ever, in future, zero entire blocks here.
This code can issue arbitrary sized zeroing bios - multiple entire fs blocks
blocks if necessary - so I think constraining it to only support
partial block zeroing by adding a warning like this is no correct.
> @@ -253,6 +259,7 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
> ret = nr_pages;
> goto out;
> }
> + nr_pages = fscrypt_limit_io_pages(inode, pos, nr_pages);
So if "pos" overlaps a 2^32 offset when a certain mode is used, we
have to break up the IO?
If true, I'm not sure that this belongs here. Limiting the size of
the IOs because of filesytem contraints belongs in the filesystem
extent mapping code. That's the point where the IO is broken up into
maximally sized chunks the filesystem can issue as a contiguous
range. If the fscrypt code is breaking that "contiguous IO range"
because of the mode being used, the fs mapping code should break
the mapping at the boundery where the IO needs to be broken.
Hence the dio mapping code here will never build IOs that cross this
-filesystem- encryption limitation, and we don't need this fscrypt
code in the direct IO path at all.
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
