Fix PV datalign when for values starts prior to MDA area
PATCH 1/1 Fix PV datalign when for values starts prior to MDA area
Fix PV datalign when for values starts prior to MDA area.
The dataalign value must always be aligned according to MDA area.
The currect code checks if calculated value collides with MDA area but not if the value is so small that it is located before MDA starts.
Unfortunately there can be also MDA in the end of the device.
The patch adds simple check to avoid this miscalculation. Patch expects that first MDA always starts on <=8 sector (this is true for all allowed label sector parameters).
(Similar patch was somehow lost during datalign patch review...)
--- lib/format_text/format-text.c | 4 +++- lib/metadata/metadata.h | 1 + test/t-pvcreate-usage.sh | 3 +++ 3 files changed, 7 insertions(+), 1 deletions(-)
lib/format_text/format-text.c +3 -1
@@ -1372,7 +1372,9 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume dm_list_iterate_items(mda, &info->mdas) { mdac = (struct mda_context *) mda->metadata_locn;if (pv->dev == mdac->area.dev && - (mdac->area.start <= (pv->pe_start <<SECTOR_SHIFT )) && + ((mdac->area.start <= (pv->pe_start <<SECTOR_SHIFT )) || + (mdac->area.start <= (PV_MIN_ALIGN <<SECTOR_SHIFT ) && + pv->pe_start <PV_MIN_ALIGN )) && (mdac->area.start + mdac->area.size > (pv->pe_start <<SECTOR_SHIFT ))) { pv->pe_start = (mdac->area.start + mdac->area.size)
lib/metadata/metadata.h +1 -0
@@ -36,6 +36,7 @@//#define MAX_RESTRICTED_LVS 255 /* Used by FMT_RESTRICTED_LVIDS */ #define MIRROR_LOG_OFFSET 2/* sectors */ #define VG_MEMPOOL_CHUNK 10240/* in bytes, hint only */ +#define PV_MIN_ALIGN 8/* sectors, minimal data align of PV with MDA */ /* * Ceiling(n / sz)
test/t-pvcreate-usage.sh +3 -0
@@ -94,6 +94,9 @@ check_pv_field_ $dev1 pe_start 512.00K pvcreate --metadatasize 100k --dataalignment 100k $dev1 check_pv_field_ $dev1 pe_start 200.00K +pvcreate --metadatasize 128k --dataalignment 3.5k $dev1 +check_pv_field_ $dev1 pe_start 133.00K + #COMM 'pv with LVM1 compatible data alignment can be convereted' #compatible == LVM1_PE_ALIGN == 64k pvcreate --dataalignment 256k $dev1
PATCH v2 1/1 Fix PV datalign when for values starts prior to MDA area
Fix PV datalign when for values starts prior to MDA area.
The dataalign value must always be aligned according to MDA area.
The currect code checks if calculated value collides with MDA area but not if the value is so small that it is located before MDA starts.
Unfortunatelly there can be also MDA in the end of the device.
The patch adds simple check to avoid this miscalculation. Patch expects that first MDA always starts on <= pagesize boundary (this is true for all allowed label sector parameters).
(Similar patch was somehow lost during datalign patch review...)
--- lib/format_text/format-text.c | 4 +++- test/t-pvcreate-usage.sh | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-)
lib/format_text/format-text.c +3 -1
@@ -1372,7 +1372,9 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume dm_list_iterate_items(mda, &info->mdas) { mdac = (struct mda_context *) mda->metadata_locn;if (pv->dev == mdac->area.dev && - (mdac->area.start <= (pv->pe_start <<SECTOR_SHIFT )) && + ((mdac->area.start <= (pv->pe_start <<SECTOR_SHIFT )) || + (mdac->area.start <=lvm_getpagesize () && + pv->pe_start < (lvm_getpagesize () >>SECTOR_SHIFT ))) && (mdac->area.start + mdac->area.size > (pv->pe_start <<SECTOR_SHIFT ))) { pv->pe_start = (mdac->area.start + mdac->area.size)
test/t-pvcreate-usage.sh +3 -0
@@ -94,6 +94,9 @@ check_pv_field_ $dev1 pe_start 512.00K pvcreate --metadatasize 100k --dataalignment 100k $dev1 check_pv_field_ $dev1 pe_start 200.00K +pvcreate --metadatasize 128k --dataalignment 3.5k $dev1 +check_pv_field_ $dev1 pe_start 133.00K + #COMM 'pv with LVM1 compatible data alignment can be convereted' #compatible == LVM1_PE_ALIGN == 64k pvcreate --dataalignment 256k $dev1
PATCH v2 1/1 Fix PV datalign when for values starts prior to MDA area
Quoted 1 line · Milan Broz
Fix PV datalign when for values starts prior to MDA area.
Ack.
(Not reviewed thoroughly though.)
Alasdair