From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>, Anand Jain <anand.jain@oracle.com>
Subject: [PATCH v2 1/2] btrfs: Don't search devid for every verify_one_dev_extent() call
Date: Sat, 9 Feb 2019 13:24:36 +0800 [thread overview]
Message-ID: <20190209052437.24020-2-wqu@suse.com> (raw)
In-Reply-To: <20190209052437.24020-1-wqu@suse.com>
verify_one_dev_extent() will call btrfs_find_device() for each dev
extent, this waste some CPU time just searching the devices list.
Move the search one level up, into the btrfs_verify_dev_extents(), so
for each device we only call btrfs_find_device() once.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/volumes.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 03f223aa7194..bae03111273e 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -7772,13 +7772,14 @@ static u64 calc_stripe_length(u64 type, u64 chunk_len, int num_stripes)
}
static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,
- u64 chunk_offset, u64 devid,
- u64 physical_offset, u64 physical_len)
+ struct btrfs_device *dev,
+ u64 chunk_offset, u64 physical_offset,
+ u64 physical_len)
{
struct extent_map_tree *em_tree = &fs_info->mapping_tree.map_tree;
struct extent_map *em;
struct map_lookup *map;
- struct btrfs_device *dev;
+ u64 devid = dev->devid;
u64 stripe_len;
bool found = false;
int ret = 0;
@@ -7830,15 +7831,8 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,
}
/* Make sure no dev extent is beyond device bondary */
- dev = btrfs_find_device(fs_info->fs_devices, devid, NULL, NULL, true);
- if (!dev) {
- btrfs_err(fs_info, "failed to find devid %llu", devid);
- ret = -EUCLEAN;
- goto out;
- }
-
- /* It's possible this device is a dummy for seed device */
if (dev->disk_total_bytes == 0) {
+ /* This device is a dummy for seed device */
dev = btrfs_find_device(fs_info->fs_devices->seed, devid, NULL,
NULL, false);
if (!dev) {
@@ -7898,6 +7892,7 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)
{
struct btrfs_path *path;
struct btrfs_root *root = fs_info->dev_root;
+ struct btrfs_device *device = NULL;
struct btrfs_key key;
u64 prev_devid = 0;
u64 prev_dev_ext_end = 0;
@@ -7941,6 +7936,17 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)
devid = key.objectid;
physical_offset = key.offset;
+ if (!device || devid != device->devid) {
+ device = btrfs_find_device(fs_info->fs_devices, devid,
+ NULL, NULL, true);
+ if (!device) {
+ btrfs_err(fs_info, "failed to find devid %llu",
+ devid);
+ ret = -EUCLEAN;
+ goto out;
+ }
+ }
+
dext = btrfs_item_ptr(leaf, slot, struct btrfs_dev_extent);
chunk_offset = btrfs_dev_extent_chunk_offset(leaf, dext);
physical_len = btrfs_dev_extent_length(leaf, dext);
@@ -7954,7 +7960,7 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)
goto out;
}
- ret = verify_one_dev_extent(fs_info, chunk_offset, devid,
+ ret = verify_one_dev_extent(fs_info, device, chunk_offset,
physical_offset, physical_len);
if (ret < 0)
goto out;
--
2.20.1
next prev parent reply other threads:[~2019-02-09 5:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-09 5:24 [PATCH v2 0/2] btrfs: Speedup chunk allocation for large fs Qu Wenruo
2019-02-09 5:24 ` Qu Wenruo [this message]
2019-02-09 5:24 ` [PATCH v2 2/2] btrfs: Introduce free dev extent hint to speed up chunk allocation Qu Wenruo
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=20190209052437.24020-2-wqu@suse.com \
--to=wqu@suse.com \
--cc=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.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