From be0bf43d742a127435962d7075608519f18d4cdc Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Mon, 1 Feb 2021 10:24:19 +0100 Subject: [PATCH] allocation: report allocation error instead of crash Current allocation limitation requires to fit metadata/log LV on a single PV. This is usually not a big problem, but since thin-pool and cache-pool is using this for allocating extents for their metadata LVs it might be eventually causing errors where the remaining free spaces for large metadata size is spread over several PV. --- lib/metadata/lv_manip.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 093cea464..c82038269 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -2109,15 +2109,18 @@ static int _alloc_parallel_area(struct alloc_handle *ah, uint32_t max_to_allocat aa[smeta].pv = pva->map->pv; aa[smeta].pe = pva->start; aa[smeta].len = ah->log_len; - + if (aa[smeta].len > pva->count) { + log_error("Metadata does not fit on a single PV."); + return 0; + } log_debug_alloc("Allocating parallel metadata area %" PRIu32 " on %s start PE %" PRIu32 " length %" PRIu32 ".", (smeta - (ah->area_count + ah->parity_count)), pv_dev_name(aa[smeta].pv), aa[smeta].pe, - ah->log_len); + aa[smeta].len); - consume_pv_area(pva, ah->log_len); + consume_pv_area(pva, aa[smeta].len); dm_list_add(&ah->alloced_areas[smeta], &aa[smeta].list); } aa[s].len = (ah->alloc_and_split_meta && !ah->split_metadata_is_allocated) ? len - ah->log_len : len; -- 2.43.5