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.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_MUTT 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 DA116C3279B for ; Tue, 10 Jul 2018 20:43:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BB5920B80 for ; Tue, 10 Jul 2018 20:43:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="VAMruWly" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BB5920B80 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732581AbeGJUoQ (ORCPT ); Tue, 10 Jul 2018 16:44:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:46098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732263AbeGJUoQ (ORCPT ); Tue, 10 Jul 2018 16:44:16 -0400 Received: from localhost (unknown [104.132.1.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AD320208FA; Tue, 10 Jul 2018 20:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1531255410; bh=7DGhAbRGkR8UiTfHfBI+D8R+hDrKZawUjmuYqodUbYg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VAMruWlytv8Vlf1tWSGtmr2cFpEURCDIJW7DuErNVDQNOHJVnzGbJsRXbighyQN+y HSbZhSeibXWsVkIxzxqt3vVnZrg1tG3JCsUMmrs/DvA/xkhT/untRp7YulxbleL7K6 mm8U1+u6Q+qPPnM0X8+NVjna5sN4aXj6UftBX9WA= Date: Tue, 10 Jul 2018 13:43:29 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: Re: [f2fs-dev] [PATCH 4/4] f2fs: should check the type of end_io after pullback by fscrypto Message-ID: <20180710204329.GA79040@jaegeuk-macbookpro.roam.corp.google.com> References: <20180706210903.77887-1-jaegeuk@kernel.org> <20180706210903.77887-4-jaegeuk@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/09, Chao Yu wrote: > On 2018/7/7 5:09, Jaegeuk Kim wrote: > > This fixes to get the page type after pullback by fscrypto, since the original > > page is bounce page but we should need to get control page which is what we > > originally submitted. > > > > Signed-off-by: Jaegeuk Kim > > --- > > fs/f2fs/data.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > index c3f9b9baf140..9a0fcec53d0e 100644 > > --- a/fs/f2fs/data.c > > +++ b/fs/f2fs/data.c > > @@ -152,7 +152,6 @@ static void f2fs_write_end_io(struct bio *bio) > > > > bio_for_each_segment_all(bvec, bio, i) { > > struct page *page = bvec->bv_page; > > - enum count_type type = WB_DATA_TYPE(page); > > > > if (IS_DUMMY_WRITTEN_PAGE(page)) { > > set_page_private(page, (unsigned long)NULL); > > @@ -169,14 +168,14 @@ static void f2fs_write_end_io(struct bio *bio) > > > > if (unlikely(bio->bi_status)) { > > mapping_set_error(page->mapping, -EIO); > > - if (type == F2FS_WB_CP_DATA) > > + if (WB_DATA_TYPE(page) == F2FS_WB_CP_DATA) > > f2fs_stop_checkpoint(sbi, true); > > } > > > > f2fs_bug_on(sbi, page->mapping == NODE_MAPPING(sbi) && > > page->index != nid_of_node(page)); > > > > - dec_page_count(sbi, type); > > + dec_page_count(sbi, WB_DATA_TYPE(page)); > > But we account F2FS_WB_CP_DATA/F2FS_WB_DATA type page based bounce page instead > of original page. > > bio_page = fio->encrypted_page ? fio->encrypted_page : fio->page; > > /* set submitted = true as a return value */ > fio->submitted = true; > > inc_page_count(sbi, WB_DATA_TYPE(bio_page)); > > Because for encrypted page of regular inode, we should account it with > F2FS_WB_DATA type: > > static bool __is_cp_guaranteed(struct page *page) > { > .... > if (!mapping) <---bounce page's mapping is NULL > return false; > } > > So we will get F2FS_WB_DATA type from __is_cp_guaranteed below: > > enum count_type type = WB_DATA_TYPE(page); > > Is there any problem? Wait a minute. bio_page = fio->encrypted_page ? fio->encrypted_page : fio->page; 1. fio->encrypted_page inc_page_count(sbi, F2FS_WB_CP_DATA); // page->mapping == META_MAPPING In write_end_io(), type = F2FS_WB_DATA; // page->mapping == NULL fscrypt_pullback_bio_page(&page); page = fio->encrypted_page; dec_page_count(F2FS_WB_DATA); 2. fio->page inc_page_count(sbi, F2FS_WB_DATA); In write_end_io(), type = F2FS_WB_DATA; // page->mapping == NULL fscrypt_pullback_bio_page(&page); page = fio->encrypted_page; dec_page_count(F2FS_WB_DATA); Thoughts?