X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=bitmap.c;h=2e1ecdac2e6be666bc8063ee812414c4b7e73eb4;hb=b3bd581b1d9afa3805367632b99d0455d3f2d014;hp=96a26f9a96195446c6a35c6e28fcffd7a60b62f6;hpb=f277ce367125882ea809f981172b8d5c0cc4d5c7;p=thirdparty%2Fmdadm.git diff --git a/bitmap.c b/bitmap.c index 96a26f9a..2e1ecdac 100644 --- a/bitmap.c +++ b/bitmap.c @@ -18,12 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include #include "mdadm.h" -#include - -#define min(a,b) (((a) < (b)) ? (a) : (b)) inline void sb_le_to_cpu(bitmap_super_t *sb) { @@ -36,6 +31,7 @@ inline void sb_le_to_cpu(bitmap_super_t *sb) sb->chunksize = __le32_to_cpu(sb->chunksize); sb->daemon_sleep = __le32_to_cpu(sb->daemon_sleep); sb->sync_size = __le64_to_cpu(sb->sync_size); + sb->write_behind = __le32_to_cpu(sb->write_behind); } inline void sb_cpu_to_le(bitmap_super_t *sb) @@ -117,30 +113,55 @@ unsigned long long bitmap_bits(unsigned long long array_size, return (array_size * 512 + chunksize - 1) / chunksize; } +unsigned long bitmap_sectors(struct bitmap_super_s *bsb) +{ + unsigned long long bits = bitmap_bits(__le64_to_cpu(bsb->sync_size), + __le32_to_cpu(bsb->chunksize)); + int bits_per_sector = 8*512; + return (bits + bits_per_sector - 1) / bits_per_sector; +} + + bitmap_info_t *bitmap_fd_read(int fd, int brief) { + /* Note: fd might be open O_DIRECT, so we must be + * careful to align reads properly + */ unsigned long long total_bits = 0, read_bits = 0, dirty_bits = 0; bitmap_info_t *info; - char buf[512]; - int n; + void *buf; + unsigned int n, skip; + + if (posix_memalign(&buf, 512, 8192) != 0) { + fprintf(stderr, Name ": failed to allocate 8192 bytes\n"); + return NULL; + } + n = read(fd, buf, 8192); info = malloc(sizeof(*info)); if (info == NULL) { +#if __GNUC__ < 3 fprintf(stderr, Name ": failed to allocate %d bytes\n", + (int)sizeof(*info)); +#else + fprintf(stderr, Name ": failed to allocate %zd bytes\n", sizeof(*info)); +#endif return NULL; } - if (read(fd, &info->sb, sizeof(info->sb)) != sizeof(info->sb)) { + if (n < sizeof(info->sb)) { fprintf(stderr, Name ": failed to read superblock of bitmap " "file: %s\n", strerror(errno)); free(info); return NULL; } + memcpy(&info->sb, buf, sizeof(info->sb)); + skip = sizeof(info->sb); sb_le_to_cpu(&info->sb); /* convert superblock to CPU byte ordering */ - - if (brief || info->sb.sync_size == 0) + + if (brief || info->sb.sync_size == 0 || info->sb.chunksize == 0) goto out; /* read the rest of the file counting total bits and dirty bits -- @@ -152,23 +173,28 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief) */ total_bits = bitmap_bits(info->sb.sync_size, info->sb.chunksize); - while ((n = read(fd, buf, sizeof(*buf))) > 0) { + while(read_bits < total_bits) { unsigned long long remaining = total_bits - read_bits; - if (remaining > sizeof(*buf) * 8) /* we want the full buffer */ - remaining = sizeof(*buf) * 8; - if (remaining > n * 8) /* the file is truncated */ - remaining = n * 8; - dirty_bits += count_dirty_bits(buf, remaining); + if (n == 0) { + n = read(fd, buf, 8192); + skip = 0; + if (n <= 0) + break; + } + if (remaining > (n-skip) * 8) /* we want the full buffer */ + remaining = (n-skip) * 8; + + dirty_bits += count_dirty_bits(buf+skip, remaining); read_bits += remaining; - if (read_bits >= total_bits) /* we've got what we want */ - break; + n = 0; } if (read_bits < total_bits) { /* file truncated... */ fprintf(stderr, Name ": WARNING: bitmap file is not large " - "enough for array size %llu!\n\n", info->sb.sync_size); + "enough for array size %llu!\n\n", + (unsigned long long)info->sb.sync_size); total_bits = read_bits; } out: @@ -177,27 +203,45 @@ out: return info; } -bitmap_info_t *bitmap_file_read(char *filename, int brief, struct supertype *st) +bitmap_info_t *bitmap_file_read(char *filename, int brief, struct supertype **stp) { int fd; bitmap_info_t *info; struct stat stb; + struct supertype *st = *stp; - fd = open(filename, O_RDONLY); - if (fd < 0) { - fprintf(stderr, Name ": failed to open bitmap file %s: %s\n", - filename, strerror(errno)); + if (stat(filename, &stb) < 0) { + fprintf(stderr, Name ": failed to find file %s: %s\n", + filename, strerror(errno)); return NULL; } - fstat(fd, &stb); if ((S_IFMT & stb.st_mode) == S_IFBLK) { + fd = open(filename, O_RDONLY); + if (fd < 0) { + fprintf(stderr, Name ": failed to open bitmap file %s: %s\n", + filename, strerror(errno)); + return NULL; + } /* block device, so we are probably after an internal bitmap */ if (!st) st = guess_super(fd); if (!st) { /* just look at device... */ lseek(fd, 0, 0); - } else { + } else if (!st->ss->locate_bitmap) { + fprintf(stderr, Name ": No bitmap possible with %s metadata\n", + st->ss->name); + return NULL; + } else st->ss->locate_bitmap(st, fd); + + ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */ + *stp = st; + } else { + fd = open(filename, O_RDONLY|O_DIRECT); + if (fd < 0) { + fprintf(stderr, Name ": failed to open bitmap file %s: %s\n", + filename, strerror(errno)); + return NULL; } } @@ -206,6 +250,18 @@ bitmap_info_t *bitmap_file_read(char *filename, int brief, struct supertype *st) return info; } +__u32 swapl(__u32 l) +{ + char *c = (char*)&l; + char t= c[0]; + c[0] = c[3]; + c[3] = t; + + t = c[1]; + c[1] = c[2]; + c[2] = t; + return l; +} int ExamineBitmap(char *filename, int brief, struct supertype *st) { /* @@ -215,8 +271,11 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st) bitmap_super_t *sb; bitmap_info_t *info; int rv = 1; + char buf[64]; + int swap; + __u32 uuid32[4]; - info = bitmap_file_read(filename, brief, st); + info = bitmap_file_read(filename, brief, &st); if (!info) return rv; @@ -227,23 +286,46 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st) fprintf(stderr, Name ": invalid bitmap magic 0x%x, the bitmap file appears to be corrupted\n", sb->magic); } printf(" Version : %d\n", sb->version); - if (sb->version != BITMAP_MAJOR) { + if (sb->version < BITMAP_MAJOR_LO || + sb->version > BITMAP_MAJOR_HI) { fprintf(stderr, Name ": unknown bitmap version %d, either the bitmap file is corrupted or you need to upgrade your tools\n", sb->version); goto free_info; } rv = 0; - printf(" UUID : %08x.%08x.%08x.%08x\n", - *(__u32 *)(sb->uuid+0), - *(__u32 *)(sb->uuid+4), - *(__u32 *)(sb->uuid+8), - *(__u32 *)(sb->uuid+12)); - printf(" Events : %llu\n", sb->events); - printf(" Events Cleared : %llu\n", sb->events_cleared); + if (st) + swap = st->ss->swapuuid; + else +#if __BYTE_ORDER == BIG_ENDIAN + swap = 0; +#else + swap = 1; +#endif + memcpy(uuid32, sb->uuid, 16); + if (swap) + printf(" UUID : %08x:%08x:%08x:%08x\n", + swapl(uuid32[0]), + swapl(uuid32[1]), + swapl(uuid32[2]), + swapl(uuid32[3])); + else + printf(" UUID : %08x:%08x:%08x:%08x\n", + uuid32[0], + uuid32[1], + uuid32[2], + uuid32[3]); + + printf(" Events : %llu\n", (unsigned long long)sb->events); + printf(" Events Cleared : %llu\n", (unsigned long long)sb->events_cleared); printf(" State : %s\n", bitmap_state(sb->state)); printf(" Chunksize : %s\n", human_chunksize(sb->chunksize)); printf(" Daemon : %ds flush period\n", sb->daemon_sleep); - printf(" Sync Size : %llu%s\n", sb->sync_size/2, + if (sb->write_behind) + sprintf(buf, "Allow write behind, max %d", sb->write_behind); + else + sprintf(buf, "Normal"); + printf(" Write Mode : %s\n", buf); + printf(" Sync Size : %llu%s\n", (unsigned long long)sb->sync_size/2, human_size(sb->sync_size * 512)); if (brief) goto free_info; @@ -256,8 +338,10 @@ free_info: } int CreateBitmap(char *filename, int force, char uuid[16], - unsigned long chunksize, unsigned long daemon_sleep, - unsigned long long array_size) + unsigned long chunksize, unsigned long daemon_sleep, + unsigned long write_behind, + unsigned long long array_size /* sectors */, + int major) { /* * Create a bitmap file with a superblock and (optionally) a full bitmap @@ -281,13 +365,26 @@ int CreateBitmap(char *filename, int force, char uuid[16], return rv; } + if (chunksize == UnSet) { + /* We don't want more than 2^21 chunks, as 2^11 fill up one + * 4K page (2 bytes per chunk), and 2^10 address of those + * fill up a 4K indexing page. 2^20 might be safer, especially + * on 64bit hosts, so use that. + */ + chunksize = DEFAULT_BITMAP_CHUNK; + /* <<20 for 2^20 chunks, >>9 to convert bytes to sectors */ + while (array_size > ((unsigned long long)chunksize << (20-9))) + chunksize <<= 1; + } + memset(&sb, 0, sizeof(sb)); sb.magic = BITMAP_MAGIC; - sb.version = BITMAP_MAJOR; + sb.version = major; if (uuid != NULL) memcpy(sb.uuid, uuid, 16); sb.chunksize = chunksize; sb.daemon_sleep = daemon_sleep; + sb.write_behind = write_behind; sb.sync_size = array_size; sb_cpu_to_le(&sb); /* convert to on-disk byte ordering */ @@ -315,13 +412,35 @@ int CreateBitmap(char *filename, int force, char uuid[16], } bytes -= sizeof(block); } - + rv = 0; + fflush(fp); /* make the file be the right size (well, to the nearest byte) */ - ftruncate(fileno(fp), filesize); + if (ftruncate(fileno(fp), filesize)) + perror("ftrunace"); out: fclose(fp); if (rv) unlink(filename); /* possibly corrupted, better get rid of it */ return rv; } + +int bitmap_update_uuid(int fd, int *uuid, int swap) +{ + struct bitmap_super_s bm; + if (lseek(fd, 0, 0) != 0) + return 1; + if (read(fd, &bm, sizeof(bm)) != sizeof(bm)) + return 1; + if (bm.magic != __cpu_to_le32(BITMAP_MAGIC)) + return 1; + copy_uuid(bm.uuid, uuid, swap); + if (lseek(fd, 0, 0) != 0) + return 2; + if (write(fd, &bm, sizeof(bm)) != sizeof(bm)) { + lseek(fd, 0, 0); + return 2; + } + lseek(fd, 0, 0); + return 0; +}