X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=super-ddf.c;h=3e78ffca10a914960214d09f028833a8e7a288a0;hb=a30b2ecd4a4215b0c0017edc6df538c264a97e85;hp=f7bdd2a04f8dddd1f7171fa48c088b162c0cb47a;hpb=0e6004268370082b3af89e73c356f4ada5ca31c2;p=thirdparty%2Fmdadm.git

diff --git a/super-ddf.c b/super-ddf.c
index f7bdd2a0..3e78ffca 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -446,7 +446,10 @@ static int calc_crc(void *buf, int len)
 
 	newcrc = crc32(0, buf, len);
 	ddf->crc = oldcrc;
-	return newcrc;
+	/* The crc is store (like everything) bigendian, so convert
+	 * here for simplicity
+	 */
+	return __cpu_to_be32(newcrc);
 }
 
 static int load_ddf_header(int fd, unsigned long long lba,
@@ -504,9 +507,8 @@ static void *load_section(int fd, struct ddf_super *super, void *buf,
 		/* All pre-allocated sections are a single block */
 		if (len != 1)
 			return NULL;
-	} else {
-		posix_memalign(&buf, 512, len<<9);
-	}
+	} else if (posix_memalign(&buf, 512, len<<9) != 0)
+		buf = NULL;
 
 	if (!buf)
 		return NULL;
@@ -642,9 +644,13 @@ static int load_ddf_local(int fd, struct ddf_super *super,
 	unsigned long long dsize;
 
 	/* First the local disk info */
-	posix_memalign((void**)&dl, 512,
+	if (posix_memalign((void**)&dl, 512,
 		       sizeof(*dl) +
-		       (super->max_part) * sizeof(dl->vlist[0]));
+		       (super->max_part) * sizeof(dl->vlist[0])) != 0) {
+		fprintf(stderr, Name ": %s could not allocate disk info buffer\n",
+			__func__);
+		return 1;
+	}
 
 	load_section(fd, super, &dl->disk,
 		     super->active->data_section_offset,
@@ -693,8 +699,14 @@ static int load_ddf_local(int fd, struct ddf_super *super,
 		if (vd->magic == DDF_SPARE_ASSIGN_MAGIC) {
 			if (dl->spare)
 				continue;
-			posix_memalign((void**)&dl->spare, 512,
-				       super->conf_rec_len*512);
+			if (posix_memalign((void**)&dl->spare, 512,
+				       super->conf_rec_len*512) != 0) {
+				fprintf(stderr, Name
+					": %s could not allocate spare info buf\n",
+					__func__);
+				return 1;
+			}
+				
 			memcpy(dl->spare, vd, super->conf_rec_len*512);
 			continue;
 		}
@@ -712,9 +724,14 @@ static int load_ddf_local(int fd, struct ddf_super *super,
 			    __be32_to_cpu(vcl->conf.seqnum))
 				continue;
 		} else {
-			posix_memalign((void**)&vcl, 512,
+			if (posix_memalign((void**)&vcl, 512,
 				       (super->conf_rec_len*512 +
-					offsetof(struct vcl, conf)));
+					offsetof(struct vcl, conf))) != 0) {
+				fprintf(stderr, Name
+					": %s could not allocate vcl buf\n",
+					__func__);
+				return 1;
+			}
 			vcl->next = super->conflist;
 			vcl->block_sizes = NULL; /* FIXME not for CONCAT */
 			super->conflist = vcl;
@@ -804,7 +821,16 @@ static int load_super_ddf(struct supertype *st, int fd,
 		return rv;
 	}
 
-	load_ddf_local(fd, super, devname, 0);
+	rv = load_ddf_local(fd, super, devname, 0);
+
+	if (rv) {
+		if (devname)
+			fprintf(stderr,
+				Name ": Failed to load all information "
+				"sections on %s\n", devname);
+		free(super);
+		return rv;
+	}
 
 	/* Should possibly check the sections .... */
 
@@ -814,6 +840,7 @@ static int load_super_ddf(struct supertype *st, int fd,
 		st->minor_version = 0;
 		st->max_devs = 512;
 	}
+	st->loaded_container = 0;
 	return 0;
 
 }
@@ -943,6 +970,15 @@ static int map_num1(struct num_mapping *map, int num)
 	return map[i].num2;
 }
 
