Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Eric Biggers <ebiggers3@gmail.com>
To: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, tytso@mit.edu
Subject: Re: [RFC PATCH 3/8] ext4: decrypt all contiguous blocks in a page
Date: Tue, 16 Jan 2018 18:18:17 -0800	[thread overview]
Message-ID: <20180117021817.GC4477@zzz.localdomain> (raw)
In-Reply-To: <20180112141129.27507-4-chandan@linux.vnet.ibm.com>

Hi Chandan,

On Fri, Jan 12, 2018 at 07:41:24PM +0530, Chandan Rajendra wrote:
> With blocksize < pagesize, a page can contain more than one block. Hence
> this commit changes completion_pages() to invoke fscrypt_decrypt_page()
> in order to decrypt all the contiguous blocks mapped by the page.
> 
> Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
> ---
>  fs/crypto/bio.c | 19 +++++++++++++++++--
>  1 file changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c
> index 0d5e6a5..eb6e06a 100644
> --- a/fs/crypto/bio.c
> +++ b/fs/crypto/bio.c
> @@ -40,8 +40,23 @@ static void completion_pages(struct work_struct *work)
>  
>  	bio_for_each_segment_all(bv, bio, i) {
>  		struct page *page = bv->bv_page;
> -		int ret = fscrypt_decrypt_page(page->mapping->host, page,
> -				PAGE_SIZE, 0, page->index);
> +		struct inode *inode = page->mapping->host;
> +		const unsigned long blocksize = inode->i_sb->s_blocksize;
> +		const unsigned blkbits = inode->i_blkbits;
> +		int page_blk = page->index << (PAGE_SHIFT - blkbits);
> +		int blk = page_blk + (bv->bv_offset >> blkbits);

Use 'u64' for the block number:

	u64 page_blk = (u64)page->index << (PAGE_SHIFT - blkbits);
	u64 blk = page_blk + (bv->bv_offset >> blkbits);

> +		int nr_blks = bv->bv_len >> blkbits;
> +		int ret = 0;
> +		int j;
> +
> +		for (j = 0; j < nr_blks; j++, blk++) {
> +			ret = fscrypt_decrypt_page(page->mapping->host,
> +						page, blocksize,
> +						bv->bv_offset + (j << blkbits),
> +						blk);
> +			if (ret)
> +				break;
> +		}
>  
>  		if (ret) {
>  			WARN_ON_ONCE(1);

Since that we'll now actually be operating on blocks rather than pages, some
renaming seems to be in order, otherwise things will get very confusing.  e.g.:

	fscrypt_decrypt_page() -> fscrypt_decrypt_block()
	fscrypt_encrypt_page() -> fscrypt_encrypt_block()
	completion_pages() -> completion_blocks()
	fscrypt_decrypt_bio_pages() -> fscrypt_decrypt_bio_blocks()

Please also update the comment for completion_pages() / completion_blocks() to
clarify that it is decrypting *blocks*, not *pages*.

(Yes, we should have named all these functions as *_block() originally.  But
this is a good time to fix it!)

Eric

  reply	other threads:[~2018-01-17  2:18 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-12 14:11 [RFC PATCH 0/8] Ext4 encryption support for blocksize < pagesize Chandan Rajendra
2018-01-12 14:11 ` [RFC PATCH 1/8] ext4: use EXT4_INODE_ENCRYPT flag to detect encrypted bio Chandan Rajendra
2018-01-12 19:04   ` Randy Dunlap
2018-01-13  5:22     ` Chandan Rajendra
2018-01-12 14:11 ` [RFC PATCH 2/8] fs/buffer.c: make some functions non-static Chandan Rajendra
2018-01-12 14:38   ` Matthew Wilcox
2018-01-13  5:25     ` Chandan Rajendra
2018-01-17  2:14   ` Eric Biggers
2018-01-12 14:11 ` [RFC PATCH 3/8] ext4: decrypt all contiguous blocks in a page Chandan Rajendra
2018-01-17  2:18   ` Eric Biggers [this message]
2018-01-12 14:11 ` [RFC PATCH 4/8] ext4: decrypt all boundary blocks when doing buffered write Chandan Rajendra
2018-01-17  2:22   ` Eric Biggers
2018-01-12 14:11 ` [RFC PATCH 5/8] ext4: decrypt the block that needs to be partially zeroed Chandan Rajendra
2018-01-17  2:23   ` Eric Biggers
2018-01-12 14:11 ` [RFC PATCH 6/8] ext4: encrypt blocks whose size is less than page size Chandan Rajendra
2018-01-17  2:33   ` Eric Biggers
2018-01-12 14:11 ` [RFC PATCH 7/8] ext4: decrypt " Chandan Rajendra
2018-01-17  2:39   ` Eric Biggers
2018-01-12 14:11 ` [RFC PATCH 8/8] ext4: enable encryption for blocksize " Chandan Rajendra
2018-01-17  2:40   ` Eric Biggers
2018-01-17 13:42     ` Chandan Rajendra
2018-01-12 19:07 ` [RFC PATCH 0/8] Ext4 encryption support for blocksize < pagesize Randy Dunlap
2018-01-13  5:28   ` Chandan Rajendra
2018-01-13 12:48     ` Matthew Wilcox
2018-01-13 18:20       ` Randy Dunlap
2018-01-17  2:10 ` Eric Biggers
2018-01-17 13:43   ` Chandan Rajendra

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=20180117021817.GC4477@zzz.localdomain \
    --to=ebiggers3@gmail.com \
    --cc=chandan@linux.vnet.ibm.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=tytso@mit.edu \
    --subject='Re: [RFC PATCH 3/8] ext4: decrypt all contiguous blocks in a page' \
    /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

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).