vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-08-23 Bean <bean123ch@gmail.com>

Browse source 
* conf/common.rmk (grub_probe_SOURCES): Add disk/mdraid_linux.c.
	(grub_fstest_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
	disk/mdraid_linux.c and disk/dmraid_nvidia.c and lib/crc.c.
	(pkglib_MODULES): Add raid5rec.mod, raid6rec.mod, mdraid.mod and
	dm_nv.mod.
	(raid5rec_mod_SOURCES): New macro.
	(raid5rec_mod_CFLAGS): Likewise.
	(raid5rec_mod_LDFLAGS): Likewise.
	(raid6rec_mod_SOURCES): Likewise.
	(raid6rec_mod_CFLAGS): Likewise.
	(raid6rec_mod_LDFLAGS): Likewise.
	(mdraid_mod_SOURCES): Likewise.
	(mdraid_mod_CFLAGS): Likewise.
	(mdraid_mod_LDFLAGS): Likewise.
	(dm_nv_mod_SOURCES): Likewise.
	(dm_nv_mod_CFLAGS): Likewise.
	(dm_nv_mod_LDFLAGS): Likewise.

	* conf/i386-pc.rmk (grub_setup_SOURCES): Add disk/mdraid_linux.c.
	(grub_emu_SOURCES):  Add disk/raid5_recover.c, disk/raid6_recover.c,
	disk/mdraid_linux.c and disk/dmraid_nvidia.c.

	* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add disk/raid5_recover.c,
	disk/raid6_recover.c, disk/mdraid_linux.c and disk/dmraid_nvidia.c.

	* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.

	* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.

	* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.

	* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.

	* disk/raid5_recover.c: New file.

	* disk/raid6_recover.c: Likewise.

	* disk/mdraid_linux.c: Likewise.

	* disk/dmraid_nvidia.c: Likewise.

	* disk/i386/pc/biosdisk.c: Set total_sectors of cdrom device to
	ULONG_MAX.

	* disk/raid.c (grub_raid_open): Use the size of the smallest disk to
	calculate the size of raid device.
	(grub_raid_read): Simplify raid0 code. Support raid4, raid6 and four
	different layout of raid5.
	(grub_raid_scan_device): Remove code specific to mdraid.
	(grub_raid_list): New variable.
	(free_array): New function.
	(grub_raid_register): Likewise.
	(grub_raid_unregister): Likewise.
	(grub_raid_rescan): Likewise.
	(GRUB_MOD_INIT): Don't iterate device here.
	(GRUB_MOD_FINI): Use free_array to release resource.

	* include/grub/raid.h: Remove macro and structure specific to mdraid.
	(grub_raid5_recover_func_t): New function variable type.
	(grub_raid6_recover_func_t): Likewise.
	(grub_raid5_recover_func): New variable.
	(grub_raid6_recover_func): Likewise.
	(grub_raid_register): New function.
	(grub_raid_unregister): Likewise.
	(grub_raid_rescan): Likewise.
	(grub_raid_block_xor): Likewise.

	* util/grub-fstest.c: Add #include <grub/raid.h> and <grub/lib/crc.h>.
	(CMD_CRC): New macro.
	(part): Removed.
	(read_file): Handle device as well as file.
	(cmd_crc): New function.
	(fstest): Handle multiple disks.
	(options): Remove part, raw and long, add root and diskcount.
	(usage): Add crc, remove -p, -r, -l, add -r and -c.
	(main): Find the first non option entry and ignore subsequence options,
	add handling for the new options, support multiple disks.

	* util/grub-probe.c (probe): Add mdraid to abstraction_name.
This commit is contained in:
bean 2008-08-23 14:51:19 +00:00
parent 29c1891563
commit 5ed20adcb9
24 changed files with 1877 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

180
include/grub/raid.h
View file

@ -22,165 +22,65 @@
#include <grub/types.h>
#define GRUB_RAID_MAX_DEVICES 32
#define GRUB_RAID_LAYOUT_LEFT_ASYMMETRIC 0
#define GRUB_RAID_LAYOUT_RIGHT_ASYMMETRIC 1
#define GRUB_RAID_LAYOUT_LEFT_SYMMETRIC 2
#define GRUB_RAID_LAYOUT_RIGHT_SYMMETRIC 3
#define GRUB_RAID_LAYOUT_RIGHT_MASK 1
#define GRUB_RAID_LAYOUT_SYMMETRIC_MASK 2
struct grub_raid_array
{
int number; /* The device number, taken from md_minor so we
are consistent with the device name in
Linux. */
int version; /* 0 = 0.90, 1 = 1.0 */
int level; /* RAID levels, only 0, 1 or 5 at the moment. */
int layout; /* Only for RAID 5. */
int layout; /* Layout for RAID 5/6. */
unsigned int total_devs; /* Total number of devices in the array. */
unsigned int nr_devs; /* The number of devices we've found so far. */
grub_size_t chunk_size; /* The size of a chunk, in 512 byte sectors. */
grub_uint32_t uuid[4]; /* The UUID of the device. */
char *name; /* That will be "md<number>". */
grub_size_t chunk_size; /* The size of a chunk, in 512 byte sectors. */
grub_uint64_t disk_size; /* Size of an individual disk, in 512 byte
sectors. */
grub_disk_t device[32]; /* Array of total_devs devices. */
int index; /* Index of current device. */
int uuid_len; /* The length of uuid. */
char *uuid; /* The UUID of the device. */
/* The following field is setup by the caller. */
char *name; /* That will be "md<number>". */
unsigned int nr_devs; /* The number of devices we've found so far. */
grub_disk_t device[GRUB_RAID_MAX_DEVICES]; /* Array of total_devs devices. */
struct grub_raid_array *next;
};
/* Linux RAID on disk structures and constants,
copied from include/linux/raid/md_p.h. */
struct grub_raid
{
const char *name;
#define GRUB_RAID_RESERVED_BYTES (64 * 1024)
#define GRUB_RAID_RESERVED_SECTORS (GRUB_RAID_RESERVED_BYTES / 512)
grub_err_t (*detect) (grub_disk_t disk, struct grub_raid_array *array);
#define GRUB_RAID_NEW_SIZE_SECTORS(x) ((x & ~(GRUB_RAID_RESERVED_SECTORS - 1)) \
- GRUB_RAID_RESERVED_SECTORS)
#define GRUB_RAID_SB_BYTES 4096
#define GRUB_RAID_SB_WORDS (GRUB_RAID_SB_BYTES / 4)
#define GRUB_RAID_SB_SECTORS (GRUB_RAID_SB_BYTES / 512)
/*
* The following are counted in 32-bit words
*/
#define GRUB_RAID_SB_GENERIC_OFFSET 0
#define GRUB_RAID_SB_PERSONALITY_OFFSET 64
#define GRUB_RAID_SB_DISKS_OFFSET 128
#define GRUB_RAID_SB_DESCRIPTOR_OFFSET 992
#define GRUB_RAID_SB_GENERIC_CONSTANT_WORDS 32
#define GRUB_RAID_SB_GENERIC_STATE_WORDS 32
#define GRUB_RAID_SB_GENERIC_WORDS (GRUB_RAID_SB_GENERIC_CONSTANT_WORDS \
+ GRUB_RAID_SB_GENERIC_STATE_WORDS)
#define GRUB_RAID_SB_PERSONALITY_WORDS 64
#define GRUB_RAID_SB_DESCRIPTOR_WORDS 32
#define GRUB_RAID_SB_DISKS 27
#define GRUB_RAID_SB_DISKS_WORDS (GRUB_RAID_SB_DISKS*GRUB_RAID_SB_DESCRIPTOR_WORDS)
#define GRUB_RAID_SB_RESERVED_WORDS (1024 - GRUB_RAID_SB_GENERIC_WORDS \
- GRUB_RAID_SB_PERSONALITY_WORDS \
- GRUB_RAID_SB_DISKS_WORDS \
- GRUB_RAID_SB_DESCRIPTOR_WORDS)
#define GRUB_RAID_SB_EQUAL_WORDS (GRUB_RAID_SB_GENERIC_WORDS \
+ GRUB_RAID_SB_PERSONALITY_WORDS \
+ GRUB_RAID_SB_DISKS_WORDS)
/*
* Device "operational" state bits
*/
#define GRUB_RAID_DISK_FAULTY 0 /* disk is faulty / operational */
#define GRUB_RAID_DISK_ACTIVE 1 /* disk is running or spare disk */
#define GRUB_RAID_DISK_SYNC 2 /* disk is in sync with the raid set */
#define GRUB_RAID_DISK_REMOVED 3 /* disk is in sync with the raid set */
#define GRUB_RAID_DISK_WRITEMOSTLY 9 /* disk is "write-mostly" is RAID1 config.
* read requests will only be sent here in
* dire need
*/
#define GRUB_RAID_SB_MAGIC 0xa92b4efc
/*
* Superblock state bits
*/
#define GRUB_RAID_SB_CLEAN 0
#define GRUB_RAID_SB_ERRORS 1
#define GRUB_RAID_SB_BITMAP_PRESENT 8 /* bitmap may be present nearby */
struct grub_raid_disk_09 {
grub_uint32_t number; /* 0 Device number in the entire set */
grub_uint32_t major; /* 1 Device major number */
grub_uint32_t minor; /* 2 Device minor number */
grub_uint32_t raid_disk; /* 3 The role of the device in the raid set */
grub_uint32_t state; /* 4 Operational state */
grub_uint32_t reserved[GRUB_RAID_SB_DESCRIPTOR_WORDS - 5];
struct grub_raid *next;
};
typedef struct grub_raid *grub_raid_t;
struct grub_raid_super_09 {
/*
* Constant generic information
*/
grub_uint32_t md_magic; /* 0 MD identifier */
grub_uint32_t major_version; /* 1 major version to which the set conforms */
grub_uint32_t minor_version; /* 2 minor version ... */
grub_uint32_t patch_version; /* 3 patchlevel version ... */
grub_uint32_t gvalid_words; /* 4 Number of used words in this section */
grub_uint32_t set_uuid0; /* 5 Raid set identifier */
grub_uint32_t ctime; /* 6 Creation time */
grub_uint32_t level; /* 7 Raid personality */
grub_uint32_t size; /* 8 Apparent size of each individual disk */
grub_uint32_t nr_disks; /* 9 total disks in the raid set */
grub_uint32_t raid_disks; /* 10 disks in a fully functional raid set */
grub_uint32_t md_minor; /* 11 preferred MD minor device number */
grub_uint32_t not_persistent; /* 12 does it have a persistent superblock */
grub_uint32_t set_uuid1; /* 13 Raid set identifier #2 */
grub_uint32_t set_uuid2; /* 14 Raid set identifier #3 */
grub_uint32_t set_uuid3; /* 15 Raid set identifier #4 */
grub_uint32_t gstate_creserved[GRUB_RAID_SB_GENERIC_CONSTANT_WORDS - 16];
void grub_raid_register (grub_raid_t raid);
void grub_raid_unregister (grub_raid_t raid);
/*
* Generic state information
*/
grub_uint32_t utime; /* 0 Superblock update time */
grub_uint32_t state; /* 1 State bits (clean, ...) */
grub_uint32_t active_disks; /* 2 Number of currently active disks */
grub_uint32_t working_disks; /* 3 Number of working disks */
grub_uint32_t failed_disks; /* 4 Number of failed disks */
grub_uint32_t spare_disks; /* 5 Number of spare disks */
grub_uint32_t sb_csum; /* 6 checksum of the whole superblock */
#ifdef GRUB_HOST_WORDS_BIGENDIAN
grub_uint32_t events_hi; /* 7 high-order of superblock update count */
grub_uint32_t events_lo; /* 8 low-order of superblock update count */
grub_uint32_t cp_events_hi; /* 9 high-order of checkpoint update count */
grub_uint32_t cp_events_lo; /* 10 low-order of checkpoint update count */
#else
grub_uint32_t events_lo; /* 7 low-order of superblock update count */
grub_uint32_t events_hi; /* 8 high-order of superblock update count */
grub_uint32_t cp_events_lo; /* 9 low-order of checkpoint update count */
grub_uint32_t cp_events_hi; /* 10 high-order of checkpoint update count */
#endif
grub_uint32_t recovery_cp; /* 11 recovery checkpoint sector count */
grub_uint32_t gstate_sreserved[GRUB_RAID_SB_GENERIC_STATE_WORDS - 12];
void grub_raid_rescan (void);
void grub_raid_block_xor (char *buf1, char *buf2, int size);
/*
* Personality information
*/
grub_uint32_t layout; /* 0 the array's physical layout */
grub_uint32_t chunk_size; /* 1 chunk size in bytes */
grub_uint32_t root_pv; /* 2 LV root PV */
grub_uint32_t root_block; /* 3 LV root block */
grub_uint32_t pstate_reserved[GRUB_RAID_SB_PERSONALITY_WORDS - 4];
typedef grub_err_t (*grub_raid5_recover_func_t) (struct grub_raid_array *array,
int disknr, char *buf,
grub_disk_addr_t sector,
int size);
/*
* Disks information
*/
struct grub_raid_disk_09 disks[GRUB_RAID_SB_DISKS];
typedef grub_err_t (*grub_raid6_recover_func_t) (struct grub_raid_array *array,
int disknr, int p, char *buf,
grub_disk_addr_t sector,
int size);
/*
* Reserved
*/
grub_uint32_t reserved[GRUB_RAID_SB_RESERVED_WORDS];
/*
* Active descriptor
*/
struct grub_raid_disk_09 this_disk;
};
extern grub_raid5_recover_func_t grub_raid5_recover_func;
extern grub_raid6_recover_func_t grub_raid6_recover_func;
#endif /* ! GRUB_RAID_H */