Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp2951183pxb; Tue, 12 Jan 2021 02:40:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxqs+JE+Lks9Cif3Z57KIV5hOHIa12t4lTovFGxLA+dUrVOyWY+U7BDCx8JJl1gLlr68wv X-Received: by 2002:a17:906:94d2:: with SMTP id d18mr1435325ejy.94.1610448016875; Tue, 12 Jan 2021 02:40:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610448016; cv=none; d=google.com; s=arc-20160816; b=DqVu14PiCDeK1RrVpMOgSisUlSf7EsV/xKKAaxN3UXUVlPopIRKtQ8QnjHLgfwFcxC 57yBh3XUl797yyw59B7O7IzEI2uw3FdRIjYhTDRbzHgzhidNInQmLWX91eVf0IqWwZZr T4+uN3Jr7+MU3zoaye7UQzCzC7rT1UVmAkKgIHirJDZgUMYBTy3EHPhoO7A2JAubLgPi WSD40PpIUo4RfQy8Z4ST9ocz9YGHLNgFYOL/VjvC3lRS6cMmyWf29oWgHbY5+EMpsA0J D+RmCQl7pM9MqZWEv2I5YWallRJ5hi/5JpnjX4k9xyI8OpeCBl7ttV5KE5OFN2QZbHOz dIZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=BHvdzpDSht2IDhpJXYDXrA/fbpuLw8QdStLrjC7A5xc=; b=jD/2omR12Qok435TV554OzeiyMLziLBMJ7AyVpbQyJblF2l3b87Fj4HAAuXiODU7rp 6NbL5mlMs13j2502c8qTr3jVPW2mrRmQxgtxDGD5FJGNRcrETOPuyNNwcINMwFzVdPhC HtR6ApC5gexn09Lw1lu2YaiMmnuw25f74MRJgFaiBAvWVclFVVX7hfqVtYQZG6UvZ+6P NYwW4GZb2WekO08571/R+6r2tZ3OlkRf7QHoNWTI2EPWJeWn74TyJDF8/QntTScEvH5p haSIV7goZpEwuVYS6qkClLEJuWOSMzBcOd/0n3sfdSMFqnHX+oV0TBjcGmasTjmtMSsA jdWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Xi+oQhqn; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x22si936733ejj.576.2021.01.12.02.39.52; Tue, 12 Jan 2021 02:40:16 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=Xi+oQhqn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731480AbhALAre (ORCPT + 99 others); Mon, 11 Jan 2021 19:47:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727353AbhALAqN (ORCPT ); Mon, 11 Jan 2021 19:46:13 -0500 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D953C061575 for ; Mon, 11 Jan 2021 16:45:33 -0800 (PST) Received: by mail-lj1-x235.google.com with SMTP id m13so933305ljo.11 for ; Mon, 11 Jan 2021 16:45:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=BHvdzpDSht2IDhpJXYDXrA/fbpuLw8QdStLrjC7A5xc=; b=Xi+oQhqnA8XcUj0J3pXOQr77UdTsPLIPTcjSHLig7c8Y+NAyXjye6eD5KWI4Tubs7/ BKQrAbgPpJgPjwJSDMvwDp4Rj+CjwIQ4QyRzmTwb28fiKUDBsS3CylZTYD5hM201+UQZ pvjsyjrz3kMEXw3UmFzPSw7AB6q9rLiG6bdsdkk886Wc6YjpwF+pZJcStDYjAWuk7tNF sj7GnfSZ0FE9G9Ak2C9K+mzW+vR24Ml0s6K4WyF48tF//OguVLKsEBy90cABVDfnIjqA hu5yJCM5YkwJlCbVnW1K7bf1nic8pFsvuO24mPEA4/Sk5WNiCiNNyi4myDvvMNb7vARs tDOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=BHvdzpDSht2IDhpJXYDXrA/fbpuLw8QdStLrjC7A5xc=; b=oyQpNcSy68BcfaL2SgIRl6Kek69p/rjecQ3rK5yOejhAaXASh9FibK6HPPc+un+DHi FT4sYYsK5uANRojet8YTgLZ6H5AfvvM9Xrz+gcSrT2etCW2HECwKgGkngQH5pQ66PwBY EKe/3Aj4WVDnCyPAsnCDZBplFGd0ofEnU6I44zmRQXB32ghwLVDp3ONnMpr/Ml5g97hI uwChSd2o8iK1w0GIV7NuLa+ARe12SAHC7mIZdBE2cu0uE2jI0iZPwCQwW63sRYojWdT/ D4SYNk7KIvwcdpG2M8T85V09ZFd/kT6P1ai+pwt6ubSU0afmMFF5DKKs/uduH6ePEdsj Oc+w== X-Gm-Message-State: AOAM532dm1rgBlCbHLNs7Szf+I27shbXpB3zrF1LYQfKfu1FPVwN74Na 4oSlsGMn0g7h2IeaXDGC0yc41mMZKQW1tMTKRrs= X-Received: by 2002:a2e:810c:: with SMTP id d12mr840360ljg.400.1610412331525; Mon, 11 Jan 2021 16:45:31 -0800 (PST) MIME-Version: 1.0 References: <20210111051543.243387-1-daeho43@gmail.com> In-Reply-To: From: Daeho Jeong Date: Tue, 12 Jan 2021 09:45:20 +0900 Message-ID: Subject: Re: [f2fs-dev] [PATCH 1/2] f2fs: introduce checkpoint=merge mount option To: Jaegeuk Kim Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com, Sungjong Seo , Daeho Jeong Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Got it~ :) 2021=EB=85=84 1=EC=9B=94 11=EC=9D=BC (=EC=9B=94) =EC=98=A4=ED=9B=84 6:50, J= aegeuk Kim =EB=8B=98=EC=9D=B4 =EC=9E=91=EC=84=B1: > > On 01/11, Daeho Jeong wrote: > > From: Daeho Jeong > > > > We've added a new mount option "checkpoint=3Dmerge", which creates a > > kernel daemon and makes 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, and The below verification result > > explains this. > > The basic idea has come from https://opensource.samsung.com. > > > > [Verification] > > Android Pixel Device(ARM64, 7GB RAM, 256GB UFS) > > Create two I/O cgroups (fg w/ weight 100, bg w/ wight 20) > > > > In "fg" cgroup, > > - thread A =3D> trigger 1000 checkpoint operations > > "for i in `seq 1 1000`; do touch test_dir1/file; fsync test_dir1; > > done" > > - thread B =3D> gererating async. I/O > > "fio --rw=3Dwrite --numjobs=3D1 --bs=3D128k --runtime=3D3600 --time_b= ased=3D1 > > --filename=3Dtest_img --name=3Dtest" > > > > In "bg" cgroup, > > - thread C =3D> trigger repeated checkpoint operations > > "echo $$ > /dev/blkio/bg/tasks; while true; do touch test_dir2/file; > > fsync test_dir2; done" > > > > We've measured thread A's execution time. > > > > [ w/o patch ] > > Elapsed Time: Avg. 68 seconds > > [ w/ patch ] > > Elapsed Time: Avg. 48 seconds > > > > Signed-off-by: Daeho Jeong > > Signed-off-by: Sungjong Seo > > --- > > Documentation/filesystems/f2fs.rst | 6 + > > fs/f2fs/checkpoint.c | 176 +++++++++++++++++++++++++++++ > > fs/f2fs/debug.c | 6 + > > fs/f2fs/f2fs.h | 24 ++++ > > fs/f2fs/super.c | 53 ++++++++- > > 5 files changed, 261 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesys= tems/f2fs.rst > > index dae15c96e659..bccc021bf31a 100644 > > --- a/Documentation/filesystems/f2fs.rst > > +++ b/Documentation/filesystems/f2fs.rst > > @@ -247,6 +247,12 @@ checkpoint=3D%s[:%u[%]] Set to "disable" to tu= rn 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=3Denable= . > > + Here is another option "merge", which creates a = kernel daemon > > + and makes it to merge concurrent checkpoint requ= ests as much > > + as possible to eliminate redundant checkpoint is= sues. Plus, > > + we can eliminate the sluggish issue caused by sl= ow checkpoint > > + operation when the checkpoint is done in a proce= ss context in > > + a cgroup having low i/o budget and cpu shares. > > compress_algorithm=3D%s Control compress algorithm, currently = f2fs supports "lzo", > > "lz4", "zstd" and "lzo-rle" algorithm. > > compress_log_size=3D%u Support configuring compress cluster size, the= size will > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > > index 897edb7c951a..11288f435dbe 100644 > > --- a/fs/f2fs/checkpoint.c > > +++ b/fs/f2fs/checkpoint.c > > @@ -13,6 +13,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "f2fs.h" > > #include "node.h" > > @@ -20,6 +21,8 @@ > > #include "trace.h" > > #include > > > > +#define DEFAULT_CHECKPOINT_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, = 3)) > > + > > static struct kmem_cache *ino_entry_slab; > > struct kmem_cache *f2fs_inode_entry_slab; > > > > @@ -1707,3 +1710,176 @@ void f2fs_destroy_checkpoint_caches(void) > > kmem_cache_destroy(ino_entry_slab); > > kmem_cache_destroy(f2fs_inode_entry_slab); > > } > > + > > +static int __write_checkpoint_sync(struct f2fs_sb_info *sbi) > > +{ > > + struct cp_control cpc =3D { .reason =3D CP_SYNC, }; > > + int err; > > + > > + down_write(&sbi->gc_lock); > > + err =3D f2fs_write_checkpoint(sbi, &cpc); > > + up_write(&sbi->gc_lock); > > + > > + return err; > > +} > > + > > +static void __checkpoint_and_complete_reqs(struct f2fs_sb_info *sbi) > > +{ > > + struct ckpt_req_control *cprc =3D sbi->cprc_info; > > + struct ckpt_req *req, *next; > > + struct llist_node *dispatch_list; > > + int ret; > > + > > + dispatch_list =3D llist_del_all(&cprc->issue_list); > > + if (!dispatch_list) > > + return; > > + dispatch_list =3D llist_reverse_order(dispatch_list); > > + > > + ret =3D __write_checkpoint_sync(sbi); > > + atomic_inc(&cprc->issued_ckpt); > > + > > + llist_for_each_entry_safe(req, next, dispatch_list, llnode) { > > + atomic_dec(&cprc->queued_ckpt); > > + atomic_inc(&cprc->total_ckpt); > > + req->complete_time =3D jiffies; > > + req->ret =3D ret; > > + complete(&req->wait); > > + } > > +} > > + > > +static int issue_checkpoint_thread(void *data) > > +{ > > + struct f2fs_sb_info *sbi =3D data; > > + struct ckpt_req_control *cprc =3D sbi->cprc_info; > > + wait_queue_head_t *q =3D &cprc->ckpt_wait_queue; > > +repeat: > > + if (kthread_should_stop()) > > + return 0; > > + > > + sb_start_intwrite(sbi->sb); > > + > > + if (!llist_empty(&cprc->issue_list)) > > + __checkpoint_and_complete_reqs(sbi); > > + > > + sb_end_intwrite(sbi->sb); > > + > > + wait_event_interruptible(*q, > > + kthread_should_stop() || !llist_empty(&cprc->issue_list))= ; > > + goto repeat; > > +} > > + > > +static void flush_remained_ckpt_reqs(struct f2fs_sb_info *sbi, > > + struct ckpt_req *wait_req) > > +{ > > + struct ckpt_req_control *cprc =3D sbi->cprc_info; > > + > > + if (!llist_empty(&cprc->issue_list)) { > > + __checkpoint_and_complete_reqs(sbi); > > + } else { > > + /* already dispatched by issue_checkpoint_thread */ > > + if (wait_req) > > + wait_for_completion(&wait_req->wait); > > + } > > +} > > + > > +static void init_ckpt_req(struct ckpt_req *req) > > +{ > > + memset(req, 0, sizeof(struct ckpt_req)); > > + > > + req->owner =3D current; > > + init_completion(&req->wait); > > +} > > + > > +int f2fs_issue_checkpoint(struct f2fs_sb_info *sbi) > > +{ > > + struct ckpt_req_control *cprc =3D sbi->cprc_info; > > + struct ckpt_req req; > > + > > + if (!cprc || !cprc->f2fs_issue_ckpt) > > + return __write_checkpoint_sync(sbi); > > + > > + init_ckpt_req(&req); > > + > > + req.queue_time =3D jiffies; > > + llist_add(&req.llnode, &cprc->issue_list); > > + atomic_inc(&cprc->queued_ckpt); > > + > > + /* update issue_list before we wake up issue_checkpoint thread */ > > + smp_mb(); > > + > > + if (waitqueue_active(&cprc->ckpt_wait_queue)) > > + wake_up(&cprc->ckpt_wait_queue); > > + > > + if (cprc->f2fs_issue_ckpt) > > + wait_for_completion(&req.wait); > > + else > > + flush_remained_ckpt_reqs(sbi, &req); > > + > > + return req.ret; > > +} > > + > > +int f2fs_create_ckpt_req_control(struct f2fs_sb_info *sbi) > > +{ > > + dev_t dev =3D sbi->sb->s_bdev->bd_dev; > > + struct ckpt_req_control *cprc; > > + bool need_free =3D true; > > + > > + if (sbi->cprc_info) { > > + cprc =3D sbi->cprc_info; > > + if (cprc->f2fs_issue_ckpt) > > + return 0; > > + > > + need_free =3D false; > > + goto init_thread; > > + } > > + > > + cprc =3D f2fs_kzalloc(sbi, sizeof(struct ckpt_req_control), GFP_K= ERNEL); > > + if (!cprc) > > + return -ENOMEM; > > + atomic_set(&cprc->issued_ckpt, 0); > > + atomic_set(&cprc->total_ckpt, 0); > > + atomic_set(&cprc->queued_ckpt, 0); > > + init_waitqueue_head(&cprc->ckpt_wait_queue); > > + init_llist_head(&cprc->issue_list); > > + sbi->cprc_info =3D cprc; > > + > > +init_thread: > > + if (!test_opt(sbi, MERGE_CHECKPOINT)) > > + return 0; > > + > > + cprc->f2fs_issue_ckpt =3D kthread_run(issue_checkpoint_thread, sb= i, > > + "f2fs_ckpt-%u:%u", MAJOR(dev), MINOR(dev)); > > + if (IS_ERR(cprc->f2fs_issue_ckpt)) { > > + int err =3D PTR_ERR(cprc->f2fs_issue_ckpt); > > + > > + if (need_free) { > > + kvfree(cprc); > > + sbi->cprc_info =3D NULL; > > + } > > + return err; > > + } > > + > > + set_task_ioprio(cprc->f2fs_issue_ckpt, DEFAULT_CHECKPOINT_IOPRIO)= ; > > + > > + return 0; > > +} > > + > > +void f2fs_destroy_ckpt_req_control(struct f2fs_sb_info *sbi, bool free= ) > > +{ > > + struct ckpt_req_control *cprc =3D sbi->cprc_info; > > + > > + if (cprc && cprc->f2fs_issue_ckpt) { > > + struct task_struct *ckpt_task =3D cprc->f2fs_issue_ckpt; > > + > > + cprc->f2fs_issue_ckpt =3D NULL; > > + kthread_stop(ckpt_task); > > + > > + flush_remained_ckpt_reqs(sbi, NULL); > > + } > > + > > + if (free) { > > + kvfree(cprc); > > + sbi->cprc_info =3D NULL; > > + } > > +} > > + > > Git complained an empty space. > > > diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c > > index 197c914119da..6ee81afae6b7 100644 > > --- a/fs/f2fs/debug.c > > +++ b/fs/f2fs/debug.c > > @@ -120,6 +120,9 @@ static void update_general_status(struct f2fs_sb_in= fo *sbi) > > atomic_read(&SM_I(sbi)->dcc_info->discard_cmd_cnt= ); > > si->undiscard_blks =3D SM_I(sbi)->dcc_info->undiscard_blk= s; > > } > > + si->nr_issued_ckpt =3D atomic_read(&sbi->cprc_info->issued_ckpt); > > + si->nr_total_ckpt =3D atomic_read(&sbi->cprc_info->total_ckpt); > > + si->nr_queued_ckpt =3D atomic_read(&sbi->cprc_info->queued_ckpt); > > Here, we can get null cprc_info. > > > si->total_count =3D (int)sbi->user_block_count / sbi->blocks_per_= seg; > > si->rsvd_segs =3D reserved_segments(sbi); > > si->overp_segs =3D overprovision_segments(sbi); > > @@ -417,6 +420,9 @@ static int stat_show(struct seq_file *s, void *v) > > si->meta_count[META_NAT]); > > seq_printf(s, " - ssa blocks : %u\n", > > si->meta_count[META_SSA]); > > + seq_printf(s, "CP merge (Queued: %4d, Issued: %4d, Total:= %4d)\n", > > + si->nr_queued_ckpt, si->nr_issued_ckpt, > > + si->nr_total_ckpt); > > seq_printf(s, "GC calls: %d (BG: %d)\n", > > si->call_count, si->bg_gc); > > seq_printf(s, " - data segments : %d (%d)\n", > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > index bb11759191dc..4de5285df17d 100644 > > --- a/fs/f2fs/f2fs.h > > +++ b/fs/f2fs/f2fs.h > > @@ -97,6 +97,7 @@ extern const char *f2fs_fault_name[FAULT_MAX]; > > #define F2FS_MOUNT_DISABLE_CHECKPOINT 0x02000000 > > #define F2FS_MOUNT_NORECOVERY 0x04000000 > > #define F2FS_MOUNT_ATGC 0x08000000 > > +#define F2FS_MOUNT_MERGE_CHECKPOINT 0x10000000 > > > > #define F2FS_OPTION(sbi) ((sbi)->mount_opt) > > #define clear_opt(sbi, option) (F2FS_OPTION(sbi).opt &=3D ~F2FS_= MOUNT_##option) > > @@ -266,6 +267,24 @@ struct fsync_node_entry { > > unsigned int seq_id; /* sequence id */ > > }; > > > > +struct ckpt_req { > > + struct completion wait; > > + struct llist_node llnode; > > + int ret; > > + struct task_struct *owner; > > + unsigned long queue_time; /* request queued time in jiffies= */ > > + unsigned long complete_time; /* request completed time in jiff= ies */ > > +}; > > + > > +struct ckpt_req_control { > > + struct task_struct *f2fs_issue_ckpt; /* checkpoint task */ > > + wait_queue_head_t ckpt_wait_queue; /* waiting queue for wake= -up */ > > + atomic_t issued_ckpt; /* # of actually issued c= kpts */ > > + atomic_t total_ckpt; /* # of total ckpts */ > > + atomic_t queued_ckpt; /* # of queued ckpts */ > > + struct llist_head issue_list; /* list for command issue= */ > > +}; > > + > > /* for the bitmap indicate blocks to be discarded */ > > struct discard_entry { > > struct list_head list; /* list head */ > > @@ -1404,6 +1423,7 @@ struct f2fs_sb_info { > > wait_queue_head_t cp_wait; > > unsigned long last_time[MAX_TIME]; /* to store time in jiffi= es */ > > long interval_time[MAX_TIME]; /* to store thresholds */ > > + struct ckpt_req_control *cprc_info; /* for checkpoint request= control */ > > > > struct inode_management im[MAX_INO_ENTRY]; /* manage inode c= ache */ > > > > @@ -3418,6 +3438,9 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sb= i, struct cp_control *cpc); > > void f2fs_init_ino_entry_info(struct f2fs_sb_info *sbi); > > int __init f2fs_create_checkpoint_caches(void); > > void f2fs_destroy_checkpoint_caches(void); > > +int f2fs_issue_checkpoint(struct f2fs_sb_info *sbi); > > +int f2fs_create_ckpt_req_control(struct f2fs_sb_info *sbi); > > +void f2fs_destroy_ckpt_req_control(struct f2fs_sb_info *sbi, bool free= ); > > > > /* > > * data.c > > @@ -3530,6 +3553,7 @@ struct f2fs_stat_info { > > int nr_discarding, nr_discarded; > > int nr_discard_cmd; > > unsigned int undiscard_blks; > > + int nr_issued_ckpt, nr_total_ckpt, nr_queued_ckpt; > > int inline_xattr, inline_inode, inline_dir, append, update, orpha= ns; > > int compr_inode; > > unsigned long long compr_blocks; > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > > index b4a07fe62d1a..5cd89c231223 100644 > > --- a/fs/f2fs/super.c > > +++ b/fs/f2fs/super.c > > @@ -143,6 +143,7 @@ enum { > > Opt_checkpoint_disable_cap, > > Opt_checkpoint_disable_cap_perc, > > Opt_checkpoint_enable, > > + Opt_checkpoint_merge, > > Opt_compress_algorithm, > > Opt_compress_log_size, > > Opt_compress_extension, > > @@ -213,6 +214,7 @@ static match_table_t f2fs_tokens =3D { > > {Opt_checkpoint_disable_cap, "checkpoint=3Ddisable:%u"}, > > {Opt_checkpoint_disable_cap_perc, "checkpoint=3Ddisable:%u%%"}, > > {Opt_checkpoint_enable, "checkpoint=3Denable"}, > > + {Opt_checkpoint_merge, "checkpoint=3Dmerge"}, > > {Opt_compress_algorithm, "compress_algorithm=3D%s"}, > > {Opt_compress_log_size, "compress_log_size=3D%u"}, > > {Opt_compress_extension, "compress_extension=3D%s"}, > > @@ -872,6 +874,9 @@ static int parse_options(struct super_block *sb, ch= ar *options, bool is_remount) > > case Opt_checkpoint_enable: > > clear_opt(sbi, DISABLE_CHECKPOINT); > > break; > > + case Opt_checkpoint_merge: > > + set_opt(sbi, MERGE_CHECKPOINT); > > + break; > > #ifdef CONFIG_F2FS_FS_COMPRESSION > > case Opt_compress_algorithm: > > if (!f2fs_sb_has_compression(sbi)) { > > @@ -1040,6 +1045,12 @@ 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=3Dmerge cannot be used with che= ckpoint=3Ddisable\n"); > > + return -EINVAL; > > + } > > + > > /* Not pass down write hints if the number of active logs is less= er > > * than NR_CURSEG_PERSIST_TYPE. > > */ > > @@ -1245,6 +1256,12 @@ static void f2fs_put_super(struct super_block *s= b) > > /* prevent remaining shrinker jobs */ > > mutex_lock(&sbi->umount_mutex); > > > > + /* > > + * flush all issued checkpoints and destroy checkpoint request co= ntrol. > > + * after then, all checkpoints should be done by each process con= text. > > + */ > > + f2fs_destroy_ckpt_req_control(sbi, true); > > + > > /* > > * We don't need to do checkpoint when superblock is clean. > > * But, the previous checkpoint was not done by umount, it needs = to do > > @@ -1347,10 +1364,13 @@ int f2fs_sync_fs(struct super_block *sb, int sy= nc) > > struct cp_control cpc; > > > > cpc.reason =3D __get_cp_reason(sbi); > > - > > - down_write(&sbi->gc_lock); > > - err =3D f2fs_write_checkpoint(sbi, &cpc); > > - up_write(&sbi->gc_lock); > > + if (test_opt(sbi, MERGE_CHECKPOINT) && cpc.reason =3D=3D = CP_SYNC) { > > + err =3D f2fs_issue_checkpoint(sbi); > > + } else { > > + down_write(&sbi->gc_lock); > > + err =3D f2fs_write_checkpoint(sbi, &cpc); > > + up_write(&sbi->gc_lock); > > + } > > } > > f2fs_trace_ios(NULL, 1); > > > > @@ -1674,6 +1694,8 @@ static int f2fs_show_options(struct seq_file *seq= , struct dentry *root) > > if (test_opt(sbi, DISABLE_CHECKPOINT)) > > seq_printf(seq, ",checkpoint=3Ddisable:%u", > > F2FS_OPTION(sbi).unusable_cap); > > + if (test_opt(sbi, MERGE_CHECKPOINT)) > > + seq_puts(seq, ",checkpoint=3Dmerge"); > > if (F2FS_OPTION(sbi).fsync_mode =3D=3D FSYNC_MODE_POSIX) > > seq_printf(seq, ",fsync_mode=3D%s", "posix"); > > else if (F2FS_OPTION(sbi).fsync_mode =3D=3D FSYNC_MODE_STRICT) > > @@ -1954,6 +1976,18 @@ static int f2fs_remount(struct super_block *sb, = int *flags, char *data) > > } > > } > > > > + if (!test_opt(sbi, MERGE_CHECKPOINT)) { > > + f2fs_destroy_ckpt_req_control(sbi, false); > > + } else { > > + err =3D f2fs_create_ckpt_req_control(sbi); > > + if (err) { > > + f2fs_err(sbi, > > + "Failed to initialize F2FS issue_checkpoi= nt_thread (%d)", > > + err); > > + goto restore_gc; > > + } > > + } > > + > > /* > > * We stop issue flush thread if FS is mounted as RO > > * or if flush_merge is not passed in mount option. > > @@ -3701,6 +3735,15 @@ static int f2fs_fill_super(struct super_block *s= b, void *data, int silent) > > > > f2fs_init_fsync_node_info(sbi); > > > > + /* setup checkpoint request control */ > > + err =3D f2fs_create_ckpt_req_control(sbi); > > + if (err) { > > + f2fs_err(sbi, > > + "Failed to initialize F2FS checkpoint request control= (%d)", > > + err); > > + goto free_cprc; > > + } > > + > > /* setup f2fs internal modules */ > > err =3D f2fs_build_segment_manager(sbi); > > if (err) { > > @@ -3910,6 +3953,8 @@ static int f2fs_fill_super(struct super_block *sb= , void *data, int silent) > > free_sm: > > f2fs_destroy_segment_manager(sbi); > > f2fs_destroy_post_read_wq(sbi); > > +free_cprc: > > + f2fs_destroy_ckpt_req_control(sbi, true); > > free_devices: > > destroy_device_list(sbi); > > kvfree(sbi->ckpt); > > -- > > 2.30.0.284.gd98b1dd5eaa7-goog > > > > > > > > _______________________________________________ > > Linux-f2fs-devel mailing list > > Linux-f2fs-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel