Speed up discard of partially mapped volumes
PATCH 1/1 Speed up discard of partially mapped volumes
A new btree function, dm_btree_lookup_next(), is introduced which is more efficiently able to skip over regions of the thin device which aren't mapped.
--- drivers/md/dm-thin-metadata.c | 66 ++++++++++++++++----------- drivers/md/persistent-data/dm-btree.c | 84 +++++++++++++++++++++++++++++++++++ drivers/md/persistent-data/dm-btree.h | 7 +++ 3 files changed, 132 insertions(+), 25 deletions(-)
drivers/md/dm-thin-metadata.c +41 -25
@@ -1381,6 +1381,19 @@ static bool __snapshotted_since(struct dm_thin_device *td, uint32_t time)return td->snapshotted_time > time; } +static void unpack_lookup_result (struct dm_thin_device *td,__le64 value, +struct dm_thin_lookup_result *result) +{ +uint64_t block_time =0 ; +dm_block_t exception_block; +uint32_t exception_time; + + block_time =le64_to_cpu (value); +unpack_block_time (block_time, &exception_block, &exception_time); + result->block = exception_block; + result->shared =__snapshotted_since (td, exception_time); +} +int dm_thin_find_block (struct dm_thin_device *td,dm_block_t block,int can_issue_io,struct dm_thin_lookup_result *result) {
@@ -1402,23 +1415,36 @@ int dm_thin_find_block(struct dm_thin_device *td, dm_block_t block, info = &pmd->nb_info; r =dm_btree_lookup (info, pmd->root, keys, &value); -if (!r) { -uint64_t block_time =0 ; -dm_block_t exception_block; -uint32_t exception_time; - - block_time =le64_to_cpu (value); -unpack_block_time (block_time, &exception_block, - &exception_time); - result->block = exception_block; - result->shared =__snapshotted_since (td, exception_time); +if (!r) +unpack_lookup_result (td, value, result); + +up_read (&pmd->root_lock); +return r; +} + +static int dm_thin_find_next_mapped_block (struct dm_thin_device *td,dm_block_t block, +dm_block_t *vblock, +struct dm_thin_lookup_result *result) +{ +int r; +__le64 value; +struct dm_pool_metadata *pmd = td->pmd; +dm_block_t keys[2 ] = { td->id, block }; + +down_read (&pmd->root_lock); +if (pmd->fail_io) { +up_read (&pmd->root_lock); +return -EINVAL ; } + r =dm_btree_lookup_next (&pmd->info, pmd->root, keys, vblock, &value); +if (!r) +unpack_lookup_result (td, value, result); +up_read (&pmd->root_lock);return r; } -/* FIXME: write a more efficient one in btree */ int dm_thin_find_mapped_range(struct dm_thin_device *td, dm_block_t begin, dm_block_t end, dm_block_t *thin_begin, dm_block_t *thin_end,
@@ -1431,21 +1457,11 @@ int dm_thin_find_mapped_range(struct dm_thin_device *td,if (end < begin)return -ENODATA ; -/* -* Find first mapped block. -*/ -while (begin < end) { - r =dm_thin_find_block (td, begin, true, &lookup); -if (r) { -if (r != -ENODATA ) -return r; - }else -break ; - - begin++; - } + r =dm_thin_find_next_mapped_block (td, begin, &begin, &lookup); +if (r) +return r; -if (begin == end) +if (begin >= end)return -ENODATA ; *thin_begin = begin;
drivers/md/persistent-data/dm-btree.c +84 -0
96 lines not on this page · raw message
drivers/md/persistent-data/dm-btree.h +7 -0
@@ -110,6 +110,13 @@ int dm_btree_lookup(struct dm_btree_info *info, dm_block_t root, uint64_t *keys, void *value_le);/* +* Tries to find the first key where the bottom level key is >= to that +* given. Useful for skipping empty sections of the btree. +*/ +int dm_btree_lookup_next (struct dm_btree_info *info,dm_block_t root, +uint64_t *keys,uint64_t *rkey,void *value_le); + +/* * Insertion (or overwrite an existing value). O(ln(n)) */ int dm_btree_insert(struct dm_btree_info *info, dm_block_t root,
Signature · 1 line
2.5.0