Skip to contentSkip to conversation

Revert "resize.f2fs: add option for large_nat_bitmap feature"

PATCH Superseded Chao Yu via Linux-f2fs-devel 2 participants 4 messages Apr 11, 2025

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#1 lore raw

PATCH v3 2/2 resize.f2fs: add caution message for resize

In reply to Chao Yu via Linux-f2fs-devel

resize.f2fs doesn't guarantee atomically resizing f2fs image, so that potential suddent power cut, IO error, out of memory, SIGKILL received or program exits due to other reasons may cause data corruption.

This patch adds caution message for resize users to notice potential risk of using resizing tool, and remind them to backup data before resize.

resize.f2fs <partition>

"Please notice there is high risk of data lost during resize, please backup your data before resize. Do you want to resize this partition? [y/n] y
process resize"

If we want to force to use resize.f2fs, we can use -F option, let's enable -F option in Android by default to not break any usage.

Cc Juhyung Park <[email protected]>

---
v3:
- update Juhyung's email name

 fsck/main.c       | 27 +++++++++++++++++++++++++--
 fsck/resize.c     |  2 +-
 include/f2fs_fs.h |  1 +
 man/resize.f2fs.8 | 12 ++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)
fsck/main.c +25 -2
index af40613..ef6b17d 100644
@@ -222,6 +222,8 @@ static void add_default_options(void)
 		if (c.func == FSCK) {
 			/* -a */
 			c.auto_fix = 1;
+		} else if (c.func == RESIZE) {
+			c.force = 1;
 		}
 
 		/*
@@ -601,7 +603,7 @@ void f2fs_parse_options(int argc, char *argv[])
 #endif
 	} else if (!strcmp("resize.f2fs", prog)) {
 #ifdef WITH_RESIZE
-		const char *option_string = "d:fHst:o:V";
+		const char *option_string = "d:fFHst:o:V";
 
 		c.func = RESIZE;
 		while ((option = getopt(argc, argv, option_string)) != EOF) {
@@ -618,9 +620,12 @@ void f2fs_parse_options(int argc, char *argv[])
 							c.dbg_lv);
 				break;
 			case 'f':
+				c.ignore_error = 1;
+				MSG(0, "Info: Ingore error during resize\n");
+				break;
+			case 'F':
 				c.force = 1;
 				MSG(0, "Info: Force to resize\n");
-				break;
 			case 'H':
 				c.need_whint = true;
 				c.whint = WRITE_LIFE_NOT_SET;
@@ -1104,6 +1109,24 @@ out_range:
 #ifdef WITH_RESIZE
 static int do_resize(struct f2fs_sb_info *sbi)
 {
+	char answer[255] = {0};
+	int ret;
+
+	if (!c.force) {
+retry:
+		printf("\nPlease notice there is high risk of data lost during resize, "
+			"please backup your data before resize.\n"
+			"Do you want to resize this partition? [y/n] ");
+		ret = scanf("%s", answer);
+		ASSERT(ret >= 0);
+		if (!strcasecmp(answer, "y"))
+			printf("process resize\n");
+		else if (!strcasecmp(answer, "n"))
+			return 0;
+		else
+			goto retry;
+	}
+
 	if (!c.target_sectors)
 		c.target_sectors = c.total_sectors;
 
fsck/resize.c +1 -1
index 2681b9f..1ab7d75 100644
@@ -765,7 +765,7 @@ int f2fs_resize(struct f2fs_sb_info *sbi)
 		}
 	else if (((c.target_sectors * c.sector_size >>
 			get_sb(log_blocksize)) > get_sb(block_count)) ||
-			c.force)
+			c.ignore_error)
 		return f2fs_resize_grow(sbi);
 	else {
 		MSG(0, "Nothing to resize.\n");
include/f2fs_fs.h +1 -0
index 7e3f25b..928f963 100644
@@ -1528,6 +1528,7 @@ struct f2fs_configuration {
 	int no_kernel_check;
 	int fix_on;
 	int force;
+	int ignore_error;
 	int defset;
 	int bug_on;
 	unsigned int invalid_sb;
man/resize.f2fs.8 +12 -0
index 02ff245..bdda4fd 100644
@@ -18,6 +18,12 @@ resize.f2fs \- resize filesystem size
 .I overprovision-ratio-percentage
 ]
 [
+.B \-f
+]
+[
+.B \-F
+]
+[
 .B \-H
 ]
 [
@@ -53,6 +59,12 @@ Specify the percentage of the volume that will be used as overprovision area.
 This area is hidden to users, and utilized by F2FS cleaner. If not specified, the
 best number will be assigned automatically according to the partition size.
 .TP
+.BI \-f
+Force to fix any inconsistent data during resize.
+.TP
+.BI \-F
+Skip caution dialogue and resize partition directly.
+.TP
 .BI \-H
 Specify support write hint.
 .TP
Signature · 8 lines
2.40.1



_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
#0 lore raw

PATCH v3 1/2 Revert "resize.f2fs: add option for large_nat_bitmap feature"

This reverts commit daa0f8b9e9b1eea6c85e5c169b809254d9d7074e.

As Juhyung reported in [1]:

Here's what I did:
1. Remounted to checkpoint=disable
2. Create a dm-snapshot of the current root device
3. Mount snapshot to replay the log
4. Unmount
5. Resize sector 487248896 to 486539264
// ./resize.f2fs -d 3 -s -i /dev/mapper/snap -t 486539264

Latest f2fs-tools was used:
33c5b9539af2 f2fs_io: add fragread command to evaluate fragmented buffer for reads

This reproduced the mount and fsck failure.

Mount log:

[442431.020594] F2FS-fs (dm-2): invalid crc_offset: 0
[442431.130055] F2FS-fs (dm-2): SIT is corrupted node# 13615201 vs 13616290
[442431.139684] F2FS-fs (dm-2): Failed to initialize F2FS segment manager (-117)

I checked below testcases:

truncate -s $((512*1024*1024*1024)) img
mkfs.f2fs -f img $((256*1024*1024))

Description Test command FSCK output
a) shrink w/ -s resize.f2fs -s -i img -t $((128*1024*1024)) Fine
b) expand w/ -s resize.f2fs -s -i img -t $((1024*1024*1024)) Corrupted
c) shrink w/o -s resize.f2fs -i img -t $((128*1024*1024)) No run
d) expand w/o -s resize.f2fs -i img -t $((1024*1024*1024)) Fine

Output from b):
[ASSERT] (check_block_count:2299) --> Wrong SIT valid blocks: segno=0x29400, 0 vs. 13

The root cause is: safe mode (-s option) is conflict w/ large nat bitmap feature (-i option), since once we enable large nat bitmap, layout of checkpoint will be changed [2], we must relocate nat/sit_bitmap to the end of new location of cp_checksum, however in safe mode, we won't change metadata of checkpoint, so we need to keep nat/sit_bitmap as it is, which includes checksum data in its old location.

Let's revert -i support for resize.f2fs first, and then reenable it after fix and well tested.

Thanks a lot for the help from Juhyung, including providing reproducer and hints.

[1] https://lore.kernel.org/linux-f2fs-devel/CAD14+f3D6iPOBxEgkZxxTsXCfwRKb9ph68JtUk3H9cn8ovLt9w@mail.gmail.com/
[2] https://lore.kernel.org/linux-f2fs-devel/[email protected]/

Fixes daa0f8b ("resize.f2fs: add option for large_nat_bitmap feature")

---
v3:
- update Juhyung's email name

 fsck/main.c       | 6 +-----
 fsck/resize.c     | 3 ---
 man/resize.f2fs.8 | 6 ------
 3 files changed, 1 insertion(+), 14 deletions(-)
fsck/main.c +1 -5
index 524dbb1..af40613 100644
@@ -141,7 +141,6 @@ void resize_usage()
 	MSG(0, "[options]:\n");
 	MSG(0, "  -d debug level [default:0]\n");
 	MSG(0, "  -H support write hint\n");
-	MSG(0, "  -i extended node bitmap, node ratio is 20%% by default\n");
 	MSG(0, "  -o overprovision percentage [default:auto]\n");
 	MSG(0, "  -s safe resize (Does not resize metadata)\n");
 	MSG(0, "  -t target sectors [default: device size]\n");
@@ -602,7 +601,7 @@ void f2fs_parse_options(int argc, char *argv[])
 #endif
 	} else if (!strcmp("resize.f2fs", prog)) {
 #ifdef WITH_RESIZE
-		const char *option_string = "d:fHst:io:V";
+		const char *option_string = "d:fHst:o:V";
 
 		c.func = RESIZE;
 		while ((option = getopt(argc, argv, option_string)) != EOF) {
@@ -637,9 +636,6 @@ void f2fs_parse_options(int argc, char *argv[])
 					ret = sscanf(optarg, "%"PRIx64"",
 							&c.target_sectors);
 				break;
-			case 'i':
-				c.large_nat_bitmap = 1;
-				break;
 			case 'o':
 				c.new_overprovision = atof(optarg);
 				break;
fsck/resize.c +0 -3
index 9b3b071..2681b9f 100644
@@ -531,9 +531,6 @@ static void rebuild_checkpoint(struct f2fs_sb_info *sbi,
 
 	/* update nat_bits flag */
 	flags = update_nat_bits_flags(new_sb, cp, get_cp(ckpt_flags));
