public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint()
@ 2026-01-19 13:32 Chao Yu
  2026-01-19 13:32 ` [PATCH 2/2] f2fs: introduce FAULT_SKIP_WRITE Chao Yu
  2026-01-19 23:47 ` [f2fs-dev] [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint() Zhiguo Niu
  0 siblings, 2 replies; 4+ messages in thread
From: Chao Yu @ 2026-01-19 13:32 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

This patch introduces sbi->nr_pages[F2FS_SKIPPED_WRITE] to record any
skipped write during data flush in f2fs_enable_checkpoint().

So in the loop of data flush, if there is any skipped write in previous
flush, let's retry sync_inode_sb(), otherwise, all dirty data written
before f2fs_enable_checkpoint() should have been persisted, then break
the retry loop.

Signed-off-by: Chao Yu <chao@kernel.org>
---
Changelog:
- code is based on 'Revert "f2fs: add timeout in f2fs_enable_checkpoint()"'
 fs/f2fs/data.c  | 12 ++++++++++++
 fs/f2fs/f2fs.h  |  2 ++
 fs/f2fs/super.c | 37 +++++++++++++++++++++++++++++++++----
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5b4832956196..00108d5881aa 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3500,6 +3500,15 @@ static inline void account_writeback(struct inode *inode, bool inc)
 	f2fs_up_read(&F2FS_I(inode)->i_sem);
 }
 
+static inline void update_skipped_write(struct f2fs_sb_info *sbi,
+						struct writeback_control *wbc)
+{
+	long skipped = wbc->pages_skipped;
+
+	if (skipped && is_sbi_flag_set(sbi, SBI_ENABLE_CHECKPOINT))
+		atomic_add(skipped, &sbi->nr_pages[F2FS_SKIPPED_WRITE]);
+}
+
 static int __f2fs_write_data_pages(struct address_space *mapping,
 						struct writeback_control *wbc,
 						enum iostat_type io_type)
@@ -3564,10 +3573,13 @@ static int __f2fs_write_data_pages(struct address_space *mapping,
 	 */
 
 	f2fs_remove_dirty_inode(inode);
+
+	update_skipped_write(sbi, wbc);
 	return ret;
 
 skip_write:
 	wbc->pages_skipped += get_dirty_pages(inode);
+	update_skipped_write(sbi, wbc);
 	trace_f2fs_writepages(mapping->host, wbc, DATA);
 	return 0;
 }
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 035239758e33..52cec6b3ecf0 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1238,6 +1238,7 @@ enum count_type {
 	F2FS_RD_META,
 	F2FS_DIO_WRITE,
 	F2FS_DIO_READ,
+	F2FS_SKIPPED_WRITE,	/* skip or fail during f2fs_enable_checkpoint() */
 	NR_COUNT_TYPE,
 };
 
@@ -1476,6 +1477,7 @@ enum {
 	SBI_IS_RESIZEFS,			/* resizefs is in process */
 	SBI_IS_FREEZING,			/* freezefs is in process */
 	SBI_IS_WRITABLE,			/* remove ro mountoption transiently */
+	SBI_ENABLE_CHECKPOINT,			/* indicate it's during f2fs_enable_checkpoint() */
 	MAX_SBI_FLAG,
 };
 
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 97c2264ec7fe..0afe9f829058 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2690,6 +2690,7 @@ static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
 	long long start, writeback, end;
 	int ret;
 	struct f2fs_lock_context lc;
