From: Chunguang Xu <brookxu.cn@gmail.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca
Cc: linux-ext4@vger.kernel.org
Subject: [PATCH 6/8] ext4: add a helper function to validate metadata block
Date: Wed, 21 Oct 2020 17:15:26 +0800 [thread overview]
Message-ID: <1603271728-7198-6-git-send-email-brookxu@tencent.com> (raw)
In-Reply-To: <1603271728-7198-1-git-send-email-brookxu@tencent.com>
From: Chunguang Xu <brookxu@tencent.com>
There is a need to check whether a block or a segment overlaps
with metadata, since information of system_zone is incomplete,
we need a more accurate function. Now we check whether it
overlaps with block bitmap, inode bitmap, and inode table.
Perhaps it is better to add a check of super_block and block
group descriptor and provide a helper function.
Signed-off-by: Chunguang Xu <brookxu@tencent.com>
---
fs/ext4/ext4.h | 5 ++++-
fs/ext4/mballoc.c | 57 +++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index e7344ef..d3ff7d9 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2784,7 +2784,10 @@ extern ext4_group_t ext4_mb_prefetch(struct super_block *sb,
unsigned int nr, int *cnt);
extern void ext4_mb_prefetch_fini(struct super_block *sb, ext4_group_t group,
unsigned int nr);
-
+extern int ext4_metadata_block_overlaps(struct super_block *sb,
+ ext4_group_t block_group,
+ ext4_fsblk_t block,
+ unsigned long count);
extern void ext4_free_blocks(handle_t *handle, struct inode *inode,
struct buffer_head *bh, ext4_fsblk_t block,
unsigned long count, int flags);
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 2efb489..2b1bc6c 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -5061,6 +5061,49 @@ static void ext4_try_merge_freed_extent(struct ext4_sb_info *sbi,
kmem_cache_free(ext4_free_data_cachep, entry);
}
+/*
+ * Returns 1 if the passed-in block region (block, block+count)
+ * overlaps with some other filesystem metadata blocks. Others,
+ * return 0.
+ */
+int ext4_metadata_block_overlaps(struct super_block *sb,
+ ext4_group_t block_group,
+ ext4_fsblk_t block,
+ unsigned long count)
+{
+ struct ext4_sb_info *sbi = EXT4_SB(sb);
+ struct ext4_group_desc *gdp;
+ int gd_first = ext4_group_first_block_no(sb, block_group);
+ int itable, gd_blk;
+ int ret = 0;
+
+ gdp = ext4_get_group_desc(sb, block_group, NULL);
+ // check block bitmap and inode bitmap
+ if (in_range(ext4_block_bitmap(sb, gdp), block, count) ||
+ in_range(ext4_inode_bitmap(sb, gdp), block, count))
+ ret = 1;
+
+ // check inode table
+ itable = ext4_inode_table(sb, gdp);
+ if (!(block >= itable + sbi->s_itb_per_group ||
+ block + count - 1 < itable))
+ ret = 1;
+
+ /* check super_block and block group descriptor table, the
+ * reserved space of the block group descriptor is managed
+ * by resize_inode, it may not be processed now due to
+ * performance.
+ */
+ gd_blk = ext4_bg_has_super(sb, block_group) +
+ ext4_bg_num_gdb(sb, block_group);
+ if (gd_blk) {
+ if (!(block >= gd_first + gd_blk ||
+ block + count - 1 < gd_first))
+ ret = 1;
+ }
+ return ret;
+}
+
static noinline_for_stack int
ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,
struct ext4_free_data *new_entry)
@@ -5360,13 +5403,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
goto error_return;
}
- if (in_range(ext4_block_bitmap(sb, gdp), block, count) ||
- in_range(ext4_inode_bitmap(sb, gdp), block, count) ||
- in_range(block, ext4_inode_table(sb, gdp),
- sbi->s_itb_per_group) ||
- in_range(block + count - 1, ext4_inode_table(sb, gdp),
- sbi->s_itb_per_group)) {
-
+ if (ext4_metadata_block_overlaps(sb, block_group, block, count)) {
ext4_error(sb, "Freeing blocks in system zone - "
"Block = %llu, count = %lu", block, count);
/* err = 0. ext4_std_error should be a no op */
@@ -5552,11 +5589,7 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
goto error_return;
}
- if (in_range(ext4_block_bitmap(sb, desc), block, count) ||
- in_range(ext4_inode_bitmap(sb, desc), block, count) ||
- in_range(block, ext4_inode_table(sb, desc), sbi->s_itb_per_group) ||
- in_range(block + count - 1, ext4_inode_table(sb, desc),
- sbi->s_itb_per_group)) {
+ if (ext4_metadata_block_overlaps(sb, block_group, block, count)) {
ext4_error(sb, "Adding blocks in system zones - "
"Block = %llu, count = %lu",
block, count);
--
1.8.3.1
next prev parent reply other threads:[~2020-10-21 9:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 9:15 [PATCH 1/8] ext4: use ext4_assert() to replace J_ASSERT() Chunguang Xu
2020-10-21 9:15 ` [PATCH 2/8] ext4: remove redundant mb_regenerate_buddy() Chunguang Xu
2020-10-23 22:58 ` Andreas Dilger
2020-10-21 9:15 ` [PATCH 3/8] ext4: simplify the code of mb_find_order_for_block Chunguang Xu
2020-10-23 23:07 ` Andreas Dilger
2020-10-21 9:15 ` [PATCH 4/8] ext4: add the gdt block of meta_bg to system_zone Chunguang Xu
2020-10-21 9:15 ` [PATCH 5/8] ext4: update ext4_data_block_valid related comments Chunguang Xu
2020-10-23 23:09 ` Andreas Dilger
2020-10-21 9:15 ` Chunguang Xu [this message]
2020-10-21 9:15 ` [PATCH 7/8] ext4: delete invalid code inside ext4_xattr_block_set() Chunguang Xu
2020-10-23 23:10 ` Andreas Dilger
2020-10-21 9:15 ` [PATCH 8/8] ext4: fix a memory leak of ext4_free_data Chunguang Xu
2020-11-07 15:58 [PATCH RESEND 1/8] ext4: use ext4_assert() to replace J_ASSERT() Chunguang Xu
2020-11-07 15:58 ` [PATCH 6/8] ext4: add a helper function to validate metadata block Chunguang Xu
2020-12-09 4:55 ` Theodore Y. Ts'o
2020-12-09 12:12 ` brookxu
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=1603271728-7198-6-git-send-email-brookxu@tencent.com \
--to=brookxu.cn@gmail.com \
--cc=adilger.kernel@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/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).