-	if (c.large_nat_bitmap)
-		flags |= CP_LARGE_NAT_BITMAP_FLAG;
-
 	if (flags & CP_COMPACT_SUM_FLAG)
 		flags &= ~CP_COMPACT_SUM_FLAG;
 	if (flags & CP_LARGE_NAT_BITMAP_FLAG)
man/resize.f2fs.8 +0 -6
index d41ad79..02ff245 100644
@@ -21,9 +21,6 @@ resize.f2fs \- resize filesystem size
 .B \-H
 ]
 [
-.B \-i
-]
-[
 .B \-s
 ]
 [
@@ -59,9 +56,6 @@ best number will be assigned automatically according to the partition size.
 .BI \-H
 Specify support write hint.
 .TP
-.BI \-i
-Enable extended node bitmap.
-.TP
 .BI \-s
 Enable safe resize.
 .TP
Signature · 8 lines
2.40.1



_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
#2 lore raw

Re: [f2fs-dev] [PATCH v3 2/2] resize.f2fs: add caution message for resize

In reply to Chao Yu via Linux-f2fs-devel

Hi Chao,

My name wasn't the only thing I picked up on the v2 patch, just a friendly ping in case you missed it :)

Quoted 148 lines · Chao Yu

resize.f2fs doesn't guarantee atomically resizing f2fs image, so that potential suddent power cut, IO error, out of memory, SIGKILL received or program exits due to other reasons may cause data corruption.

This patch adds caution message for resize users to notice potential risk of using resizing tool, and remind them to backup data before resize.

resize.f2fs <partition>

"Please notice there is high risk of data lost during resize, please backup your data before resize. Do you want to resize this partition? [y/n] y
process resize"

If we want to force to use resize.f2fs, we can use -F option, let's enable -F option in Android by default to not break any usage.

Cc Juhyung Park <[email protected]>

---
v3:
- update Juhyung's email name

 fsck/main.c       | 27 +++++++++++++++++++++++++--
 fsck/resize.c     |  2 +-
 include/f2fs_fs.h |  1 +
 man/resize.f2fs.8 | 12 ++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)