+static int all_ff(char *guid)
+{
+	int i;
+	for (i = 0; i < DDF_GUID_LEN; i++)
+		if (guid[i] != (char)0xff)
+			return 0;
+	return 1;
+}
+
 #ifndef MDASSEMBLE
 static void print_guid(char *guid, int tstamp)
 {
@@ -1099,20 +1135,35 @@ static void examine_super_ddf(struct supertype *st, char *homehost)
 	examine_pds(sb);
 }
 
+static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info);
+
+static void uuid_from_super_ddf(struct supertype *st, int uuid[4]);
+
 static void brief_examine_super_ddf(struct supertype *st)
 {
 	/* We just write a generic DDF ARRAY entry
-	 * The uuid is all hex, 6 groups of 4 bytes
 	 */
 	struct ddf_super *ddf = st->sb;
+	struct mdinfo info;
 	int i;
-	printf("ARRAY /dev/ddf metadata=ddf UUID=");
-	for (i = 0; i < DDF_GUID_LEN; i++) {
-		if ((i&3) == 0 && i != 0)
-			printf(":");
-		printf("%02X", 255&ddf->anchor.guid[i]);
+	char nbuf[64];
+	getinfo_super_ddf(st, &info);
+	fname_from_uuid(st, &info, nbuf, ':');
+	printf("ARRAY metadata=ddf UUID=%s\n", nbuf + 5);
+
+	for (i=0; i<__be16_to_cpu(ddf->virt->max_vdes); i++) {
+		struct virtual_entry *ve = &ddf->virt->entries[i];
+		struct vcl vcl;
+		char nbuf1[64];
+		if (all_ff(ve->guid))
+			continue;
+		memcpy(vcl.conf.guid, ve->guid, DDF_GUID_LEN);
+		ddf->currentconf =&vcl;
+		uuid_from_super_ddf(st, info.uuid);
+		fname_from_uuid(st, &info, nbuf1, ':');
+		printf("ARRAY container=%s member=%d UUID=%s\n",
+		       nbuf+5, i, nbuf1+5);
 	}
-	printf("\n");
 }
 
 static void detail_super_ddf(struct supertype *st, char *homehost)
@@ -1131,6 +1182,11 @@ static void brief_detail_super_ddf(struct supertype *st)
 	 * Can that be stored in ddf_super??
 	 */
 //	struct ddf_super *ddf = st->sb;
+	struct mdinfo info;
+	char nbuf[64];
+	getinfo_super_ddf(st, &info);
+	fname_from_uuid(st, &info, nbuf,':');
+	printf(" UUID=%s", nbuf + 5);
 }
 #endif
 
@@ -1179,11 +1235,14 @@ static void uuid_from_super_ddf(struct supertype *st, int uuid[4])
 	 *  uuid to put into bitmap file (Create, Grow)
 	 *  uuid for backup header when saving critical section (Grow)
 	 *  comparing uuids when re-adding a device into an array
+	 *    In these cases the uuid required is that of the data-array,
+	 *    not the device-set.
+	 *  uuid to recognise same set when adding a missing device back
+	 *    to an array.   This is a uuid for the device-set.
+	 *  
 	 * For each of these we can make do with a truncated
 	 * or hashed uuid rather than the original, as long as
 	 * everyone agrees.
-	 * In each case the uuid required is that of the data-array,
-	 * not the device-set.
 	 * In the case of SVD we assume the BVD is of interest,
 	 * though that might be the case if a bitmap were made for
 	 * a mirrored SVD - worry about that later.
@@ -1193,19 +1252,19 @@ static void uuid_from_super_ddf(struct supertype *st, int uuid[4])
 	 */
 	struct ddf_super *ddf = st->sb;
 	struct vcl *vcl = ddf->currentconf;
+	char *guid;
+	char buf[20];
+	struct sha1_ctx ctx;
 
