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=-15.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 6EB12C433DB for ; Tue, 2 Feb 2021 09:29:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D6F060C3E for ; Tue, 2 Feb 2021 09:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232812AbhBBJ26 (ORCPT ); Tue, 2 Feb 2021 04:28:58 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:11672 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232310AbhBBJ2z (ORCPT ); Tue, 2 Feb 2021 04:28:55 -0500 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DVKFN6vB8zlDll; Tue, 2 Feb 2021 17:26:32 +0800 (CST) Received: from [10.136.110.154] (10.136.110.154) by smtp.huawei.com (10.3.19.201) with Microsoft SMTP Server (TLS) id 14.3.498.0; Tue, 2 Feb 2021 17:28:09 +0800 Subject: Re: [f2fs-dev] [PATCH v3] f2fs: rename checkpoint=merge mount option to checkpoint_merge To: Daeho Jeong , , , CC: Daeho Jeong References: <20210202092332.2562006-1-daeho43@gmail.com> From: Chao Yu Message-ID: Date: Tue, 2 Feb 2021 17:28:09 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20210202092332.2562006-1-daeho43@gmail.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.136.110.154] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/2/2 17:23, Daeho Jeong wrote: > From: Daeho Jeong > > As checkpoint=merge comes in, mount option setting related to checkpoint > had been mixed up and it became hard to understand. So, I separated > this option from "checkpoint=" and made another mount option > "checkpoint_merge" for this. > > Signed-off-by: Daeho Jeong > --- > v2: renamed "checkpoint=merge" to "checkpoint_merge" > v3: removed "nocheckpoint_merge" option > --- > Documentation/filesystems/f2fs.rst | 6 +++--- > fs/f2fs/super.c | 21 +++++++++------------ > 2 files changed, 12 insertions(+), 15 deletions(-) > > diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst > index d0ead45dc706..475994ed8b15 100644 > --- a/Documentation/filesystems/f2fs.rst > +++ b/Documentation/filesystems/f2fs.rst > @@ -247,9 +247,9 @@ checkpoint=%s[:%u[%]] Set to "disable" to turn off checkpointing. Set to "enabl > hide up to all remaining free space. The actual space that > would be unusable can be viewed at /sys/fs/f2fs//unusable > This space is reclaimed once checkpoint=enable. > - Here is another option "merge", which creates a kernel daemon > - and makes it to merge concurrent checkpoint requests as much > - as possible to eliminate redundant checkpoint issues. Plus, > +checkpoint_merge When checkpoint is enabled, this can be used to create a kernel > + daemon and make it to merge concurrent checkpoint requests as > + much as possible to eliminate redundant checkpoint issues. Plus, > we can eliminate the sluggish issue caused by slow checkpoint > operation when the checkpoint is done in a process context in > a cgroup having low i/o budget and cpu shares. To make this > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 56696f6cfa86..b60dcef7f9d0 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -215,7 +215,7 @@ static match_table_t f2fs_tokens = { > {Opt_checkpoint_disable_cap, "checkpoint=disable:%u"}, > {Opt_checkpoint_disable_cap_perc, "checkpoint=disable:%u%%"}, > {Opt_checkpoint_enable, "checkpoint=enable"}, > - {Opt_checkpoint_merge, "checkpoint=merge"}, > + {Opt_checkpoint_merge, "checkpoint_merge"}, > {Opt_compress_algorithm, "compress_algorithm=%s"}, > {Opt_compress_log_size, "compress_log_size=%u"}, > {Opt_compress_extension, "compress_extension=%s"}, > @@ -1142,12 +1142,6 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) > return -EINVAL; > } > > - if (test_opt(sbi, DISABLE_CHECKPOINT) && > - test_opt(sbi, MERGE_CHECKPOINT)) { > - f2fs_err(sbi, "checkpoint=merge cannot be used with checkpoint=disable\n"); > - return -EINVAL; > - } > - > /* Not pass down write hints if the number of active logs is lesser > * than NR_CURSEG_PERSIST_TYPE. > */ > @@ -1782,7 +1776,7 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root) > seq_printf(seq, ",checkpoint=disable:%u", > F2FS_OPTION(sbi).unusable_cap); > if (test_opt(sbi, MERGE_CHECKPOINT)) > - seq_puts(seq, ",checkpoint=merge"); > + seq_puts(seq, ",checkpoint_merge"); > if (F2FS_OPTION(sbi).fsync_mode == FSYNC_MODE_POSIX) > seq_printf(seq, ",fsync_mode=%s", "posix"); > else if (F2FS_OPTION(sbi).fsync_mode == FSYNC_MODE_STRICT) > @@ -1827,6 +1821,7 @@ static void default_options(struct f2fs_sb_info *sbi) > sbi->sb->s_flags |= SB_LAZYTIME; > set_opt(sbi, FLUSH_MERGE); > set_opt(sbi, DISCARD); > + clear_opt(sbi, MERGE_CHECKPOINT); It's not needed here? Thanks, > if (f2fs_sb_has_blkzoned(sbi)) > F2FS_OPTION(sbi).fs_mode = FS_MODE_LFS; > else > @@ -2066,9 +2061,8 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) > } > } > > - if (!test_opt(sbi, MERGE_CHECKPOINT)) { > - f2fs_stop_ckpt_thread(sbi); > - } else { > + if (!test_opt(sbi, DISABLE_CHECKPOINT) && > + test_opt(sbi, MERGE_CHECKPOINT)) { > err = f2fs_start_ckpt_thread(sbi); > if (err) { > f2fs_err(sbi, > @@ -2076,6 +2070,8 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) > err); > goto restore_gc; > } > + } else { > + f2fs_stop_ckpt_thread(sbi); > } > > /* > @@ -3831,7 +3827,8 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) > > /* setup checkpoint request control and start checkpoint issue thread */ > f2fs_init_ckpt_req_control(sbi); > - if (test_opt(sbi, MERGE_CHECKPOINT)) { > + if (!test_opt(sbi, DISABLE_CHECKPOINT) && > + test_opt(sbi, MERGE_CHECKPOINT)) { > err = f2fs_start_ckpt_thread(sbi); > if (err) { > f2fs_err(sbi, >