fsck/main.c +25 -2
index af40613..ef6b17d 100644
@@ -222,6 +222,8 @@ static void add_default_options(void)
                if (c.func == FSCK) {
                        /* -a */
                        c.auto_fix = 1;
+               } else if (c.func == RESIZE) {
+                       c.force = 1;
                }
 
                /*
@@ -601,7 +603,7 @@ void f2fs_parse_options(int argc, char *argv[])
 #endif
        } else if (!strcmp("resize.f2fs", prog)) {
 #ifdef WITH_RESIZE
-               const char *option_string = "d:fHst:o:V";
+               const char *option_string = "d:fFHst:o:V";
 
                c.func = RESIZE;
                while ((option = getopt(argc, argv, option_string)) != EOF) {
@@ -618,9 +620,12 @@ void f2fs_parse_options(int argc, char *argv[])
                                                        c.dbg_lv);
                                break;
                        case 'f':
+                               c.ignore_error = 1;
+                               MSG(0, "Info: Ingore error during resize\n");
+                               break;
+                       case 'F':
                                c.force = 1;
                                MSG(0, "Info: Force to resize\n");
-                               break;
                        case 'H':
                                c.need_whint = true;
                                c.whint = WRITE_LIFE_NOT_SET;
@@ -1104,6 +1109,24 @@ out_range:
 #ifdef WITH_RESIZE
 static int do_resize(struct f2fs_sb_info *sbi)
 {
+       char answer[255] = {0};
+       int ret;
+
+       if (!c.force) {
+retry:
+               printf("\nPlease notice there is high risk of data lost during resize, "
+                       "please backup your data before resize.\n"
+                       "Do you want to resize this partition? [y/n] ");
+               ret = scanf("%s", answer);
+               ASSERT(ret >= 0);
+               if (!strcasecmp(answer, "y"))
+                       printf("process resize\n");
+               else if (!strcasecmp(answer, "n"))
+                       return 0;
+               else
+                       goto retry;
+       }
+
        if (!c.target_sectors)
                c.target_sectors = c.total_sectors;
 
fsck/resize.c +1 -1
index 2681b9f..1ab7d75 100644
@@ -765,7 +765,7 @@ int f2fs_resize(struct f2fs_sb_info *sbi)
                }
        else if (((c.target_sectors * c.sector_size >>
                        get_sb(log_blocksize)) > get_sb(block_count)) ||
-                       c.force)
+                       c.ignore_error)
                return f2fs_resize_grow(sbi);
        else {
                MSG(0, "Nothing to resize.\n");
include/f2fs_fs.h +1 -0
index 7e3f25b..928f963 100644
@@ -1528,6 +1528,7 @@ struct f2fs_configuration {
        int no_kernel_check;
        int fix_on;
        int force;
+       int ignore_error;
        int defset;
        int bug_on;
        unsigned int invalid_sb;
man/resize.f2fs.8 +12 -1
index 02ff245..bdda4fd 100644
@@ -18,6 +18,12 @@ resize.f2fs \- resize filesystem size
 .I overprovision-ratio-percentage
 ]
 [
+.B \-f
+]
+[
+.B \-F
+]
+[
 .B \-H
 ]
 [
@@ -53,6 +59,12 @@ Specify the percentage of the volume that will be used as overprovision area.
 This area is hidden to users, and utilized by F2FS cleaner. If not specified, the
 best number will be assigned automatically according to the partition size.
 .TP
+.BI \-f
+Force to fix any inconsistent data during resize.
+.TP
+.BI \-F
+Skip caution dialogue and resize partition directly.
+.TP
 .BI \-H
 Specify support write hint.
 .TP
--
Quoted 2 lines

2.40.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

#3 lore raw

Re: [f2fs-dev] [PATCH v3 2/2] resize.f2fs: add caution message for resize

Quoted 4 lines · Juhyung Park

Hi Chao,

My name wasn't the only thing I picked up on the v2 patch, just a friendly ping in case you missed it :)

Oops, sorry, will check them all soon. :(

Thanks,

Quoted 144 lines · Chao Yu
Quoted 142 lines

resize.f2fs doesn't guarantee atomically resizing f2fs image, so that potential suddent power cut, IO error, out of memory, SIGKILL received or program exits due to other reasons may cause data corruption.

This patch adds caution message for resize users to notice potential risk of using resizing tool, and remind them to backup data before resize.

resize.f2fs <partition>

"Please notice there is high risk of data lost during resize, please backup your data before resize. Do you want to resize this partition? [y/n] y
process resize"

If we want to force to use resize.f2fs, we can use -F option, let's enable -F option in Android by default to not break any usage.

Cc Juhyung Park <[email protected]>

---
v3:
- update Juhyung's email name

  fsck/main.c       | 27 +++++++++++++++++++++++++--
  fsck/resize.c     |  2 +-
  include/f2fs_fs.h |  1 +
  man/resize.f2fs.8 | 12 ++++++++++++
  4 files changed, 39 insertions(+), 3 deletions(-)
fsck/main.c +25 -2
index af40613..ef6b17d 100644
@@ -222,6 +222,8 @@ static void add_default_options(void)
                 if (c.func == FSCK) {
                         /* -a */
                         c.auto_fix = 1;
