shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

vdo: support version 4

Browse Source 
Properly parse VDO volumes formatted with geometry block version 4.0.
This commit is contained in:
Zdenek Kabelac 2023-07-02 22:02:18 +02:00
parent e84b00964f
commit b90c5d6015
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
device_mapper/vdo/vdo_reader.c
View File

@ -128,6 +128,14 @@ struct vdo_volume_geometry {
struct vdo_index_config index_config; struct vdo_index_config index_config;
} __packed; } __packed;
struct vdo_volume_geometry_4 {
uint32_t release_version;
uint64_t nonce;
uuid_t uuid;
struct vdo_volume_region regions[VDO_VOLUME_REGION_COUNT];
struct vdo_index_config index_config;
} __packed;
/* Decoding mostly only some used stucture members */ /* Decoding mostly only some used stucture members */
static void _vdo_decode_version(struct vdo_version_number *v) static void _vdo_decode_version(struct vdo_version_number *v)
@ -157,6 +165,16 @@ static void _vdo_decode_volume_geometry(struct vdo_volume_geometry *vg)
_vdo_decode_geometry_region(&vg->regions[VDO_DATA_REGION]); _vdo_decode_geometry_region(&vg->regions[VDO_DATA_REGION]);
} }
static void _vdo_decode_volume_geometry_4(struct vdo_volume_geometry *vg,
struct vdo_volume_geometry_4 *vg_4)
{
vg->release_version = le32_to_cpu(vg_4->release_version);
vg->nonce = le64_to_cpu(vg_4->nonce);
vg->bio_offset = 0;
vg->regions[VDO_DATA_REGION] = vg_4->regions[VDO_DATA_REGION];
_vdo_decode_geometry_region(&vg->regions[VDO_DATA_REGION]);
}
static void _vdo_decode_config(struct vdo_config *vc) static void _vdo_decode_config(struct vdo_config *vc)
{ {
vc->logical_blocks = le64_to_cpu(vc->logical_blocks); vc->logical_blocks = le64_to_cpu(vc->logical_blocks);
@ -184,6 +202,7 @@ bool dm_vdo_parse_logical_size(const char *vdo_path, uint64_t *logical_blocks)
struct vdo_header h; struct vdo_header h;
struct vdo_version_number vn; struct vdo_version_number vn;
struct vdo_volume_geometry vg; struct vdo_volume_geometry vg;
struct vdo_volume_geometry_4 vg_4;
struct vdo_component_41_0 pvc; struct vdo_component_41_0 pvc;
*logical_blocks = 0; *logical_blocks = 0;
@ -220,17 +239,24 @@ bool dm_vdo_parse_logical_size(const char *vdo_path, uint64_t *logical_blocks)
memcpy(&h, buffer + MAGIC_NUMBER_SIZE, sizeof(h)); memcpy(&h, buffer + MAGIC_NUMBER_SIZE, sizeof(h));
_vdo_decode_header(&h); _vdo_decode_header(&h);
if (h.version.major_version != 5) {
log_debug_activation("Unsupported VDO version %u.%u.", h.version.major_version, h.version.minor_version);
goto err;
}
if (h.id != 5) { if (h.id != 5) {
log_debug_activation("Expected geometry VDO block instead of block %u.", h.id); log_debug_activation("Expected geometry VDO block instead of block %u.", h.id);
goto err; goto err;
} }
switch (h.version.major_version) {
case 4:
memcpy(&vg_4, buffer + MAGIC_NUMBER_SIZE + sizeof(h), sizeof(vg_4));
_vdo_decode_volume_geometry_4(&vg, &vg_4);
break;
case 5:
memcpy(&vg, buffer + MAGIC_NUMBER_SIZE + sizeof(h), sizeof(vg)); memcpy(&vg, buffer + MAGIC_NUMBER_SIZE + sizeof(h), sizeof(vg));
_vdo_decode_volume_geometry(&vg); _vdo_decode_volume_geometry(&vg);
break;
default:
log_debug_activation("Unsupported VDO version %u.%u.", h.version.major_version, h.version.minor_version);
goto err;
}
regpos = (vg.regions[VDO_DATA_REGION].start_block - vg.bio_offset) * 4096; regpos = (vg.regions[VDO_DATA_REGION].start_block - vg.bio_offset) * 4096;