Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp3807448pxy; Mon, 26 Apr 2021 10:11:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4p4JMacco6dPfy2JPjNM5zXuF95ZM6/8WsIN9Trxn6Dz4v7Fqb4K1QE7p6fS5ZNkuIlI/ X-Received: by 2002:a62:170f:0:b029:25f:ab2:ab6f with SMTP id 15-20020a62170f0000b029025f0ab2ab6fmr18393829pfx.13.1619457092691; Mon, 26 Apr 2021 10:11:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619457092; cv=none; d=google.com; s=arc-20160816; b=ZB17ilsZsGqxlefk77Uh+3FT7ycfl5N/Da/8Ra+XX2xhHa0kaVQyVCz3TBb1T4UxUU D64gXwN/jQI9UQQTlOveKIjDRDCVCOVahuOFImcU+gaspxFDviTON+kBShQB5PuQUa2j ZGqXRWSyR4zOK5luvgKImKLc2rWf9pITswjKjIYoBtCSssUf7Nf/MfWjJjxHyB59KZI6 kTzPlk/acaO7wiQzVNcmjxq/Wwk/N1UUoWF1/kRRSpwebxxGJQpgK8F/xt62PbxK9DCv RVwXPkaDj6G6bx4Bo7jf+ark5/nQWPBckNJziBjFoVnsX5HihmvEjui+Ti007cT9rLwc loPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=tYs1XN3if7BCwbOYEWmN6RmByRpMVG4DNfLVaFDgTXM=; b=WPk0hEnjYUY0/sz6v8wkB3BMprxGfuig6mUSOSvZhoPY9u68VmL3VJnEJbVQ13EKhC nNkvmvbjLQ2tupFqSoAArCoKjBK4pmYxcS/XSaNaB67up5zOGzf7TY96Gvt0oldpQBxF H7BmG3qlfBSxUEq8FmFRDO+xhLf32ShxMooaRvKLbYG78q3VnOkj7z6cW4qEKArYGYRd 7aXDqUg8PbtPnz1U3V0nurCT16akyJklL6xC+GrdlQfMk8YCn3hEe9oSRRkXeAPBCzg8 8jOEa5jISAVHQqTmNogb0iEdd8xLErkKKgmFPETQpzb5ecvQ3a87JW35NdKR5Qbff16u tddA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=A5Sge0vh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l20si27572plb.311.2021.04.26.10.11.19; Mon, 26 Apr 2021 10:11:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=A5Sge0vh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235200AbhDZRKI (ORCPT + 99 others); Mon, 26 Apr 2021 13:10:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:53682 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234767AbhDZRKE (ORCPT ); Mon, 26 Apr 2021 13:10:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8ED2E610A2; Mon, 26 Apr 2021 17:09:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619456962; bh=4xYt3p/2u+dY5NgGMstcQIHqAj2qy0wzNN9R8Byd/0A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=A5Sge0vh4YeAZZzx6G3pPkQj/cvE1AWH4c4rhr0hTF8LbyWOkmENHNPDwb3AQmn97 cfztAsNxEVCzy3AgVlnWTcy6LDdXvIOBIUenb4L5w/JTl7fCYwy8Z9NGK0LG2q4yGp DyebU/iBRuhKKqfPbeF6+szq6NsqTR56cZQdvC3I4nnH2qN/1tro0Lpudf/FA8Aw5l ky1ciPbXHtCqMldBkOungerr/IqMQm+M5Qk2YOGM0JW/QeYOreMBJ6dW4cGntnxm6F KY050E+QEEiQQLSzRv+pe7KSabYYDDkGYZcOS3tW24HjW1fosK13SLNZuYIcMaYMSm 3nCM650b6y1DA== Date: Mon, 26 Apr 2021 10:09:20 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, chao@kernel.org, Yunlei He Subject: Re: [PATCH v2] f2fs: reduce expensive checkpoint trigger frequency Message-ID: References: <20210425011053.44436-1-yuchao0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210425011053.44436-1-yuchao0@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/25, Chao Yu wrote: > We may trigger high frequent checkpoint for below case: > 1. mkdir /mnt/dir1; set dir1 encrypted > 2. touch /mnt/file1; fsync /mnt/file1 > 3. mkdir /mnt/dir2; set dir2 encrypted > 4. touch /mnt/file2; fsync /mnt/file2 > ... > > Although, newly created dir and file are not related, due to > commit bbf156f7afa7 ("f2fs: fix lost xattrs of directories"), we will > trigger checkpoint whenever fsync() comes after a new encrypted dir > created. > > In order to avoid such condition, let's record an entry including > directory's ino into global cache when we initialize encryption policy > in a checkpointed directory, and then only trigger checkpoint() when > target file's parent has non-persisted encryption policy, for the case > its parent is not checkpointed, need_do_checkpoint() has cover that > by verifying it with f2fs_is_checkpointed_node(). > > Reported-by: Yunlei He > Signed-off-by: Chao Yu > --- > v2: > - fix to set ENC_DIR_INO only for encrypted directory > fs/f2fs/f2fs.h | 2 ++ > fs/f2fs/file.c | 3 +++ > fs/f2fs/xattr.c | 6 ++++-- > include/trace/events/f2fs.h | 3 ++- > 4 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index b9d5317db0a7..0fe881309a20 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -246,6 +246,7 @@ enum { > APPEND_INO, /* for append ino list */ > UPDATE_INO, /* for update ino list */ > TRANS_DIR_INO, /* for trasactions dir ino list */ > + ENC_DIR_INO, /* for encrypted dir ino list */ > FLUSH_INO, /* for multiple device flushing */ > MAX_INO_ENTRY, /* max. list */ > }; > @@ -1090,6 +1091,7 @@ enum cp_reason_type { > CP_FASTBOOT_MODE, > CP_SPEC_LOG_NUM, > CP_RECOVER_DIR, > + CP_ENC_DIR, > }; > > enum iostat_type { > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index a595050c56d3..62af29ec0879 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -218,6 +218,9 @@ static inline enum cp_reason_type need_do_checkpoint(struct inode *inode) > f2fs_exist_written_data(sbi, F2FS_I(inode)->i_pino, > TRANS_DIR_INO)) > cp_reason = CP_RECOVER_DIR; > + else if (f2fs_exist_written_data(sbi, F2FS_I(inode)->i_pino, > + ENC_DIR_INO)) > + cp_reason = CP_ENC_DIR; > > return cp_reason; > } > diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c > index c8f34decbf8e..70615d504f7e 100644 > --- a/fs/f2fs/xattr.c > +++ b/fs/f2fs/xattr.c > @@ -630,6 +630,7 @@ static int __f2fs_setxattr(struct inode *inode, int index, > const char *name, const void *value, size_t size, > struct page *ipage, int flags) > { > + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > struct f2fs_xattr_entry *here, *last; > void *base_addr, *last_base_addr; > int found, newsize; > @@ -745,8 +746,9 @@ static int __f2fs_setxattr(struct inode *inode, int index, > !strcmp(name, F2FS_XATTR_NAME_ENCRYPTION_CONTEXT)) > f2fs_set_encrypted_inode(inode); > f2fs_mark_inode_dirty_sync(inode, true); > - if (!error && S_ISDIR(inode->i_mode)) > - set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_CP); > + if (!error && S_ISDIR(inode->i_mode) && f2fs_encrypted_file(inode) && > + f2fs_is_checkpointed_node(sbi, inode->i_ino)) > + f2fs_add_ino_entry(sbi, inode->i_ino, ENC_DIR_INO); What will happen, if we need to checkpoint xattr_nid on this directory? > > same: > if (is_inode_flag_set(inode, FI_ACL_MODE)) { > diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h > index 56b113e3cd6a..ca0cf12226e9 100644 > --- a/include/trace/events/f2fs.h > +++ b/include/trace/events/f2fs.h > @@ -145,7 +145,8 @@ TRACE_DEFINE_ENUM(CP_RESIZE); > { CP_NODE_NEED_CP, "node needs cp" }, \ > { CP_FASTBOOT_MODE, "fastboot mode" }, \ > { CP_SPEC_LOG_NUM, "log type is 2" }, \ > - { CP_RECOVER_DIR, "dir needs recovery" }) > + { CP_RECOVER_DIR, "dir needs recovery" }, \ > + { CP_ENC_DIR, "persist encryption policy" }) > > #define show_shutdown_mode(type) \ > __print_symbolic(type, \ > -- > 2.29.2