LVM: agk allocation changes
PATCH 1/1 LVM: agk allocation changes
Patch name: lvm-agk-allocation-changes.patch
agk's allocation changes.
I'm running into some memory corruption. I think I've found where it is but I haven't pinned down how to fix it.
1) In '_allocate', I think areas_size needs to be based on the max of 'dm_list_size(pvms)' and 'ah->area_count + ah->log_area_count'; otherwise, _find_parallel_space won't have enough space to put its findings.
2) If you try 'lvcreate -m1 -L 500M -n lv vg --alloc anywhere' on two devices, you will corrupt memory. This is because there seems to be no way to get out of the loop in _find_parallel_space when retry_pv is called. 'ix' continues to increase and memory is written to beyond the bounds allowed in 'areas' until pva->remaining reaches zero.
lib/metadata/lv_manip.c +22 -2
@@ -985,6 +985,13 @@ static int _check_contiguous(struct cmd_return 1 ; } +/* FIXME In future if this function is called multiple times with +* ALLOC_ANYWHERE after aborted allocation attempts, pv maps will need +* re-sorting. +* Walk all pv_areas and if remaining != count, set remaining = +* count and reinsert_reduced_pv_area. +*/ +/* * Choose sets of parallel areas to use, respecting any constraints. */
@@ -1005,6 +1012,7 @@ static int _find_parallel_space(struct aunsigned too_small_for_log_count;/* How many too small for log? */ uint32_t max_parallel;/* Maximum extents to allocate */ uint32_t next_le; +uint32_t required;/* Extents we're trying to obtain from this area */ struct seg_pvs *spvs;struct dm_list *parallel_pvs;uint32_t free_pes;
@@ -1089,6 +1097,7 @@ static int _find_parallel_space(struct a already_found_one =0 ;/* First area in each list is the largest */ + retry_pv: dm_list_iterate_items(pva, &pvm->areas) {if (contiguous) { if (prev_lvseg &&
@@ -1114,7 +1123,7 @@ static int _find_parallel_space(struct a }/* Is it big enough on its own? */ - if (pva->count * ah->area_multiple < + if (pva->remaining * ah->area_multiple < max_parallel - *allocated && ((!can_split && !ah->log_area_count) || (already_found_one &&
@@ -1128,6 +1137,18 @@ static int _find_parallel_space(struct a } areas[ix + ix_offset -1 ] = pva; + +/* Update amount remaining - effectively splitting an area into two or more parts */ +if (alloc ==ALLOC_ANYWHERE ) { + required = (max_parallel - *allocated) / ah->area_multiple; +if (required >= pva->remaining) + pva->remaining =0 ; +else { + pva->remaining -= required; +reinsert_reduced_pv_area (pva); + goto retry_pv; + } + } } next_pv:if (ix >= areas_size)
@@ -1169,7 +1190,6 @@ static int _find_parallel_space(struct aif (ix + ix_offset < ah->area_count + (log_needs_allocating ? ah->log_area_count + too_small_for_log_count :0 )) -/* FIXME With ALLOC_ANYWHERE, need to split areas */ break ; if (!_alloc_parallel_area(ah, max_parallel, areas, allocated,
lib/metadata/pv_map.c +25 -8
@@ -24,19 +24,25 @@* * FIXME Cope with overlap. */ -static void _insert_area (struct dm_list *head,struct pv_area *a) +static void _insert_area (struct dm_list *head,struct pv_area *a,unsigned reduced) {struct pv_area *pva; +uint32_t count = reduced ? a->remaining : a->count; - dm_list_iterate_items(pva, head) { -if (a->count > pva->count) + dm_list_iterate_items(pva, head) +if (count > pva->count)break ; - }dm_list_add (&pva->list, &a->list); a->map->pe_count += a->count; } +static void _remove_area (struct pv_area *a) +{ +dm_list_del (&a->list); + a->map->pe_count -= a->count; +} +static int _create_single_area (struct dm_pool *mem,struct pv_map *pvm,uint32_t start,uint32_t length) {
@@ -50,7 +56,8 @@ static int _create_single_area(struct dm pva->map = pvm; pva->start = start; pva->count = length; -_insert_area (&pvm->areas, pva); + pva->remaining = pva->count; +_insert_area (&pvm->areas, pva,0 );return 1 ; }
@@ -184,8 +191,7 @@ struct dm_list *create_pv_maps(struct dmvoid consume_pv_area (struct pv_area *pva,uint32_t to_go) { -dm_list_del (&pva->list); - pva->map->pe_count -= pva->count; +_remove_area (pva);assert (to_go <= pva->count);
@@ -193,10 +199,21 @@ void consume_pv_area(struct pv_area *pva/* split the area */ pva->start += to_go; pva->count -= to_go; -_insert_area (&pva->map->areas, pva); + pva->remaining = pva->count; +_insert_area (&pva->map->areas, pva,0 ); } } +/* +* Remove an area from list and reinsert it based on its new smaller size +* after a provisional allocation. +*/ +void reinsert_reduced_pv_area (struct pv_area *pva) +{ +_remove_area (pva); +_insert_area (&pva->map->areas, pva,1 ); +} +uint32_t pv_maps_size (struct dm_list *pvms) {struct pv_map *pvm;
lib/metadata/pv_map.h +3 -0
@@ -31,6 +31,8 @@ struct pv_area {uint32_t start;uint32_t count; +uint32_t remaining;/* Number of extents remaining unallocated */ +struct dm_list list;/* pv_map.areas */ };
@@ -49,6 +51,7 @@ struct dm_list *create_pv_maps(struct dm struct dm_list *allocatable_pvs);void consume_pv_area (struct pv_area *area,uint32_t to_go); +void reinsert_reduced_pv_area (struct pv_area *pva);uint32_t pv_maps_size (struct dm_list *pvms);
PATCH 1/1 LVM: agk allocation changes
Quoted 2 lines · Jon Brassow
Patch name: lvm-agk-allocation-changes.patch
agk's allocation changes.
You deleted the part of the header that said this is an example patch that has only passed one very basic test - that's why I didn't give it wider circulation. People are better off testing the patch series without this patch yet.
Alasdair
PATCH 1/1 LVM: agk allocation changes
Quoted 8 lines · Alasdair G Kergon
Quoted 2 lines · Jon Brassow
Patch name: lvm-agk-allocation-changes.patch
agk's allocation changes.You deleted the part of the header that said this is an example patch that has only passed one very basic test - that's why I didn't give it wider circulation. People are better off testing the patch series without this patch yet.
Yes. I also didn't explicitly mention that the patch was preliminary
- mea culpa.
Still, people can test these patches as long as they don't stress the '--alloc anywhere' cases.
brassow
PATCH 1/1 LVM: agk allocation changes
Quoted 2 lines · Jon Brassow
Still, people can test these patches as long as they don't stress the '--alloc anywhere' cases.
Latest version of this patch. Still not properly unit tested.
Alasdair
Index: lib/metadata/lv_manip.c
===================================================================
RCS file: /cvs/lvm2/LVM2/lib/metadata/lv_manip.c,v retrieving revision 1.212
metadata/lv_manip.c +34 -3
@@ -985,6 +985,13 @@ static int _check_contiguous(struct cmd_return 1 ; } +/* FIXME In future if this function is called multiple times with +* ALLOC_ANYWHERE after aborted allocation attempts, pv maps will need +* re-sorting. +* Walk all pv_areas and if remaining != count, set remaining = +* count and reinsert_reduced_pv_area. +*/ +/* * Choose sets of parallel areas to use, respecting any constraints. */
@@ -999,12 +1006,13 @@ static int _find_parallel_space(struct astruct pv_list *pvl;unsigned already_found_one =0 ;unsigned contiguous =0 , cling =0 , preferred_count =0 ; -unsigned ix; +unsigned ix, last_ix;unsigned ix_offset =0 ;/* Offset for non-preferred allocations */ unsigned ix_log_offset;/* Offset to start of areas to use for log */ unsigned too_small_for_log_count;/* How many too small for log? */ uint32_t max_parallel;/* Maximum extents to allocate */ uint32_t next_le; +uint32_t required;/* Extents we're trying to obtain from this area */ struct seg_pvs *spvs;struct dm_list *parallel_pvs;uint32_t free_pes;
@@ -1062,6 +1070,9 @@ static int _find_parallel_space(struct a } } +do { + /* Safety check to detect when ALLOC_ANYWHERE made no further progress. */ + last_ix = ix; /* * Put the smallest area of each PV that is at least the * size we need into areas array. If there isn't one
@@ -1089,6 +1100,7 @@ static int _find_parallel_space(struct a already_found_one =0 ;/* First area in each list is the largest */ +// retry_pv: dm_list_iterate_items(pva, &pvm->areas) {if (contiguous) { if (prev_lvseg &&
@@ -1114,13 +1126,17 @@ static int _find_parallel_space(struct a }/* Is it big enough on its own? */ -if (pva->count * ah->area_multiple < +if (pva->remaining * ah->area_multiple < max_parallel - *allocated && ((!can_split && !ah->log_area_count) || (already_found_one && !(alloc ==ALLOC_ANYWHERE )))) goto next_pv; +/* +* Except with ALLOC_ANYWHERE, replace first area with this +* one which is smaller but still big enough. +*/ if (!already_found_one || alloc ==ALLOC_ANYWHERE ) { ix++;
@@ -1133,11 +1149,27 @@ static int _find_parallel_space(struct a *areas_ptr =dm_realloc (*areas_ptr,sizeof (**areas_ptr) * (*areas_size_ptr)); } (*areas_ptr)[ix + ix_offset -1 ] = pva; + +/* Update amount remaining - effectively splitting an area into two or more parts */ +if (alloc ==ALLOC_ANYWHERE ) { + required = (max_parallel - *allocated) / ah->area_multiple; +if (required >= pva->remaining) + pva->remaining =0 ; +else { + pva->remaining -= required; +reinsert_reduced_pv_area (pva); +// ALLOC_ANYWHERE alternative: don't retry the PV. +// At the end of this loop, we have one area per PV. If we haven't enough, repeat the whole loop (all PVs) taking the next largest from each. +// goto retry_pv; TEMP REMOVAL + } + } } next_pv:if (ix >= *areas_size_ptr)break ; } +}while (ix < *areas_size_ptr && alloc ==ALLOC_ANYWHERE && last_ix != ix); +if ((contiguous || cling) && (preferred_count < ix_offset))break ;
@@ -1174,7 +1206,6 @@ static int _find_parallel_space(struct aif (ix + ix_offset < ah->area_count + (log_needs_allocating ? ah->log_area_count + too_small_for_log_count :0 )) -/* FIXME With ALLOC_ANYWHERE, need to split areas */ break ; if (!_alloc_parallel_area(ah, max_parallel, *areas_ptr, allocated,
Index: lib/metadata/pv_map.c
===================================================================
RCS file: /cvs/lvm2/LVM2/lib/metadata/pv_map.c,v
retrieving revision 1.35
metadata/pv_map.c +26 -9
@@ -24,19 +24,25 @@* * FIXME Cope with overlap. */ -static void _insert_area (struct dm_list *head,struct pv_area *a) +static void _insert_area (struct dm_list *head,struct pv_area *a,unsigned reduced) {struct pv_area *pva; - - dm_list_iterate_items(pva, head) { -if (a->count > pva->count) +uint32_t count = reduced ? a->remaining : a->count; + + dm_list_iterate_items(pva, head) +if (count > pva->count)break ; - }dm_list_add (&pva->list, &a->list); a->map->pe_count += a->count; } +static void _remove_area (struct pv_area *a) +{ +dm_list_del (&a->list); + a->map->pe_count -= a->count; +} +static int _create_single_area (struct dm_pool *mem,struct pv_map *pvm,uint32_t start,uint32_t length) {
@@ -50,7 +56,8 @@ static int _create_single_area(struct dm pva->map = pvm; pva->start = start; pva->count = length; -_insert_area (&pvm->areas, pva); + pva->remaining = pva->count; +_insert_area (&pvm->areas, pva,0 );return 1 ; }
@@ -184,8 +191,7 @@ struct dm_list *create_pv_maps(struct dmvoid consume_pv_area (struct pv_area *pva,uint32_t to_go) { -dm_list_del (&pva->list); - pva->map->pe_count -= pva->count; +_remove_area (pva);assert (to_go <= pva->count);
@@ -193,10 +199,21 @@ void consume_pv_area(struct pv_area *pva/* split the area */ pva->start += to_go; pva->count -= to_go; -_insert_area (&pva->map->areas, pva); + pva->remaining = pva->count; +_insert_area (&pva->map->areas, pva,0 ); } } +/* +* Remove an area from list and reinsert it based on its new smaller size +* after a provisional allocation. +*/ +void reinsert_reduced_pv_area (struct pv_area *pva) +{ +_remove_area (pva); +_insert_area (&pva->map->areas, pva,1 ); +} +uint32_t pv_maps_size (struct dm_list *pvms) {struct pv_map *pvm;
Index: lib/metadata/pv_map.h
===================================================================
RCS file: /cvs/lvm2/LVM2/lib/metadata/pv_map.h,v
retrieving revision 1.10
metadata/pv_map.h +3 -0
@@ -31,6 +31,8 @@ struct pv_area {uint32_t start;uint32_t count; +uint32_t remaining;/* Number of extents remaining unallocated during allocation number alloc_seqno */ +struct dm_list list;/* pv_map.areas */ };
@@ -49,6 +51,7 @@ struct dm_list *create_pv_maps(struct dm struct dm_list *allocatable_pvs);void consume_pv_area (struct pv_area *area,uint32_t to_go); +void reinsert_reduced_pv_area (struct pv_area *pva);uint32_t pv_maps_size (struct dm_list *pvms);