From owner-svn-src-projects@FreeBSD.ORG Mon Mar 14 10:51:24 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAF731065673; Mon, 14 Mar 2011 10:51:24 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D9E408FC14; Mon, 14 Mar 2011 10:51:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2EApOOG091293; Mon, 14 Mar 2011 10:51:24 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2EApOmK091291; Mon, 14 Mar 2011 10:51:24 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201103141051.p2EApOmK091291@svn.freebsd.org> From: Alexander Motin Date: Mon, 14 Mar 2011 10:51:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219635 - projects/graid/head/sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2011 10:51:25 -0000 Author: mav Date: Mon Mar 14 10:51:24 2011 New Revision: 219635 URL: http://svn.freebsd.org/changeset/base/219635 Log: Parse volume parameters. Modified: projects/graid/head/sys/geom/raid/md_promise.c Modified: projects/graid/head/sys/geom/raid/md_promise.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_promise.c Mon Mar 14 09:54:16 2011 (r219634) +++ projects/graid/head/sys/geom/raid/md_promise.c Mon Mar 14 10:51:24 2011 (r219635) @@ -761,9 +761,9 @@ g_raid_md_promise_start(struct g_raid_vo struct g_raid_md_object *md; struct g_raid_md_promise_object *mdi; struct g_raid_md_promise_pervolume *pv; + struct promise_raid_conf *meta; #if 0 struct g_raid_md_promise_perdisk *pd; - struct promise_raid_conf *meta; struct promise_raid_vol *mvol; struct promise_raid_map *mmap; struct g_raid_volume *vol; @@ -776,72 +776,33 @@ g_raid_md_promise_start(struct g_raid_vo md = sc->sc_md; mdi = (struct g_raid_md_promise_object *)md; pv = vol->v_md_data; -#if 0 - meta = mdi->mdio_meta; + meta = pv->pv_meta; - /* Create volumes and subdisks. */ - for (i = 0; i < meta->total_volumes; i++) { - mvol = promise_get_volume(meta, i); - mmap = promise_get_map(mvol, 0); - vol = g_raid_create_volume(sc, mvol->name); - vol->v_md_data = (void *)(intptr_t)i; - if (mmap->type == PROMISE_T_RAID0) - vol->v_raid_level = G_RAID_VOLUME_RL_RAID0; - else if (mmap->type == PROMISE_T_RAID1 && - mmap->total_domains >= 2 && - mmap->total_domains <= mmap->total_disks) { - /* Assume total_domains is correct. */ - if (mmap->total_domains == mmap->total_disks) - vol->v_raid_level = G_RAID_VOLUME_RL_RAID1; - else - vol->v_raid_level = G_RAID_VOLUME_RL_RAID1E; - } else if (mmap->type == PROMISE_T_RAID1) { - /* total_domains looks wrong. */ - if (mmap->total_disks <= 2) - vol->v_raid_level = G_RAID_VOLUME_RL_RAID1; - else - vol->v_raid_level = G_RAID_VOLUME_RL_RAID1E; - } else if (mmap->type == PROMISE_T_RAID5) - vol->v_raid_level = G_RAID_VOLUME_RL_RAID5; + if (meta->type == PROMISE_T_RAID0) + vol->v_raid_level = G_RAID_VOLUME_RL_RAID0; + else if (meta->type == PROMISE_T_RAID1) { + if (meta->array_width == 1) + vol->v_raid_level = G_RAID_VOLUME_RL_RAID1; else - vol->v_raid_level = G_RAID_VOLUME_RL_UNKNOWN; - vol->v_raid_level_qualifier = G_RAID_VOLUME_RLQ_NONE; - vol->v_strip_size = (u_int)mmap->strip_sectors * 512; //ZZZ - vol->v_disks_count = mmap->total_disks; - vol->v_mediasize = (off_t)mvol->total_sectors * 512; //ZZZ - vol->v_sectorsize = 512; //ZZZ - for (j = 0; j < vol->v_disks_count; j++) { - sd = &vol->v_subdisks[j]; - sd->sd_offset = (off_t)mmap->offset * 512; //ZZZ - sd->sd_size = (off_t)mmap->disk_sectors * 512; //ZZZ - } - g_raid_start_volume(vol); - } - - /* Create disk placeholders to store data for later writing. */ - for (disk_pos = 0; disk_pos < meta->total_disks; disk_pos++) { - pd = malloc(sizeof(*pd), M_MD_PROMISE, M_WAITOK | M_ZERO); - pd->pd_disk_pos = disk_pos; - pd->pd_disk_meta = meta->disk[disk_pos]; - disk = g_raid_create_disk(sc); - disk->d_md_data = (void *)pd; - disk->d_state = G_RAID_DISK_S_OFFLINE; - for (i = 0; i < meta->total_volumes; i++) { - mvol = promise_get_volume(meta, i); - mmap = promise_get_map(mvol, 0); - for (j = 0; j < mmap->total_disks; j++) { - if ((mmap->disk_idx[j] & PROMISE_DI_IDX) == disk_pos) - break; - } - if (j == mmap->total_disks) - continue; - vol = g_raid_md_promise_get_volume(sc, i); - sd = &vol->v_subdisks[j]; - sd->sd_disk = disk; - TAILQ_INSERT_TAIL(&disk->d_subdisks, sd, sd_next); - } - } + vol->v_raid_level = G_RAID_VOLUME_RL_RAID1E; + } else if (meta->type == PROMISE_T_RAID3) + vol->v_raid_level = G_RAID_VOLUME_RL_RAID3; + else if (meta->type == PROMISE_T_RAID5) + vol->v_raid_level = G_RAID_VOLUME_RL_RAID5; + else if (meta->type == PROMISE_T_SPAN) + vol->v_raid_level = G_RAID_VOLUME_RL_CONCAT; + else if (meta->type == PROMISE_T_JBOD) + vol->v_raid_level = G_RAID_VOLUME_RL_SINGLE; + else + vol->v_raid_level = G_RAID_VOLUME_RL_UNKNOWN; + vol->v_raid_level_qualifier = G_RAID_VOLUME_RLQ_NONE; + vol->v_strip_size = 512 << meta->stripe_shift; //ZZZ + vol->v_disks_count = meta->total_disks; + vol->v_mediasize = (off_t)meta->total_sectors * 512; //ZZZ + vol->v_sectorsize = 512; //ZZZ + g_raid_start_volume(vol); +#if 0 /* Make all disks found till the moment take their places. */ do { TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { @@ -851,19 +812,16 @@ g_raid_md_promise_start(struct g_raid_vo } } } while (disk != NULL); +#endif - mdi->mdio_started = 1; - G_RAID_DEBUG1(0, sc, "Array started."); + pv->pv_started = 1; + G_RAID_DEBUG1(0, sc, "Volume started."); g_raid_md_write_promise(md, NULL, NULL, NULL); /* Pickup any STALE/SPARE disks to refill array if needed. */ - g_raid_md_promise_refill(sc); +// g_raid_md_promise_refill(sc); - TAILQ_FOREACH(vol, &sc->sc_volumes, v_next) { - g_raid_event_send(vol, G_RAID_VOLUME_E_START, - G_RAID_EVENT_VOLUME); - } -#endif + g_raid_event_send(vol, G_RAID_VOLUME_E_START, G_RAID_EVENT_VOLUME); callout_stop(&pv->pv_start_co); G_RAID_DEBUG1(1, sc, "root_mount_rel %p", pv->pv_rootmount); @@ -924,28 +882,27 @@ g_raid_md_promise_new_disk(struct g_raid g_raid_promise_go, vol); pv->pv_rootmount = root_mount_hold("GRAID-Promise"); G_RAID_DEBUG1(1, sc, "root_mount_hold %p", pv->pv_rootmount); - g_raid_start_volume(vol); } else pv = vol->v_md_data; /* If we haven't started yet - check metadata freshness. */ - if (pv->pv_meta != NULL && mdi->mdio_started) - continue; - if (pv->pv_meta == NULL || - ((int16_t)(pdmeta->generation - pv->pv_generation)) > 0) { - G_RAID_DEBUG1(1, sc, "Newer disk"); - if (pv->pv_meta != NULL) - free(pv->pv_meta, M_MD_PROMISE); - pv->pv_meta = promise_meta_copy(pdmeta); - pv->pv_generation = pv->pv_meta->generation; - pv->pv_disks_present = 1; - } else if (pdmeta->generation == pv->pv_generation) { - pv->pv_disks_present++; - G_RAID_DEBUG1(1, sc, "Matching disk (%d of %d up)", - pv->pv_disks_present, - pv->pv_meta->total_disks); - } else { - G_RAID_DEBUG1(1, sc, "Older disk"); + if (pv->pv_meta == NULL || !pv->pv_started) { + if (pv->pv_meta == NULL || + ((int16_t)(pdmeta->generation - pv->pv_generation)) > 0) { + G_RAID_DEBUG1(1, sc, "Newer disk"); + if (pv->pv_meta != NULL) + free(pv->pv_meta, M_MD_PROMISE); + pv->pv_meta = promise_meta_copy(pdmeta); + pv->pv_generation = pv->pv_meta->generation; + pv->pv_disks_present = 1; + } else if (pdmeta->generation == pv->pv_generation) { + pv->pv_disks_present++; + G_RAID_DEBUG1(1, sc, "Matching disk (%d of %d up)", + pv->pv_disks_present, + pv->pv_meta->total_disks); + } else { + G_RAID_DEBUG1(1, sc, "Older disk"); + } } if (pv->pv_started) {