+               } else if (c.func == RESIZE) {
+                       c.force = 1;
                 }
 
                 /*
@@ -601,7 +603,7 @@ void f2fs_parse_options(int argc, char *argv[])
  #endif
         } else if (!strcmp("resize.f2fs", prog)) {
  #ifdef WITH_RESIZE
-               const char *option_string = "d:fHst:o:V";
+               const char *option_string = "d:fFHst:o:V";
 
                 c.func = RESIZE;
                 while ((option = getopt(argc, argv, option_string)) != EOF) {
@@ -618,9 +620,12 @@ void f2fs_parse_options(int argc, char *argv[])
                                                         c.dbg_lv);
                                 break;
                         case 'f':
+                               c.ignore_error = 1;
+                               MSG(0, "Info: Ingore error during resize\n");
+                               break;
+                       case 'F':
                                 c.force = 1;
                                 MSG(0, "Info: Force to resize\n");
-                               break;
                         case 'H':
                                 c.need_whint = true;
                                 c.whint = WRITE_LIFE_NOT_SET;
@@ -1104,6 +1109,24 @@ out_range:
  #ifdef WITH_RESIZE
  static int do_resize(struct f2fs_sb_info *sbi)
  {
+       char answer[255] = {0};
+       int ret;
+
+       if (!c.force) {
+retry:
+               printf("\nPlease notice there is high risk of data lost during resize, "
+                       "please backup your data before resize.\n"
+                       "Do you want to resize this partition? [y/n] ");
+               ret = scanf("%s", answer);
+               ASSERT(ret >= 0);
+               if (!strcasecmp(answer, "y"))
+                       printf("process resize\n");
+               else if (!strcasecmp(answer, "n"))
+                       return 0;
+               else
+                       goto retry;
+       }
+
         if (!c.target_sectors)
                 c.target_sectors = c.total_sectors;
 
fsck/resize.c +1 -1
index 2681b9f..1ab7d75 100644
@@ -765,7 +765,7 @@ int f2fs_resize(struct f2fs_sb_info *sbi)
                 }
         else if (((c.target_sectors * c.sector_size >>
                         get_sb(log_blocksize)) > get_sb(block_count)) ||
-                       c.force)
+                       c.ignore_error)
                 return f2fs_resize_grow(sbi);
         else {
                 MSG(0, "Nothing to resize.\n");
include/f2fs_fs.h +1 -0
index 7e3f25b..928f963 100644
@@ -1528,6 +1528,7 @@ struct f2fs_configuration {
         int no_kernel_check;
         int fix_on;
         int force;
+       int ignore_error;
         int defset;
         int bug_on;
         unsigned int invalid_sb;
man/resize.f2fs.8 +10 -0
index 02ff245..bdda4fd 100644
@@ -18,6 +18,12 @@ resize.f2fs \- resize filesystem size
  .I overprovision-ratio-percentage
  ]
  [
+.B \-f
+]
+[
+.B \-F
+]
+[
  .B \-H
  ]
  [
@@ -53,6 +59,12 @@ Specify the percentage of the volume that will be used as overprovision area.
  This area is hidden to users, and utilized by F2FS cleaner. If not specified, the
  best number will be assigned automatically according to the partition size.
  .TP
+.BI \-f
+Force to fix any inconsistent data during resize.
+.TP
+.BI \-F
Quoted 8 lines
Quoted 8 lines
man/resize.f2fs.8 +2 -1
+Skip caution dialogue and resize partition directly.
+.TP
  .BI \-H
  Specify support write hint.
  .TP
--

2.40.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel