From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EC87C43219 for ; Wed, 1 May 2019 14:48:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D515A208C3 for ; Wed, 1 May 2019 14:48:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726694AbfEAOsr (ORCPT ); Wed, 1 May 2019 10:48:47 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:33582 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726673AbfEAOsq (ORCPT ); Wed, 1 May 2019 10:48:46 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x41Eatom046314 for ; Wed, 1 May 2019 10:48:45 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2s7cemjrr8-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 01 May 2019 10:48:45 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 1 May 2019 15:48:43 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 1 May 2019 15:48:39 +0100 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x41EmcUB38535298 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 1 May 2019 14:48:38 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1671442042; Wed, 1 May 2019 14:48:38 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0920F4204B; Wed, 1 May 2019 14:48:36 +0000 (GMT) Received: from localhost.localdomain (unknown [9.199.33.136]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 1 May 2019 14:48:35 +0000 (GMT) From: Chandan Rajendra To: Eric Biggers Cc: tytso@mit.edu, linux-f2fs-devel@lists.sourceforge.net, hch@infradead.org, linux-fscrypt@vger.kernel.org, adilger.kernel@dilger.ca, linux-fsdevel@vger.kernel.org, jaegeuk@kernel.org, linux-ext4@vger.kernel.org Subject: Re: [f2fs-dev] [PATCH V2 10/13] fscrypt_encrypt_page: Loop across all blocks mapped by a page range Date: Wed, 01 May 2019 20:19:35 +0530 Organization: IBM In-Reply-To: <20190430230840.GE48973@gmail.com> References: <20190428043121.30925-1-chandan@linux.ibm.com> <20190430171133.GC48973@gmail.com> <20190430230840.GE48973@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-TM-AS-GCONF: 00 x-cbid: 19050114-0020-0000-0000-000003383BE6 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050114-0021-0000-0000-0000218ABF86 Message-Id: <4666731.7CFakFE75r@localhost.localdomain> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-05-01_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905010094 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Wednesday, May 1, 2019 4:38:41 AM IST Eric Biggers wrote: > On Tue, Apr 30, 2019 at 10:11:35AM -0700, Eric Biggers wrote: > > On Sun, Apr 28, 2019 at 10:01:18AM +0530, Chandan Rajendra wrote: > > > For subpage-sized blocks, this commit now encrypts all blocks mapped by > > > a page range. > > > > > > Signed-off-by: Chandan Rajendra > > > --- > > > fs/crypto/crypto.c | 37 +++++++++++++++++++++++++------------ > > > 1 file changed, 25 insertions(+), 12 deletions(-) > > > > > > diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c > > > index 4f0d832cae71..2d65b431563f 100644 > > > --- a/fs/crypto/crypto.c > > > +++ b/fs/crypto/crypto.c > > > @@ -242,18 +242,26 @@ struct page *fscrypt_encrypt_page(const struct inode *inode, > > > > Need to update the function comment to clearly explain what this function > > actually does now. > > > > > { > > > struct fscrypt_ctx *ctx; > > > struct page *ciphertext_page = page; > > > + int i, page_nr_blks; > > > int err; > > > > > > BUG_ON(len % FS_CRYPTO_BLOCK_SIZE != 0); > > > > > > > Make a 'blocksize' variable so you don't have to keep calling i_blocksize(). > > > > Also, you need to check whether 'len' and 'offs' are filesystem-block-aligned, > > since the code now assumes it. > > > > const unsigned int blocksize = i_blocksize(inode); > > > > if (!IS_ALIGNED(len | offs, blocksize)) > > return -EINVAL; > > > > However, did you check whether that's always true for ubifs? It looks like it > > may expect to encrypt a prefix of a block, that is only padded to the next > > 16-byte boundary. > > > > > + page_nr_blks = len >> inode->i_blkbits; > > > + > > > if (inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES) { > > > /* with inplace-encryption we just encrypt the page */ > > > - err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk_num, page, > > > - ciphertext_page, len, offs, > > > - gfp_flags); > > > - if (err) > > > - return ERR_PTR(err); > > > - > > > + for (i = 0; i < page_nr_blks; i++) { > > > + err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, > > > + lblk_num, page, > > > + ciphertext_page, > > > + i_blocksize(inode), offs, > > > + gfp_flags); > > > + if (err) > > > + return ERR_PTR(err); > > Apparently ubifs does encrypt data shorter than the filesystem block size, so > this part is wrong. > > I suggest we split this into two functions, fscrypt_encrypt_block_inplace() and > fscrypt_encrypt_blocks(), so that it's conceptually simpler what each function > does. Currently this works completely differently depending on whether the > filesystem set FS_CFLG_OWN_PAGES in its fscrypt_operations, which is weird. > > I also noticed that using fscrypt_ctx for writes seems to be unnecessary. > AFAICS, page_private(bounce_page) could point directly to the pagecache page. > That would simplify things a lot, especially since then fscrypt_ctx could be > removed entirely after you convert reads to use read_callbacks_ctx. > > IMO, these would be worthwhile cleanups for fscrypt by themselves, without > waiting for the read_callbacks stuff to be finalized. Finalizing the > read_callbacks stuff will probably require reaching a consensus about how they > should work with future filesystem features like fsverity and compression. > > So to move things forward, I'm considering sending out a series with the above > cleanups for fscrypt, plus the equivalent of your patches: > > "fscrypt_encrypt_page: Loop across all blocks mapped by a page range" > "fscrypt_zeroout_range: Encrypt all zeroed out blocks of a page" > "Add decryption support for sub-pagesized blocks" (fs/crypto/ part only) > > Then hopefully we can get all that applied for 5.3 so that fs/crypto/ itself is > ready for blocksize != PAGE_SIZE; and get your changes to ext4_bio_write_page(), > __ext4_block_zero_page_range(), and ext4_block_write_begin() applied too, so > that ext4 is partially ready for encryption with blocksize != PAGE_SIZE. > > Then only the read_callbacks stuff will remain, to get encryption support into > fs/mpage.c and fs/buffer.c. Do you think that's a good plan? Hi Eric, IMHO, I will continue posting the next version of the current patchset and if there are no serious reservations from FS maintainers the "read callbacks" patchset can be merged. In such a scenario, the cleanups being non-complicated, can be merged later. -- chandan