From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Saranya Muruganandam <saranyamohan@google.com>
Cc: linux-ext4@vger.kernel.org, tytso@mit.edu,
adilger.kernel@dilger.ca, Wang Shilong <wshilong@ddn.com>
Subject: Re: [RFC PATCH v3 31/61] e2fsck: split and merge invalid bitmaps
Date: Thu, 17 Dec 2020 16:05:15 -0800 [thread overview]
Message-ID: <20201218000515.GC6908@magnolia> (raw)
In-Reply-To: <20201118153947.3394530-32-saranyamohan@google.com>
On Wed, Nov 18, 2020 at 07:39:17AM -0800, Saranya Muruganandam wrote:
> From: Wang Shilong <wshilong@ddn.com>
>
> Invalid bitmaps are splitted per thread, and we
> should merge them after thread finish.
For a large filesystem, would it make more sense to merge results
periodically to reduce the peak memory consumption? That might not be
all that high of a peak though since the end merges could be deleting
records from the per-thread data structure after each succesful
insertion merge.
--D
> Signed-off-by: Wang Shilong <wshilong@ddn.com>
> Signed-off-by: Saranya Muruganandam <saranyamohan@google.com>
> ---
> e2fsck/pass1.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 71 insertions(+)
>
> diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
> index 49bdba21..29954e88 100644
> --- a/e2fsck/pass1.c
> +++ b/e2fsck/pass1.c
> @@ -2379,6 +2379,62 @@ out:
> return retval;
> }
>
> +static void e2fsck_pass1_copy_invalid_bitmaps(e2fsck_t global_ctx,
> + e2fsck_t thread_ctx)
> +{
> + dgrp_t i, j;
> + dgrp_t grp_start = thread_ctx->thread_info.et_group_start;
> + dgrp_t grp_end = thread_ctx->thread_info.et_group_end;
> + dgrp_t total = grp_end - grp_start;
> +
> + thread_ctx->invalid_inode_bitmap_flag =
> + e2fsck_allocate_memory(global_ctx, sizeof(int) * total,
> + "invalid_inode_bitmap");
> + thread_ctx->invalid_block_bitmap_flag =
> + e2fsck_allocate_memory(global_ctx, sizeof(int) * total,
> + "invalid_block_bitmap");
> + thread_ctx->invalid_inode_table_flag =
> + e2fsck_allocate_memory(global_ctx, sizeof(int) * total,
> + "invalid_inode_table");
> +
> + memcpy(thread_ctx->invalid_block_bitmap_flag,
> + &global_ctx->invalid_block_bitmap_flag[grp_start],
> + total * sizeof(int));
> + memcpy(thread_ctx->invalid_inode_bitmap_flag,
> + &global_ctx->invalid_inode_bitmap_flag[grp_start],
> + total * sizeof(int));
> + memcpy(thread_ctx->invalid_inode_table_flag,
> + &global_ctx->invalid_inode_table_flag[grp_start],
> + total * sizeof(int));
> +
> + thread_ctx->invalid_bitmaps = 0;
> + for (i = grp_start, j = 0; i < grp_end; i++, j++) {
> + if (thread_ctx->invalid_block_bitmap_flag[j])
> + thread_ctx->invalid_bitmaps++;
> + if (thread_ctx->invalid_inode_bitmap_flag[j])
> + thread_ctx->invalid_bitmaps++;
> + if (thread_ctx->invalid_inode_table_flag[j])
> + thread_ctx->invalid_bitmaps++;
> + }
> +}
> +
> +static void e2fsck_pass1_merge_invalid_bitmaps(e2fsck_t global_ctx,
> + e2fsck_t thread_ctx)
> +{
> + dgrp_t i, j;
> + dgrp_t grp_start = thread_ctx->thread_info.et_group_start;
> + dgrp_t grp_end = thread_ctx->thread_info.et_group_end;
> + dgrp_t total = grp_end - grp_start;
> +
> + memcpy(&global_ctx->invalid_block_bitmap_flag[grp_start],
> + thread_ctx->invalid_block_bitmap_flag, total * sizeof(int));
> + memcpy(&global_ctx->invalid_inode_bitmap_flag[grp_start],
> + thread_ctx->invalid_inode_bitmap_flag, total * sizeof(int));
> + memcpy(&global_ctx->invalid_inode_table_flag[grp_start],
> + thread_ctx->invalid_inode_table_flag, total * sizeof(int));
> + global_ctx->invalid_bitmaps += thread_ctx->invalid_bitmaps;
> +}
> +
> static errcode_t e2fsck_pass1_thread_prepare(e2fsck_t global_ctx, e2fsck_t *thread_ctx,
> int thread_index, int num_threads)
> {
> @@ -2455,6 +2511,7 @@ static errcode_t e2fsck_pass1_thread_prepare(e2fsck_t global_ctx, e2fsck_t *thre
> goto out_fs;
> }
> *thread_ctx = thread_context;
> + e2fsck_pass1_copy_invalid_bitmaps(global_ctx, thread_context);
> return 0;
> out_fs:
> ext2fs_free_mem(&thread_fs);
> @@ -2589,6 +2646,10 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx
> ext2_ino_t dx_dir_info_count = global_ctx->dx_dir_info_count;
> ext2_u32_list dirs_to_hash = global_ctx->dirs_to_hash;
> quota_ctx_t qctx = global_ctx->qctx;
> + int *invalid_block_bitmap_flag = global_ctx->invalid_block_bitmap_flag;
> + int *invalid_inode_bitmap_flag = global_ctx->invalid_inode_bitmap_flag;
> + int *invalid_inode_table_flag = global_ctx->invalid_inode_table_flag;
> + int invalid_bitmaps = global_ctx->invalid_bitmaps;
>
> #ifdef HAVE_SETJMP_H
> jmp_buf old_jmp;
> @@ -2667,6 +2728,11 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx
> thread_ctx->qctx);
> if (retval)
> return retval;
> + global_ctx->invalid_block_bitmap_flag = invalid_block_bitmap_flag;
> + global_ctx->invalid_inode_bitmap_flag = invalid_inode_bitmap_flag;
> + global_ctx->invalid_inode_table_flag = invalid_inode_table_flag;
> + global_ctx->invalid_bitmaps = invalid_bitmaps;
> + e2fsck_pass1_merge_invalid_bitmaps(global_ctx, thread_ctx);
>
> retval = e2fsck_pass1_merge_bitmap(global_fs,
> &thread_ctx->inode_used_map,
> @@ -2739,6 +2805,9 @@ static int e2fsck_pass1_thread_join(e2fsck_t global_ctx, e2fsck_t thread_ctx)
> if (thread_ctx->dirs_to_hash)
> ext2fs_badblocks_list_free(thread_ctx->dirs_to_hash);
> quota_release_context(&thread_ctx->qctx);
> + ext2fs_free_mem(&thread_ctx->invalid_block_bitmap_flag);
> + ext2fs_free_mem(&thread_ctx->invalid_inode_bitmap_flag);
> + ext2fs_free_mem(&thread_ctx->invalid_inode_table_flag);
> ext2fs_free_mem(&thread_ctx);
>
> return retval;
> @@ -2752,6 +2821,8 @@ static int e2fsck_pass1_threads_join(struct e2fsck_thread_info *infos,
> int i;
> struct e2fsck_thread_info *pinfo;
>
> + /* merge invalid bitmaps will recalculate it */
> + global_ctx->invalid_bitmaps = 0;
> for (i = 0; i < num_threads; i++) {
> pinfo = &infos[i];
>
> --
> 2.29.2.299.gdc1121823c-goog
>
next prev parent reply other threads:[~2020-12-18 0:08 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 15:38 [RFC PATCH v3 00/61] Introduce parallel fsck to e2fsck pass1 Saranya Muruganandam
2020-11-18 15:38 ` [RFC PATCH v3 01/61] e2fsck: add -m option for multithread Saranya Muruganandam
2020-11-23 19:53 ` harshad shirwadkar
2020-11-23 21:28 ` Theodore Y. Ts'o
2020-11-18 15:38 ` [RFC PATCH v3 02/61] e2fsck: copy context when using multi-thread fsck Saranya Muruganandam
2020-11-23 19:55 ` harshad shirwadkar
2020-11-23 21:38 ` Theodore Y. Ts'o
2020-12-17 23:56 ` Darrick J. Wong
2020-12-18 1:13 ` Wang Shilong
2020-12-18 1:27 ` Darrick J. Wong
2020-11-18 15:38 ` [RFC PATCH v3 03/61] e2fsck: copy fs " Saranya Muruganandam
2020-11-23 22:12 ` Theodore Y. Ts'o
2020-11-18 15:38 ` [RFC PATCH v3 04/61] e2fsck: clear icache " Saranya Muruganandam
2020-11-23 22:27 ` Theodore Y. Ts'o
2020-11-18 15:38 ` [RFC PATCH v3 05/61] e2fsck: add assert when copying context Saranya Muruganandam
2020-11-18 15:38 ` [RFC PATCH v3 06/61] e2fsck: copy bitmaps " Saranya Muruganandam
2020-11-18 15:38 ` [RFC PATCH v3 07/61] e2fsck: copy badblocks when copying fs Saranya Muruganandam
2020-11-18 15:38 ` [RFC PATCH v3 08/61] e2fsck: open io-channel " Saranya Muruganandam
2020-11-23 22:38 ` Theodore Y. Ts'o
2020-11-24 14:17 ` Theodore Y. Ts'o
2020-11-18 15:38 ` [RFC PATCH v3 09/61] e2fsck: create logs for mult-threads Saranya Muruganandam
2020-11-23 23:05 ` Theodore Y. Ts'o
2020-11-18 15:38 ` [RFC PATCH v3 10/61] e2fsck: optionally configure one pfsck thread Saranya Muruganandam
2020-11-23 23:16 ` Theodore Y. Ts'o
2020-11-18 15:38 ` [RFC PATCH v3 11/61] e2fsck: add start/end group for thread Saranya Muruganandam
2020-11-18 15:38 ` [RFC PATCH v3 12/61] e2fsck: split groups to different threads Saranya Muruganandam
2020-11-18 15:38 ` [RFC PATCH v3 13/61] e2fsck: print thread log properly Saranya Muruganandam
2020-11-23 23:40 ` Theodore Y. Ts'o
2020-11-18 15:39 ` [RFC PATCH v3 14/61] e2fsck: merge bitmaps after thread completes Saranya Muruganandam
2020-11-24 2:00 ` Theodore Y. Ts'o
2020-11-18 15:39 ` [RFC PATCH v3 15/61] e2fsck: do not change global variables Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 16/61] e2fsck: optimize the inserting of dir_info_db Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 17/61] e2fsck: merge dir_info after thread finishes Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 18/61] e2fsck: rbtree bitmap for dir Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 19/61] e2fsck: merge badblocks after thread finishes Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 20/61] e2fsck: merge icounts " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 21/61] e2fsck: merge dblist " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 22/61] e2fsck: add debug codes for multiple threads Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 23/61] e2fsck: merge counts after threads finish Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 24/61] e2fsck: merge fs flags when " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 25/61] e2fsck: merge dx_dir_info after " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 26/61] e2fsck: merge dirs_to_hash when " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 27/61] e2fsck: merge context flags properly Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 28/61] e2fsck: merge quota context after threads finish Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 29/61] e2fsck: serialize fix operations Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 30/61] e2fsck: move some fixes out of parallel pthreads Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 31/61] e2fsck: split and merge invalid bitmaps Saranya Muruganandam
2020-12-18 0:05 ` Darrick J. Wong [this message]
2020-12-18 1:19 ` Wang Shilong
2020-11-18 15:39 ` [RFC PATCH v3 32/61] e2fsck: merge EA blocks properly Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 33/61] e2fsck: kickoff mutex lock for block found map Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 34/61] e2fsck: allow admin specify number of threads Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 35/61] e2fsck: adjust " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 36/61] e2fsck: fix readahead for pfsck of pass1 Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 37/61] e2fsck: merge options after threads finish Saranya Muruganandam
2020-12-17 23:30 ` Darrick J. Wong
2020-11-18 15:39 ` [RFC PATCH v3 38/61] e2fsck: reset lost_and_found " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 39/61] e2fsck: merge extent depth count " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 40/61] e2fsck: simplify e2fsck context merging codes Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 41/61] e2fsck: set E2F_FLAG_ALLOC_OK after threads Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 42/61] e2fsck: wait fix thread finish before checking Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 43/61] e2fsck: cleanup e2fsck_pass1_thread_join() Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 44/61] e2fsck: avoid too much memory allocation for pfsck Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 45/61] e2fsck: make default smallest RA size to 1M Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 46/61] ext2fs: parallel bitmap loading Saranya Muruganandam
2020-11-24 2:44 ` Theodore Y. Ts'o
2020-11-18 15:39 ` [RFC PATCH v3 47/61] e2fsck: update mmp block in one thread Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 48/61] e2fsck: reset @inodes_to_rebuild if restart Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 49/61] e2fsck: fix build for make rpm Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 50/61] e2fsck: move ext2fs_get_avg_group to rw_bitmaps.c Saranya Muruganandam
2020-11-24 2:12 ` Theodore Y. Ts'o
2020-11-18 15:39 ` [RFC PATCH v3 51/61] configure: enable pfsck by default Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 53/61] e2fsck: fix f_multithread_ok test Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 54/61] e2fsck: fix race in ext2fs_read_bitmaps() Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 55/61] e2fsck: fix readahead for pass1 without pfsck Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 56/61] e2fsck: fix memory leaks with pfsck enabled Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 57/61] ext2fs: fix to set tail flags " Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 58/61] e2fsck: misc cleanups for pfsck Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 59/61] e2fsck: update mmp block race Saranya Muruganandam
2020-11-18 15:39 ` [RFC PATCH v3 60/61] e2fsck: propagate number of threads Saranya Muruganandam
2020-11-24 3:56 ` Theodore Y. Ts'o
2020-11-18 15:39 ` [RFC PATCH v3 61/61] e2fsck: Annotating fields in e2fsck_struct Saranya Muruganandam
2020-11-19 15:58 ` [RFC PATCH v3 00/61] Introduce parallel fsck to e2fsck pass1 Theodore Y. Ts'o
2020-11-23 21:25 ` Theodore Y. Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201218000515.GC6908@magnolia \
--to=darrick.wong@oracle.com \
--cc=adilger.kernel@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=saranyamohan@google.com \
--cc=tytso@mit.edu \
--cc=wshilong@ddn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).