-	if (!vcl)
-		memset(uuid, 0, sizeof (uuid));
-	else {
-		char buf[20];
-		struct sha1_ctx ctx;
-		sha1_init_ctx(&ctx);
-		sha1_process_bytes(&vcl->conf.guid, DDF_GUID_LEN, &ctx);
-		if (vcl->conf.sec_elmnt_count > 1)
-			sha1_process_bytes(&vcl->conf.sec_elmnt_seq, 1, &ctx);
-		sha1_finish_ctx(&ctx, buf);
-		memcpy(uuid, buf, sizeof(uuid));
-	}
+	if (vcl)
+		guid = vcl->conf.guid;
+	else
+		guid = ddf->anchor.guid;
+
+	sha1_init_ctx(&ctx);
+	sha1_process_bytes(guid, DDF_GUID_LEN, &ctx);
+	sha1_finish_ctx(&ctx, buf);
+	memcpy(uuid, buf, 4*4);
 }
 
 static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info);
@@ -1247,13 +1306,15 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info)
 
 
 	info->reshape_active = 0;
+	info->name[0] = 0;
 
+	info->array.major_version = -1;
+	info->array.minor_version = -2;
 	strcpy(info->text_version, "ddf");
 	info->safe_mode_delay = 0;
 
-//	uuid_from_super_ddf(info->uuid, sbv);
+	uuid_from_super_ddf(st, info->uuid);
 
-//	info->name[] ?? ;
 }
 
 static int rlq_to_layout(int rlq, int prl, int raiddisks);
@@ -1263,6 +1324,7 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info)
 	struct ddf_super *ddf = st->sb;
 	struct vcl *vc = ddf->currentconf;
 	int cd = ddf->currentdev;
+	int j;
 
 	/* FIXME this returns BVD info - what if we want SVD ?? */
 
@@ -1303,12 +1365,18 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info)
 	uuid_from_super_ddf(st, info->uuid);
 
 	info->container_member = atoi(st->subarray);
+	info->array.major_version = -1;
+	info->array.minor_version = -2;
 	sprintf(info->text_version, "/%s/%s",
 		devnum2devname(st->container_dev),
 		st->subarray);
 	info->safe_mode_delay = 200;
 
-//	info->name[] ?? ;
+	memcpy(info->name, ddf->virt->entries[info->container_member].name, 16);
+	info->name[16]=0;
+	for(j=0; j<16; j++)
+		if (info->name[j] == ' ')
+			info->name[j] = 0;
 }
 
 
