Make.f2fs supports manually specifying overprovision, and we expect
resize.f2fs to support it as well.
This change add a new '-o' option to manually specify overprovision.
Signed-off-by: Chao Liu <[email protected]>
---
fsck/main.c | 8 ++++++--
fsck/resize.c | 9 ++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/fsck/main.c b/fsck/main.c
index 260ff29..06253e2 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -124,7 +124,8 @@ void resize_usage()
MSG(0, "[options]:\n");
MSG(0, " -d debug level [default:0]\n");
MSG(0, " -i extended node bitmap, node ratio is 20%% by default\n");
- MSG(0, " -s safe resize (Does not resize metadata)");
+ 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");
MSG(0, " -V print the version number and exit\n");
exit(1);
@@ -529,7 +530,7 @@ void f2fs_parse_options(int argc, char *argv[])
#endif
} else if (!strcmp("resize.f2fs", prog)) {
#ifdef WITH_RESIZE
- const char *option_string = "d:fst:iV";
+ const char *option_string = "d:fst:io:V";
c.func = RESIZE;
while ((option = getopt(argc, argv, option_string)) != EOF) {
@@ -563,6 +564,9 @@ void f2fs_parse_options(int argc, char *argv[])
case 'i':
c.large_nat_bitmap = 1;
break;
+ case 'o':
+ c.new_overprovision = atof(optarg);
+ break;
case 'V':
show_version(prog);
exit(0);
diff --git a/fsck/resize.c b/fsck/resize.c
index 78d578e..85a53c5 100644
--- a/fsck/resize.c
+++ b/fsck/resize.c
@@ -146,7 +146,9 @@ safe_resize:
get_sb(segs_per_sec));
/* Let's determine the best reserved and overprovisioned space */
- c.new_overprovision = get_best_overprovision(sb);
+ if (c.new_overprovision == 0)
+ c.new_overprovision = get_best_overprovision(sb);
+
c.new_reserved_segments =
(2 * (100 / c.new_overprovision + 1) + 6) *
get_sb(segs_per_sec);
@@ -476,6 +478,11 @@ static void rebuild_checkpoint(struct f2fs_sb_info *sbi,
set_cp(overprov_segment_count, get_cp(overprov_segment_count) +
get_cp(rsvd_segment_count));
+ MSG(0, "Info: Overprovision ratio = %.3lf%%\n", c.new_overprovision);
+ MSG(0, "Info: Overprovision segments = %u (GC reserved = %u)\n",
+ get_cp(overprov_segment_count),
+ c.new_reserved_segments);
+
free_segment_count = get_free_segments(sbi);
new_segment_count = get_newsb(segment_count_main) -
get_sb(segment_count_main);
--
2.32.0
Sorry, I forgot to add the f2fs-dev label. I will send it again later.
On Fri, Jul 23, 2021 at 11:46 AM Chao Liu <[email protected]> wrote:
>
> Make.f2fs supports manually specifying overprovision, and we expect
> resize.f2fs to support it as well.
>
> This change add a new '-o' option to manually specify overprovision.
>
> Signed-off-by: Chao Liu <[email protected]>
> ---
> fsck/main.c | 8 ++++++--
> fsck/resize.c | 9 ++++++++-
> 2 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/fsck/main.c b/fsck/main.c
> index 260ff29..06253e2 100644
> --- a/fsck/main.c
> +++ b/fsck/main.c
> @@ -124,7 +124,8 @@ void resize_usage()
> MSG(0, "[options]:\n");
> MSG(0, " -d debug level [default:0]\n");
> MSG(0, " -i extended node bitmap, node ratio is 20%% by default\n");
> - MSG(0, " -s safe resize (Does not resize metadata)");
> + 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");
> MSG(0, " -V print the version number and exit\n");
> exit(1);
> @@ -529,7 +530,7 @@ void f2fs_parse_options(int argc, char *argv[])
> #endif
> } else if (!strcmp("resize.f2fs", prog)) {
> #ifdef WITH_RESIZE
> - const char *option_string = "d:fst:iV";
> + const char *option_string = "d:fst:io:V";
>
> c.func = RESIZE;
> while ((option = getopt(argc, argv, option_string)) != EOF) {
> @@ -563,6 +564,9 @@ void f2fs_parse_options(int argc, char *argv[])
> case 'i':
> c.large_nat_bitmap = 1;
> break;
> + case 'o':
> + c.new_overprovision = atof(optarg);
> + break;
> case 'V':
> show_version(prog);
> exit(0);
> diff --git a/fsck/resize.c b/fsck/resize.c
> index 78d578e..85a53c5 100644
> --- a/fsck/resize.c
> +++ b/fsck/resize.c
> @@ -146,7 +146,9 @@ safe_resize:
> get_sb(segs_per_sec));
>
> /* Let's determine the best reserved and overprovisioned space */
> - c.new_overprovision = get_best_overprovision(sb);
> + if (c.new_overprovision == 0)
> + c.new_overprovision = get_best_overprovision(sb);
> +
> c.new_reserved_segments =
> (2 * (100 / c.new_overprovision + 1) + 6) *
> get_sb(segs_per_sec);
> @@ -476,6 +478,11 @@ static void rebuild_checkpoint(struct f2fs_sb_info *sbi,
> set_cp(overprov_segment_count, get_cp(overprov_segment_count) +
> get_cp(rsvd_segment_count));
>
> + MSG(0, "Info: Overprovision ratio = %.3lf%%\n", c.new_overprovision);
> + MSG(0, "Info: Overprovision segments = %u (GC reserved = %u)\n",
> + get_cp(overprov_segment_count),
> + c.new_reserved_segments);
> +
> free_segment_count = get_free_segments(sbi);
> new_segment_count = get_newsb(segment_count_main) -
> get_sb(segment_count_main);
> --
> 2.32.0
>