+	long long skipped_write, dirty_data;
 
 	f2fs_info(sbi, "f2fs_enable_checkpoint() starts, meta: %lld, node: %lld, data: %lld",
 					get_pages(sbi, F2FS_DIRTY_META),
@@ -2698,17 +2699,45 @@ static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
 
 	start = ktime_get();
 
+	set_sbi_flag(sbi, SBI_ENABLE_CHECKPOINT);
+
 	/* we should flush all the data to keep data consistency */
 	do {
+		skipped_write = get_pages(sbi, F2FS_SKIPPED_WRITE);
+		dirty_data = get_pages(sbi, F2FS_DIRTY_DATA);
+
 		sync_inodes_sb(sbi->sb);
 		f2fs_io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);
-	} while (get_pages(sbi, F2FS_DIRTY_DATA) && retry--);
+
+		f2fs_info(sbi, "sync_inode_sb done, dirty_data: %lld, %lld, "
+				"skipped write: %lld, %lld, retry: %d",
+				get_pages(sbi, F2FS_DIRTY_DATA),
+				dirty_data,
+				get_pages(sbi, F2FS_SKIPPED_WRITE),
+				skipped_write, retry);
+
+		/*
+		 * sync_inodes_sb() has retry logic, so let's check dirty_data
+		 * in prior to skipped_write in case there is no dirty data.
+		 */
+		if (!get_pages(sbi, F2FS_DIRTY_DATA))
+			break;
+		if (get_pages(sbi, F2FS_SKIPPED_WRITE) == skipped_write)
+			break;
+	} while (retry--);
+
+	clear_sbi_flag(sbi, SBI_ENABLE_CHECKPOINT);
 
 	writeback = ktime_get();
 
-	if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA)))
-		f2fs_warn(sbi, "checkpoint=enable has some unwritten data: %lld",
-					get_pages(sbi, F2FS_DIRTY_DATA));
+	if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA) ||
+			get_pages(sbi, F2FS_SKIPPED_WRITE)))
+		f2fs_warn(sbi, "checkpoint=enable unwritten data: %lld, skipped data: %lld, retry: %d",
+				get_pages(sbi, F2FS_DIRTY_DATA),
+				get_pages(sbi, F2FS_SKIPPED_WRITE), retry);
+
+	if (get_pages(sbi, F2FS_SKIPPED_WRITE))
+		atomic_set(&sbi->nr_pages[F2FS_SKIPPED_WRITE], 0);
 
 	f2fs_down_write_trace(&sbi->gc_lock, &lc);
 	f2fs_dirty_to_prefree(sbi);
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] f2fs: introduce FAULT_SKIP_WRITE
  2026-01-19 13:32 [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint() Chao Yu
@ 2026-01-19 13:32 ` Chao Yu
  2026-01-19 23:47 ` [f2fs-dev] [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint() Zhiguo Niu
  1 sibling, 0 replies; 4+ messages in thread
From: Chao Yu @ 2026-01-19 13:32 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

In order to simulate skipped write during enable_checkpoint().

Signed-off-by: Chao Yu <chao@kernel.org>
---
 Documentation/ABI/testing/sysfs-fs-f2fs | 1 +
 Documentation/filesystems/f2fs.rst      | 1 +
 fs/f2fs/data.c                          | 4 ++++
 fs/f2fs/f2fs.h                          | 1 +
 fs/f2fs/super.c                         | 1 +
 5 files changed, 8 insertions(+)

diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
index 7398b369784c..9a8ec2290f68 100644
--- a/Documentation/ABI/testing/sysfs-fs-f2fs
+++ b/Documentation/ABI/testing/sysfs-fs-f2fs
@@ -744,6 +744,7 @@ Description:	Support configuring fault injection type, should be
 		FAULT_ATOMIC_TIMEOUT             0x00400000 (1000ms)
 		FAULT_VMALLOC                    0x00800000
 		FAULT_LOCK_TIMEOUT               0x01000000 (1000ms)
+		FAULT_SKIP_WRITE                 0x02000000
 		===========================      ==========
 
 What:		/sys/fs/f2fs/<disk>/discard_io_aware_gran
diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst
index fc005f2eaf86..7e4031631286 100644
--- a/Documentation/filesystems/f2fs.rst
+++ b/Documentation/filesystems/f2fs.rst
@@ -218,6 +218,7 @@ fault_type=%d		 Support configuring fault injection type, should be
 			     FAULT_ATOMIC_TIMEOUT             0x00400000 (1000ms)
 			     FAULT_VMALLOC                    0x00800000
 			     FAULT_LOCK_TIMEOUT               0x01000000 (1000ms)
+			     FAULT_SKIP_WRITE                 0x02000000
 			     ===========================      ==========
 mode=%s			 Control block allocation mode which supports "adaptive"
 			 and "lfs". In "lfs" mode, there should be no random
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 00108d5881aa..830c8090767e 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2926,6 +2926,10 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)
 		goto got_it;
 	}
 