@@ -1460,7 +1528,10 @@ static int init_super_ddf(struct supertype *st,
 		return init_super_ddf_bvd(st, info, size, name, homehost,
 					  uuid);
 
-	posix_memalign((void**)&ddf, 512, sizeof(*ddf));
+	if (posix_memalign((void**)&ddf, 512, sizeof(*ddf)) != 0) {
+		fprintf(stderr, Name ": %s could not allocate superblock\n", __func__);
+		return 0;
+	}
 	memset(ddf, 0, sizeof(*ddf));
 	ddf->dlist = NULL; /* no physical disks yet */
 	ddf->conflist = NULL; /* No virtual disks yet */
@@ -1586,8 +1657,13 @@ static int init_super_ddf(struct supertype *st,
 	memcpy(ddf->controller.product_id, "What Is My PID??", 16);
 	memset(ddf->controller.pad, 0xff, 8);
 	memset(ddf->controller.vendor_data, 0xff, 448);
+	if (homehost && strlen(homehost) < 440)
+		strcpy((char*)ddf->controller.vendor_data, homehost);
 
-	posix_memalign((void**)&pd, 512, pdsize);
+	if (posix_memalign((void**)&pd, 512, pdsize) != 0) {
+		fprintf(stderr, Name ": %s could not allocate pd\n", __func__);
+		return 0;
+	}
 	ddf->phys = pd;
 	ddf->pdsize = pdsize;
 
@@ -1598,7 +1674,10 @@ static int init_super_ddf(struct supertype *st,
 	pd->max_pdes = __cpu_to_be16(max_phys_disks);
 	memset(pd->pad, 0xff, 52);
 
-	posix_memalign((void**)&vd, 512, vdsize);
+	if (posix_memalign((void**)&vd, 512, vdsize) != 0) {
+		fprintf(stderr, Name ": %s could not allocate vd\n", __func__);
+		return 0;
+	}
 	ddf->virt = vd;
 	ddf->vdsize = vdsize;
 	memset(vd, 0, vdsize);
@@ -1615,14 +1694,6 @@ static int init_super_ddf(struct supertype *st,
 	return 1;
 }
 
-static int all_ff(char *guid)
-{
-	int i;
-	for (i = 0; i < DDF_GUID_LEN; i++)
-		if (guid[i] != (char)0xff)
-			return 0;
-	return 1;
-}
 static int chunk_to_shift(int chunksize)
 {
 	return ffs(chunksize/512)-1;
@@ -1826,8 +1897,11 @@ static int init_super_ddf_bvd(struct supertype *st,
 		__cpu_to_be16(__be16_to_cpu(ddf->virt->populated_vdes)+1);
 
 	/* Now create a new vd_config */
-	posix_memalign((void**)&vcl, 512,
-		       (offsetof(struct vcl, conf) + ddf->conf_rec_len * 512));
+	if (posix_memalign((void**)&vcl, 512,
+		           (offsetof(struct vcl, conf) + ddf->conf_rec_len * 512)) != 0) {
+		fprintf(stderr, Name ": %s could not allocate vd_config\n", __func__);
+		return 0;
+	}
 	vcl->lba_offset = (__u64*) &vcl->conf.phys_refnum[ddf->mppe];
 	vcl->vcnum = venum;
 	sprintf(st->subarray, "%d", venum);
@@ -1997,8 +2071,13 @@ static void add_to_super_ddf(struct supertype *st,
 	 * a phys_disk entry and a more detailed disk_data entry.
 	 */
 	fstat(fd, &stb);
-	posix_memalign((void**)&dd, 512,
-		       sizeof(*dd) + sizeof(dd->vlist[0]) * ddf->max_part);
+	if (posix_memalign((void**)&dd, 512,
+		           sizeof(*dd) + sizeof(dd->vlist[0]) * ddf->max_part) != 0) {
+		fprintf(stderr, Name
+			": %s could allocate buffer for new disk, aborting\n",
+			__func__);
+		abort();
+	}
 	dd->major = major(stb.st_rdev);
 	dd->minor = minor(stb.st_rdev);
 	dd->devname = devname;
@@ -2086,15 +2165,20 @@ static int __write_init_super_ddf(struct supertype *st, int do_close)
 	struct dl *d;
 	int n_config;
 	int conf_size;
-
+	int attempts = 0;
+	int successes = 0;
 	unsigned long long size, sector;
 
+	/* try to write updated metadata,
+	 * if we catch a failure move on to the next disk
+	 */
 	for (d = ddf->dlist; d; d=d->next) {
 		int fd = d->fd;
 
 		if (fd < 0)
 			continue;
 
+		attempts++;
 		/* We need to fill in the primary, (secondary) and workspace
 		 * lba's in the headers, set their checksums,
 		 * Also checksum phys, virt....
@@ -2124,17 +2208,21 @@ static int __write_init_super_ddf(struct supertype *st, int do_close)
 
 		sector = size - 16*1024*2;
 		lseek64(fd, sector<<9, 0);
-		write(fd, &ddf->primary, 512);
+		if (write(fd, &ddf->primary, 512) < 0)
+			continue;
 
 		ddf->controller.crc = calc_crc(&ddf->controller, 512);
-		write(fd, &ddf->controller, 512);
+		if (write(fd, &ddf->controller, 512) < 0)
+			continue;
 
 		ddf->phys->crc = calc_crc(ddf->phys, ddf->pdsize);
 
-		write(fd, ddf->phys, ddf->pdsize);
+		if (write(fd, ddf->phys, ddf->pdsize) < 0)
+			continue;
 
 		ddf->virt->crc = calc_crc(ddf->virt, ddf->vdsize);
-		write(fd, ddf->virt, ddf->vdsize);
+		if (write(fd, ddf->virt, ddf->vdsize) < 0)
+			continue;
 
 		/* Now write lots of config records. */
 		n_config = ddf->max_part;
@@ -2146,32 +2234,43 @@ static int __write_init_super_ddf(struct supertype *st, int do_close)
 
 			if (c) {
 				c->conf.crc = calc_crc(&c->conf, conf_size);
-				write(fd, &c->conf, conf_size);
+				if (write(fd, &c->conf, conf_size) < 0)
+					break;
 			} else {
 				char *null_aligned = (char*)((((unsigned long)null_conf)+511)&~511UL);
 				if (null_conf[0] != 0xff)
 					memset(null_conf, 0xff, sizeof(null_conf));
 				int togo = conf_size;
 				while (togo > sizeof(null_conf)-512) {
-					write(fd, null_aligned, sizeof(null_conf)-512);
+					if (write(fd, null_aligned, sizeof(null_conf)-512) < 0)
+						break;
 					togo -= sizeof(null_conf)-512;
 				}
-				write(fd, null_aligned, togo);
+				if (write(fd, null_aligned, togo) < 0)
+					break;
 			}
 		}
+		if (i <= n_config)
+			continue;
 		d->disk.crc = calc_crc(&d->disk, 512);
-		write(fd, &d->disk, 512);
+		if (write(fd, &d->disk, 512) < 0)
+			continue;
 
 		/* Maybe do the same for secondary */
 
 		lseek64(fd, (size-1)*512, SEEK_SET);
-		write(fd, &ddf->anchor, 512);
-		if (do_close) {
-			close(fd);
+		if (write(fd, &ddf->anchor, 512) < 0)
+			continue;
+		successes++;
+	}
+
+	if (do_close)
+		for (d = ddf->dlist; d; d=d->next) {
+			close(d->fd);
 			d->fd = -1;
 		}
-	}
-	return 1;
+
+	return attempts != successes;
 }
 
 static int write_init_super_ddf(struct supertype *st)
@@ -2534,13 +2633,18 @@ static int load_super_ddf_all(struct supertype *st, int fd,
 	close(dfd);
 	/* Now we need the device-local bits */
 	for (sd = sra->devs ; sd ; sd = sd->next) {
+		int rv;
+
 		sprintf(nm, "%d:%d", sd->disk.major, sd->disk.minor);
 		dfd = dev_open(nm, keep_fd? O_RDWR : O_RDONLY);
 		if (dfd < 0)
 			return 2;
-		load_ddf_headers(dfd, super, NULL);
-		seq = load_ddf_local(dfd, super, NULL, keep_fd);
+		rv = load_ddf_headers(dfd, super, NULL);
+		if (rv == 0)
+			rv = load_ddf_local(dfd, super, NULL, keep_fd);
 		if (!keep_fd) close(dfd);
+		if (rv)
+			return 1;
 	}
 	if (st->subarray[0]) {
 		struct vcl *v;
@@ -2558,6 +2662,7 @@ static int load_super_ddf_all(struct supertype *st, int fd,
 		st->max_devs = 512;
 		st->container_dev = fd2devnum(fd);
 	}
+	st->loaded_container = 1;
 	return 0;
 }
 #endif /* MDASSEMBLE */
@@ -2579,6 +2684,7 @@ static struct mdinfo *container_content_ddf(struct supertype *st)
 	for (vc = ddf->conflist ; vc ; vc=vc->next)
 	{
 		int i;
+		int j;
 		struct mdinfo *this;
 		this = malloc(sizeof(*this));
 		memset(this, 0, sizeof(*this));
@@ -2591,6 +2697,8 @@ static struct mdinfo *container_content_ddf(struct supertype *st)
 		this->array.layout = rlq_to_layout(vc->conf.rlq, vc->conf.prl,
 						   this->array.raid_disks);
 		this->array.md_minor      = -1;
+		this->array.major_version = -1;
+		this->array.minor_version = -2;
 		this->array.ctime         = DECADE +
 			__be32_to_cpu(*(__u32*)(vc->conf.guid+16));
 		this->array.utime	  = DECADE +
@@ -2607,14 +2715,21 @@ static struct mdinfo *container_content_ddf(struct supertype *st)
 			this->array.state = 1;
 			this->resync_start = ~0ULL;
 		}
-		memcpy(this->name, ddf->virt->entries[i].name, 32);
-		this->name[32]=0;
+		memcpy(this->name, ddf->virt->entries[i].name, 16);
+		this->name[16]=0;
+		for(j=0; j<16; j++)
+			if (this->name[j] == ' ')
+				this->name[j] = 0;
 
 		memset(this->uuid, 0, sizeof(this->uuid));
 		this->component_size = __be64_to_cpu(vc->conf.blocks);
 		this->array.size = this->component_size / 2;
 		this->container_member = i;
 
+		ddf->currentconf = vc;
+		uuid_from_super_ddf(st, this->uuid);
+		ddf->currentconf = NULL;
+
 		sprintf(this->text_version, "/%s/%d",
 			devnum2devname(st->container_dev),
 			this->container_member);
@@ -2659,16 +2774,20 @@ static int store_zero_ddf(struct supertype *st, int fd)
 {
 	unsigned long long dsize;
 	void *buf;
+	int rc;
 
 	if (!get_dev_size(fd, NULL, &dsize))
 		return 1;
 
-	posix_memalign(&buf, 512, 512);
+	if (posix_memalign(&buf, 512, 512) != 0)
+		return 1;
 	memset(buf, 0, 512);
 
 	lseek64(fd, dsize-512, 0);
-	write(fd, buf, 512);
+	rc = write(fd, buf, 512);
 	free(buf);
+	if (rc < 0)
+		return 1;
 	return 0;
 }
 
@@ -2728,7 +2847,7 @@ static int ddf_set_array_state(struct active_array *a, int consistent)
 	if (consistent == 2) {
 		/* Should check if a recovery should be started FIXME */
 		consistent = 1;
-		if (a->resync_start != ~0ULL)
+		if (!is_resync_complete(a))
 			consistent = 0;
 	}
 	if (consistent)
@@ -2740,7 +2859,7 @@ static int ddf_set_array_state(struct active_array *a, int consistent)
 
 	old = ddf->virt->entries[inst].init_state;
 	ddf->virt->entries[inst].init_state &= ~DDF_initstate_mask;
-	if (a->resync_start == ~0ULL)
+	if (is_resync_complete(a))
 		ddf->virt->entries[inst].init_state |= DDF_init_full;
 	else if (a->resync_start == 0)
 		ddf->virt->entries[inst].init_state |= DDF_init_not;
@@ -2987,6 +3106,8 @@ static void ddf_process_update(struct supertype *st,
 			       mppe * (sizeof(__u32) + sizeof(__u64)));
 		} else {
 			/* A new VD_CONF */
+			if (!update->space)
+				return;
 			vcl = update->space;
 			update->space = NULL;
 			vcl->next = ddf->conflist;
@@ -3047,9 +3168,10 @@ static void ddf_prepare_update(struct supertype *st,
 	struct ddf_super *ddf = st->sb;
 	__u32 *magic = (__u32*)update->buf;
 	if (*magic == DDF_VD_CONF_MAGIC)
-		posix_memalign(&update->space, 512,
+		if (posix_memalign(&update->space, 512,
 			       offsetof(struct vcl, conf)
-			       + ddf->conf_rec_len * 512);
+			       + ddf->conf_rec_len * 512) != 0)
+			update->space = NULL;
 }
 
 /*
@@ -3198,6 +3320,8 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
 
 			/* Cool, we have a device with some space at pos */
 			di = malloc(sizeof(*di));
+			if (!di)
+				continue;
 			memset(di, 0, sizeof(*di));
 			di->disk.number = i;
 			di->disk.raid_disk = i;
@@ -3230,8 +3354,21 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
 	 * phys_refnum and lba_offset values
 	 */
 	mu = malloc(sizeof(*mu));
+	if (mu && posix_memalign(&mu->space, 512, sizeof(struct vcl)) != 0) {
+		free(mu);
+		mu = NULL;
+	}
+	if (!mu) {
+		while (rv) {
+			struct mdinfo *n = rv->next;
+
+			free(rv);
+			rv = n;
+		}
+		return NULL;
+	}
+		
 	mu->buf = malloc(ddf->conf_rec_len * 512);
-	posix_memalign(&mu->space, 512, sizeof(struct vcl));
 	mu->len = ddf->conf_rec_len;
 	mu->next = *updates;
 	vc = find_vdcr(ddf, a->info.container_member);