From 07bc6002cac04de7dc80fae0287695f91b2c3f23 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 24 Apr 2007 18:35:24 +0200 Subject: [PATCH] volume_id: add md metadata 1.0, 1.1, 1.2 support --- extras/volume_id/lib/Makefile | 2 +- extras/volume_id/lib/linux_raid.c | 110 ++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 22 deletions(-) diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile index 9858fb02d8..41b7ecb7af 100644 --- a/extras/volume_id/lib/Makefile +++ b/extras/volume_id/lib/Makefile @@ -13,7 +13,7 @@ INSTALL_DATA = ${INSTALL} -m 644 INSTALL_LIB = ${INSTALL} -m 755 SHLIB_CUR = 0 -SHLIB_REV = 75 +SHLIB_REV = 76 SHLIB_AGE = 0 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE) diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c index a9c5d61adc..009c714bd1 100644 --- a/extras/volume_id/lib/linux_raid.c +++ b/extras/volume_id/lib/linux_raid.c @@ -22,12 +22,13 @@ #include #include #include +#include #include "libvolume_id.h" #include "util.h" -static struct mdp_super_block { - uint8_t md_magic[4]; +static struct mdp0_super_block { + uint32_t md_magic; uint32_t major_version; uint32_t minor_version; uint32_t patch_version; @@ -43,42 +44,109 @@ static struct mdp_super_block { uint32_t set_uuid1; uint32_t set_uuid2; uint32_t set_uuid3; -} PACKED *mdp; +} PACKED *mdp0; + +struct mdp1_super_block { + uint32_t magic; + uint32_t major_version; + uint32_t feature_map; + uint32_t pad0; + uint8_t set_uuid[16]; + uint8_t set_name[32]; +} PACKED *mdp1; #define MD_RESERVED_BYTES 0x10000 -#define MD_MAGIC "\xfc\x4e\x2b\xa9" -#define MD_MAGIC_SWAP "\xa9\x2b\x4e\xfc" +#define MD_SB_MAGIC 0xa92b4efc -int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size) +static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint64_t size) { const uint8_t *buf; - uint64_t sboff; - uint8_t uuid[16]; + union { + uint32_t ints[4]; + uint8_t bytes[16]; + } uuid; info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); if (size < 0x10000) return -1; - sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES; - buf = volume_id_get_buffer(id, off + sboff, 0x800); + buf = volume_id_get_buffer(id, off, 0x800); if (buf == NULL) return -1; - mdp = (struct mdp_super_block *) buf; + mdp0 = (struct mdp0_super_block *) buf; - if ((memcmp(mdp->md_magic, MD_MAGIC, 4) != 0) && - (memcmp(mdp->md_magic, MD_MAGIC_SWAP, 4) != 0)) + if (le32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) { + uuid.ints[0] = bswap_32(mdp0->set_uuid0); + uuid.ints[1] = bswap_32(mdp0->set_uuid1); + uuid.ints[2] = bswap_32(mdp0->set_uuid2); + uuid.ints[3] = bswap_32(mdp0->set_uuid3); + volume_id_set_uuid(id, uuid.bytes, UUID_DCE); + snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u", + le32_to_cpu(mdp0->major_version), + le32_to_cpu(mdp0->minor_version), + le32_to_cpu(mdp0->patch_version)); + } else if (be32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) { + uuid.ints[0] = mdp0->set_uuid0; + uuid.ints[1] = mdp0->set_uuid1; + uuid.ints[2] = mdp0->set_uuid2; + uuid.ints[3] = mdp0->set_uuid3; + volume_id_set_uuid(id, uuid.bytes, UUID_DCE); + snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u", + be32_to_cpu(mdp0->major_version), + be32_to_cpu(mdp0->minor_version), + be32_to_cpu(mdp0->patch_version)); + } else return -1; - memcpy(uuid, &mdp->set_uuid0, 4); - memcpy(&uuid[4], &mdp->set_uuid1, 12); - volume_id_set_uuid(id, uuid, UUID_DCE); - snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u", - le32_to_cpu(mdp->major_version), - le32_to_cpu(mdp->minor_version), - le32_to_cpu(mdp->patch_version)); - dbg("found raid signature"); volume_id_set_usage(id, VOLUME_ID_RAID); id->type = "linux_raid_member"; return 0; } + +static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint64_t size) +{ + const uint8_t *buf; + + info("probing at offset 0x%llx, size 0x%llx", + (unsigned long long) off, (unsigned long long) size); + + buf = volume_id_get_buffer(id, off, 0x800); + if (buf == NULL) + return -1; + mdp1 = (struct mdp1_super_block *) buf; + + if (le32_to_cpu(mdp1->magic) != MD_SB_MAGIC) + return -1; + + volume_id_set_uuid(id, mdp1->set_uuid, UUID_DCE); + volume_id_set_label_raw(id, mdp1->set_name, 32); + volume_id_set_label_string(id, mdp1->set_name, 32); + snprintf(id->type_version, sizeof(id->type_version)-1, "%u", le32_to_cpu(mdp1->major_version)); + volume_id_set_usage(id, VOLUME_ID_RAID); + id->type = "linux_raid_member"; + return 0; +} + +int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size) +{ + uint64_t sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES; + + /* version 0 at the end of the device */ + if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0) + return 0; + + /* version 1.0 at the end of the device */ + if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0) + return 0; + + /* version 1.1 at the start of the device */ + if (volume_id_probe_linux_raid1(id, off, size) == 0) + return 0; + + /* version 1.2 at 4k offset from the start */ + if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0) + return 0; + + return -1; +}