+	if (is_sbi_flag_set(fio->sbi, SBI_ENABLE_CHECKPOINT) &&
+		time_to_inject(fio->sbi, FAULT_SKIP_WRITE))
+		return -EINVAL;
+
 	/* Deadlock due to between page->lock and f2fs_lock_op */
 	if (fio->need_lock == LOCK_REQ && !f2fs_trylock_op(fio->sbi, &lc))
 		return -EAGAIN;
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 52cec6b3ecf0..3a8e1dcdcd69 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -66,6 +66,7 @@ enum {
 	FAULT_ATOMIC_TIMEOUT,
 	FAULT_VMALLOC,
 	FAULT_LOCK_TIMEOUT,
+	FAULT_SKIP_WRITE,
 	FAULT_MAX,
 };
 
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 0afe9f829058..5d8b2e812340 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -70,6 +70,7 @@ const char *f2fs_fault_name[FAULT_MAX] = {
 	[FAULT_ATOMIC_TIMEOUT]		= "atomic timeout",
 	[FAULT_VMALLOC]			= "vmalloc",
 	[FAULT_LOCK_TIMEOUT]		= "lock timeout",
+	[FAULT_SKIP_WRITE]		= "skip write",
 };
 
 int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [f2fs-dev] [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint()
  2026-01-19 13:32 [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint() Chao Yu
  2026-01-19 13:32 ` [PATCH 2/2] f2fs: introduce FAULT_SKIP_WRITE Chao Yu
@ 2026-01-19 23:47 ` Zhiguo Niu
  2026-01-20  4:00   ` Chao Yu
  1 sibling, 1 reply; 4+ messages in thread
From: Zhiguo Niu @ 2026-01-19 23:47 UTC (permalink / raw)
  To: Chao Yu; +Cc: jaegeuk, linux-kernel, linux-f2fs-devel

Chao Yu via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net>
于2026年1月19日周一 22:48写道:
>
> This patch introduces sbi->nr_pages[F2FS_SKIPPED_WRITE] to record any
> skipped write during data flush in f2fs_enable_checkpoint().
>
> So in the loop of data flush, if there is any skipped write in previous
> flush, let's retry sync_inode_sb(), otherwise, all dirty data written
> before f2fs_enable_checkpoint() should have been persisted, then break
> the retry loop.
>
> Signed-off-by: Chao Yu <chao@kernel.org>
> ---
> Changelog:
> - code is based on 'Revert "f2fs: add timeout in f2fs_enable_checkpoint()"'
>  fs/f2fs/data.c  | 12 ++++++++++++
>  fs/f2fs/f2fs.h  |  2 ++
>  fs/f2fs/super.c | 37 +++++++++++++++++++++++++++++++++----
>  3 files changed, 47 insertions(+), 4 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index 5b4832956196..00108d5881aa 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -3500,6 +3500,15 @@ static inline void account_writeback(struct inode *inode, bool inc)
>         f2fs_up_read(&F2FS_I(inode)->i_sem);
>  }
>
> +static inline void update_skipped_write(struct f2fs_sb_info *sbi,
> +                                               struct writeback_control *wbc)
> +{
> +       long skipped = wbc->pages_skipped;
> +
> +       if (skipped && is_sbi_flag_set(sbi, SBI_ENABLE_CHECKPOINT))
> +               atomic_add(skipped, &sbi->nr_pages[F2FS_SKIPPED_WRITE]);
> +}
> +
>  static int __f2fs_write_data_pages(struct address_space *mapping,
>                                                 struct writeback_control *wbc,
>                                                 enum iostat_type io_type)
> @@ -3564,10 +3573,13 @@ static int __f2fs_write_data_pages(struct address_space *mapping,
>          */
>
>         f2fs_remove_dirty_inode(inode);
> +
> +       update_skipped_write(sbi, wbc);
Hi Chao,
Sorry, why do we need to update skipped write here as well?
thanks!
>         return ret;
>
>  skip_write:
>         wbc->pages_skipped += get_dirty_pages(inode);
> +       update_skipped_write(sbi, wbc);
>         trace_f2fs_writepages(mapping->host, wbc, DATA);
>         return 0;
>  }
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 035239758e33..52cec6b3ecf0 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -1238,6 +1238,7 @@ enum count_type {
>         F2FS_RD_META,
>         F2FS_DIO_WRITE,
>         F2FS_DIO_READ,
> +       F2FS_SKIPPED_WRITE,     /* skip or fail during f2fs_enable_checkpoint() */
>         NR_COUNT_TYPE,
>  };
>
> @@ -1476,6 +1477,7 @@ enum {
>         SBI_IS_RESIZEFS,                        /* resizefs is in process */
>         SBI_IS_FREEZING,                        /* freezefs is in process */
>         SBI_IS_WRITABLE,                        /* remove ro mountoption transiently */
> +       SBI_ENABLE_CHECKPOINT,                  /* indicate it's during f2fs_enable_checkpoint() */
>         MAX_SBI_FLAG,
>  };
>
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 97c2264ec7fe..0afe9f829058 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -2690,6 +2690,7 @@ static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
>         long long start, writeback, end;
>         int ret;
>         struct f2fs_lock_context lc;
> +       long long skipped_write, dirty_data;
>
>         f2fs_info(sbi, "f2fs_enable_checkpoint() starts, meta: %lld, node: %lld, data: %lld",
>                                         get_pages(sbi, F2FS_DIRTY_META),
> @@ -2698,17 +2699,45 @@ static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
>
>         start = ktime_get();
>
> +       set_sbi_flag(sbi, SBI_ENABLE_CHECKPOINT);
> +
>         /* we should flush all the data to keep data consistency */
>         do {
> +               skipped_write = get_pages(sbi, F2FS_SKIPPED_WRITE);
> +               dirty_data = get_pages(sbi, F2FS_DIRTY_DATA);
> +
>                 sync_inodes_sb(sbi->sb);
>                 f2fs_io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);
> -       } while (get_pages(sbi, F2FS_DIRTY_DATA) && retry--);
> +
> +               f2fs_info(sbi, "sync_inode_sb done, dirty_data: %lld, %lld, "
> +                               "skipped write: %lld, %lld, retry: %d",
> +                               get_pages(sbi, F2FS_DIRTY_DATA),
> +                               dirty_data,
> +                               get_pages(sbi, F2FS_SKIPPED_WRITE),
> +                               skipped_write, retry);
> +
> +               /*
> +                * sync_inodes_sb() has retry logic, so let's check dirty_data
> +                * in prior to skipped_write in case there is no dirty data.
> +                */
> +               if (!get_pages(sbi, F2FS_DIRTY_DATA))
> +                       break;
> +               if (get_pages(sbi, F2FS_SKIPPED_WRITE) == skipped_write)
> +                       break;
> +       } while (retry--);
> +
> +       clear_sbi_flag(sbi, SBI_ENABLE_CHECKPOINT);
>
>         writeback = ktime_get();
>
> -       if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA)))
> -               f2fs_warn(sbi, "checkpoint=enable has some unwritten data: %lld",
> -                                       get_pages(sbi, F2FS_DIRTY_DATA));
> +       if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA) ||
> +                       get_pages(sbi, F2FS_SKIPPED_WRITE)))
> +               f2fs_warn(sbi, "checkpoint=enable unwritten data: %lld, skipped data: %lld, retry: %d",
> +                               get_pages(sbi, F2FS_DIRTY_DATA),
> +                               get_pages(sbi, F2FS_SKIPPED_WRITE), retry);
> +
> +       if (get_pages(sbi, F2FS_SKIPPED_WRITE))
> +               atomic_set(&sbi->nr_pages[F2FS_SKIPPED_WRITE], 0);
>
>         f2fs_down_write_trace(&sbi->gc_lock, &lc);
>         f2fs_dirty_to_prefree(sbi);
> --
> 2.40.1
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [f2fs-dev] [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint()
  2026-01-19 23:47 ` [f2fs-dev] [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint() Zhiguo Niu
@ 2026-01-20  4:00   ` Chao Yu
  0 siblings, 0 replies; 4+ messages in thread
From: Chao Yu @ 2026-01-20  4:00 UTC (permalink / raw)
  To: Zhiguo Niu; +Cc: chao, jaegeuk, linux-kernel, linux-f2fs-devel

On 1/20/2026 7:47 AM, Zhiguo Niu wrote:
> Chao Yu via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net>
> 于2026年1月19日周一 22:48写道:
>>
>> This patch introduces sbi->nr_pages[F2FS_SKIPPED_WRITE] to record any
>> skipped write during data flush in f2fs_enable_checkpoint().
>>
>> So in the loop of data flush, if there is any skipped write in previous
>> flush, let's retry sync_inode_sb(), otherwise, all dirty data written
>> before f2fs_enable_checkpoint() should have been persisted, then break
>> the retry loop.
>>
>> Signed-off-by: Chao Yu <chao@kernel.org>
>> ---
>> Changelog:
>> - code is based on 'Revert "f2fs: add timeout in f2fs_enable_checkpoint()"'
>>   fs/f2fs/data.c  | 12 ++++++++++++
>>   fs/f2fs/f2fs.h  |  2 ++
>>   fs/f2fs/super.c | 37 +++++++++++++++++++++++++++++++++----
>>   3 files changed, 47 insertions(+), 4 deletions(-)
>>
>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
>> index 5b4832956196..00108d5881aa 100644
>> --- a/fs/f2fs/data.c
>> +++ b/fs/f2fs/data.c
>> @@ -3500,6 +3500,15 @@ static inline void account_writeback(struct inode *inode, bool inc)
>>          f2fs_up_read(&F2FS_I(inode)->i_sem);
>>   }
>>
>> +static inline void update_skipped_write(struct f2fs_sb_info *sbi,
>> +                                               struct writeback_control *wbc)
>> +{
>> +       long skipped = wbc->pages_skipped;
>> +
>> +       if (skipped && is_sbi_flag_set(sbi, SBI_ENABLE_CHECKPOINT))
>> +               atomic_add(skipped, &sbi->nr_pages[F2FS_SKIPPED_WRITE]);
>> +}
>> +
>>   static int __f2fs_write_data_pages(struct address_space *mapping,
>>                                                  struct writeback_control *wbc,
>>                                                  enum iostat_type io_type)
>> @@ -3564,10 +3573,13 @@ static int __f2fs_write_data_pages(struct address_space *mapping,
>>           */
>>
>>          f2fs_remove_dirty_inode(inode);
>> +
>> +       update_skipped_write(sbi, wbc);
> Hi Chao,
> Sorry, why do we need to update skipped write here as well?

Zhiguo,

In case we increase pages_skipped in below path:

- __f2fs_write_data_pages
  - f2fs_write_cache_pages
   - f2fs_write_single_data_page
    - folio_redirty_for_writepage
    : wbc->pages_skipped += nr;

Thanks,

> thanks!
>>          return ret;
>>
>>   skip_write:
>>          wbc->pages_skipped += get_dirty_pages(inode);
>> +       update_skipped_write(sbi, wbc);
>>          trace_f2fs_writepages(mapping->host, wbc, DATA);
>>          return 0;
>>   }
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>> index 035239758e33..52cec6b3ecf0 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -1238,6 +1238,7 @@ enum count_type {
>>          F2FS_RD_META,
>>          F2FS_DIO_WRITE,
>>          F2FS_DIO_READ,
>> +       F2FS_SKIPPED_WRITE,     /* skip or fail during f2fs_enable_checkpoint() */
>>          NR_COUNT_TYPE,
>>   };
>>
>> @@ -1476,6 +1477,7 @@ enum {
>>          SBI_IS_RESIZEFS,                        /* resizefs is in process */
>>          SBI_IS_FREEZING,                        /* freezefs is in process */
>>          SBI_IS_WRITABLE,                        /* remove ro mountoption transiently */
>> +       SBI_ENABLE_CHECKPOINT,                  /* indicate it's during f2fs_enable_checkpoint() */
>>          MAX_SBI_FLAG,
>>   };
>>
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index 97c2264ec7fe..0afe9f829058 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -2690,6 +2690,7 @@ static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
>>          long long start, writeback, end;
>>          int ret;
>>          struct f2fs_lock_context lc;
>> +       long long skipped_write, dirty_data;
>>
>>          f2fs_info(sbi, "f2fs_enable_checkpoint() starts, meta: %lld, node: %lld, data: %lld",
>>                                          get_pages(sbi, F2FS_DIRTY_META),
>> @@ -2698,17 +2699,45 @@ static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
>>
>>          start = ktime_get();
>>
>> +       set_sbi_flag(sbi, SBI_ENABLE_CHECKPOINT);
>> +
>>          /* we should flush all the data to keep data consistency */
>>          do {
>> +               skipped_write = get_pages(sbi, F2FS_SKIPPED_WRITE);
>> +               dirty_data = get_pages(sbi, F2FS_DIRTY_DATA);
>> +
>>                  sync_inodes_sb(sbi->sb);
>>                  f2fs_io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);
>> -       } while (get_pages(sbi, F2FS_DIRTY_DATA) && retry--);
>> +
>> +               f2fs_info(sbi, "sync_inode_sb done, dirty_data: %lld, %lld, "
>> +                               "skipped write: %lld, %lld, retry: %d",
>> +                               get_pages(sbi, F2FS_DIRTY_DATA),
>> +                               dirty_data,
>> +                               get_pages(sbi, F2FS_SKIPPED_WRITE),
>> +                               skipped_write, retry);
>> +
>> +               /*
>> +                * sync_inodes_sb() has retry logic, so let's check dirty_data
>> +                * in prior to skipped_write in case there is no dirty data.
>> +                */
>> +               if (!get_pages(sbi, F2FS_DIRTY_DATA))
>> +                       break;
>> +               if (get_pages(sbi, F2FS_SKIPPED_WRITE) == skipped_write)
>> +                       break;
>> +       } while (retry--);
>> +
>> +       clear_sbi_flag(sbi, SBI_ENABLE_CHECKPOINT);
>>
>>          writeback = ktime_get();
>>
>> -       if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA)))
>> -               f2fs_warn(sbi, "checkpoint=enable has some unwritten data: %lld",
>> -                                       get_pages(sbi, F2FS_DIRTY_DATA));
>> +       if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA) ||
>> +                       get_pages(sbi, F2FS_SKIPPED_WRITE)))
>> +               f2fs_warn(sbi, "checkpoint=enable unwritten data: %lld, skipped data: %lld, retry: %d",
>> +                               get_pages(sbi, F2FS_DIRTY_DATA),
>> +                               get_pages(sbi, F2FS_SKIPPED_WRITE), retry);
>> +
>> +       if (get_pages(sbi, F2FS_SKIPPED_WRITE))
>> +               atomic_set(&sbi->nr_pages[F2FS_SKIPPED_WRITE], 0);
>>
>>          f2fs_down_write_trace(&sbi->gc_lock, &lc);
>>          f2fs_dirty_to_prefree(sbi);
>> --
>> 2.40.1
>>
>>
>>
>> _______________________________________________
>> Linux-f2fs-devel mailing list
>> Linux-f2fs-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-01-20  4:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-19 13:32 [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint() Chao Yu
2026-01-19 13:32 ` [PATCH 2/2] f2fs: introduce FAULT_SKIP_WRITE Chao Yu
2026-01-19 23:47 ` [f2fs-dev] [PATCH 1/2] f2fs: check skipped write in f2fs_enable_checkpoint() Zhiguo Niu
2026-01-20  4:00   ` Chao Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox