From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Satya Tangirala <satyat@google.com>
Cc: linux-fscrypt@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org,
Eric Biggers <ebiggers@google.com>
Subject: Re: [PATCH v4 2/7] direct-io: add support for fscrypt using blk-crypto
Date: Wed, 22 Jul 2020 10:05:47 -0700 [thread overview]
Message-ID: <20200722170547.GE3912099@google.com> (raw)
In-Reply-To: <20200720233739.824943-3-satyat@google.com>
On 07/20, Satya Tangirala wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> Set bio crypt contexts on bios by calling into fscrypt when required,
> and explicitly check for DUN continuity when adding pages to the bio.
> (While DUN continuity is usually implied by logical block contiguity,
> this is not the case when using certain fscrypt IV generation methods
> like IV_INO_LBLK_32).
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> Co-developed-by: Satya Tangirala <satyat@google.com>
> Signed-off-by: Satya Tangirala <satyat@google.com>
Reviwed-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/direct-io.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/fs/direct-io.c b/fs/direct-io.c
> index 6d5370eac2a8..f27f7e3780ee 100644
> --- a/fs/direct-io.c
> +++ b/fs/direct-io.c
> @@ -24,6 +24,7 @@
> #include <linux/module.h>
> #include <linux/types.h>
> #include <linux/fs.h>
> +#include <linux/fscrypt.h>
> #include <linux/mm.h>
> #include <linux/slab.h>
> #include <linux/highmem.h>
> @@ -411,6 +412,7 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio,
> sector_t first_sector, int nr_vecs)
> {
> struct bio *bio;
> + struct inode *inode = dio->inode;
>
> /*
> * bio_alloc() is guaranteed to return a bio when allowed to sleep and
> @@ -418,6 +420,9 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio,
> */
> bio = bio_alloc(GFP_KERNEL, nr_vecs);
>
> + fscrypt_set_bio_crypt_ctx(bio, inode,
> + sdio->cur_page_fs_offset >> inode->i_blkbits,
> + GFP_KERNEL);
> bio_set_dev(bio, bdev);
> bio->bi_iter.bi_sector = first_sector;
> bio_set_op_attrs(bio, dio->op, dio->op_flags);
> @@ -782,9 +787,17 @@ static inline int dio_send_cur_page(struct dio *dio, struct dio_submit *sdio,
> * current logical offset in the file does not equal what would
> * be the next logical offset in the bio, submit the bio we
> * have.
> + *
> + * When fscrypt inline encryption is used, data unit number
> + * (DUN) contiguity is also required. Normally that's implied
> + * by logical contiguity. However, certain IV generation
> + * methods (e.g. IV_INO_LBLK_32) don't guarantee it. So, we
> + * must explicitly check fscrypt_mergeable_bio() too.
> */
> if (sdio->final_block_in_bio != sdio->cur_page_block ||
> - cur_offset != bio_next_offset)
> + cur_offset != bio_next_offset ||
> + !fscrypt_mergeable_bio(sdio->bio, dio->inode,
> + cur_offset >> dio->inode->i_blkbits))
> dio_bio_submit(dio, sdio);
> }
>
> --
> 2.28.0.rc0.105.gf9edc3c819-goog
next prev parent reply other threads:[~2020-07-22 17:05 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-20 23:37 [PATCH v4 0/7] add support for direct I/O with fscrypt using blk-crypto Satya Tangirala
2020-07-20 23:37 ` [PATCH v4 1/7] fscrypt: Add functions for direct I/O support Satya Tangirala
2020-07-22 17:04 ` Jaegeuk Kim
2020-07-20 23:37 ` [PATCH v4 2/7] direct-io: add support for fscrypt using blk-crypto Satya Tangirala
2020-07-22 17:05 ` Jaegeuk Kim [this message]
2020-07-20 23:37 ` [PATCH v4 3/7] iomap: support direct I/O with " Satya Tangirala
2020-07-22 17:06 ` Jaegeuk Kim
2020-07-22 21:16 ` Dave Chinner
2020-07-22 22:34 ` Eric Biggers
2020-07-22 22:44 ` Matthew Wilcox
2020-07-22 23:12 ` Eric Biggers
2020-07-22 23:26 ` Eric Biggers
2020-07-22 23:32 ` Darrick J. Wong
2020-07-22 23:43 ` Eric Biggers
2020-07-23 22:07 ` Dave Chinner
2020-07-23 23:03 ` Eric Biggers
2020-07-24 1:39 ` Dave Chinner
2020-07-24 3:46 ` Eric Biggers
2020-07-24 5:31 ` Dave Chinner
2020-07-24 17:41 ` Eric Biggers
2020-07-25 23:47 ` Dave Chinner
2020-07-25 23:59 ` Dave Chinner
2020-07-26 2:42 ` Eric Biggers
2020-07-27 17:16 ` Eric Biggers
2020-07-20 23:37 ` [PATCH v4 4/7] ext4: " Satya Tangirala
2020-07-22 17:07 ` Jaegeuk Kim
2020-07-20 23:37 ` [PATCH v4 5/7] f2fs: " Satya Tangirala
2020-07-21 20:11 ` Jaegeuk Kim
2020-07-20 23:37 ` [PATCH v4 6/7] fscrypt: document inline encryption support Satya Tangirala
2020-07-22 17:01 ` Jaegeuk Kim
2020-07-20 23:37 ` [PATCH v4 7/7] fscrypt: update documentation for direct I/O support Satya Tangirala
2020-07-21 0:47 ` Eric Biggers
2020-07-22 16:57 ` Jaegeuk Kim
2020-07-21 0:56 ` [PATCH v4 0/7] add support for direct I/O with fscrypt using blk-crypto 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=20200722170547.GE3912099@google.com \
--to=jaegeuk@kernel.org \
--cc=ebiggers@google.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=satyat@google.com \
/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).