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=-2.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no 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 2FFD5C433DF for ; Fri, 19 Jun 2020 02:39:53 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EFAA720773; Fri, 19 Jun 2020 02:39:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="eQjdMpQa"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="YQ1sxl4k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFAA720773 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jm6wa-0004FY-Ex; Fri, 19 Jun 2020 02:39:52 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jm6wZ-0004FN-Jj for linux-f2fs-devel@lists.sourceforge.net; Fri, 19 Jun 2020 02:39:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:CC:To:Subject:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gDt4b1CBIan/QKMkAXxOVNOWI9A1InHo4CKiox50yIQ=; b=eQjdMpQawidjPhukpHTwzuySAX tP7BeCwMoFs7tl0Fef0qxSHr4gXY1wPOQT86BdNtbU4kr7gHgvHH0H6Pcy91O4XG4lDAueTD911P2 RHeNcsBhRmIpzqu6yohA4Q42Tc+k5PcA0xl6B9QS8aN+jJ35CkRPuLJOBuWpUiWMKITE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=gDt4b1CBIan/QKMkAXxOVNOWI9A1InHo4CKiox50yIQ=; b=YQ1sxl4kaMDcArxvXqcMsjAbPV oaz/1Sj4Ns2tIoJYvI9UigSe/tXPxQocQa7ks3/RrCLxtrcyNd7Agx5Ygzs+5BiUCIllL7AG6oQhK ckoiGwNV9XOAQm9Z2CniOa7NY1W/xAU8EhOeEPHbM1b48xI1MlIwANe4eVAECixys4aQ=; Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jm6wX-009QyS-9O for linux-f2fs-devel@lists.sourceforge.net; Fri, 19 Jun 2020 02:39:51 +0000 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 615274DC5B259B57828C; Fri, 19 Jun 2020 10:39:40 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.208) with Microsoft SMTP Server (TLS) id 14.3.487.0; Fri, 19 Jun 2020 10:39:35 +0800 To: Eric Biggers References: <20200617075732.213198-1-satyat@google.com> <20200617075732.213198-4-satyat@google.com> <5e78e1be-f948-d54c-d28e-50f1f0a92ab3@huawei.com> <20200618181357.GC2957@sol.localdomain> From: Chao Yu Message-ID: Date: Fri, 19 Jun 2020 10:39:34 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200618181357.GC2957@sol.localdomain> Content-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1jm6wX-009QyS-9O Subject: Re: [f2fs-dev] [PATCH 3/4] f2fs: add inline encryption support X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Satya Tangirala Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Hi Eric, On 2020/6/19 2:13, Eric Biggers wrote: > Hi Chao, > > On Thu, Jun 18, 2020 at 06:06:02PM +0800, Chao Yu wrote: >>> @@ -936,8 +972,11 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) >>> >>> inc_page_count(sbi, WB_DATA_TYPE(bio_page)); >>> >>> - if (io->bio && !io_is_mergeable(sbi, io->bio, io, fio, >>> - io->last_block_in_bio, fio->new_blkaddr)) >>> + if (io->bio && >>> + (!io_is_mergeable(sbi, io->bio, io, fio, io->last_block_in_bio, >>> + fio->new_blkaddr) || >>> + !f2fs_crypt_mergeable_bio(io->bio, fio->page->mapping->host, >>> + fio->page->index, fio))) >> >> bio_page->index, fio))) >> >>> __submit_merged_bio(io); >>> alloc_new: >>> if (io->bio == NULL) { >>> @@ -949,6 +988,8 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) >>> goto skip; >>> } >>> io->bio = __bio_alloc(fio, BIO_MAX_PAGES); >>> + f2fs_set_bio_crypt_ctx(io->bio, fio->page->mapping->host, >>> + fio->page->index, fio, GFP_NOIO); >> >> bio_page->index, fio, GFP_NOIO); >> > > We're using ->mapping->host and ->index. Ordinarily that would mean the page > needs to be a pagecache page. But bio_page can also be a compressed page or a > bounce page containing fs-layer encrypted contents. I'm concerning about compression + inlinecrypt case. > > Is your suggestion to keep using fio->page->mapping->host (since encrypted pages Yup, > don't have a mapping), but start using bio_page->index (since f2fs apparently I meant that we need to use bio_page->index as tweak value in write path to keep consistent as we did in read path, otherwise we may read the wrong decrypted data later to incorrect tweak value. - f2fs_read_multi_pages (only comes from compression inode) - f2fs_alloc_dic - f2fs_set_compressed_page(page, cc->inode, start_idx + i + 1, dic); ^^^^^^^^^^^^^^^^^ - dic->cpages[i] = page; - for () struct page *page = dic->cpages[i]; if (!bio) - f2fs_grab_read_bio(..., page->index,..) - f2fs_set_bio_crypt_ctx(..., first_idx, ..) /* first_idx == cpage->index */ You can see that cpage->index was set to page->index + 1, that's why we need to use one of cpage->index/page->index as tweak value all the time rather than using both index mixed in read/write path. But note that for fs-layer encryption, we have used cpage->index as tweak value, so here I suggest we can keep consistent to use cpage->index in inlinecrypt case. > *does* set ->index for compressed pages, and if the file uses fs-layer > encryption then f2fs_set_bio_crypt_ctx() won't use the index anyway)? > > Does this mean the code is currently broken for compression + inline encryption > because it's using the wrong ->index? I think the answer is no, since I guess it's broken now for compression + inlinecrypt case. > f2fs_write_compressed_pages() will still pass the first 'nr_cpages' pagecache > pages along with the compressed pages. In that case, your suggestion would be a > cleanup rather than a fix? That's a fix. > > It would be helpful if there was an f2fs mount option to auto-enable compression > on all files (similar to how test_dummy_encryption auto-enables encryption on > all files) so that it could be tested more easily. Agreed. Previously I changed mkfs to allow to add compression flag to root inode for compression test. :P Thanks, > > - Eric > . > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel