From owner-svn-src-projects@FreeBSD.ORG Sun Mar 13 08:59:46 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 91AE71065670; Sun, 13 Mar 2011 08:59:46 +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 7EF8E8FC13; Sun, 13 Mar 2011 08:59:46 +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 p2D8xkHf047844; Sun, 13 Mar 2011 08:59:46 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2D8xkTi047841; Sun, 13 Mar 2011 08:59:46 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201103130859.p2D8xkTi047841@svn.freebsd.org> From: Alexander Motin Date: Sun, 13 Mar 2011 08:59:46 +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: r219593 - 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: Sun, 13 Mar 2011 08:59:46 -0000 Author: mav Date: Sun Mar 13 08:59:46 2011 New Revision: 219593 URL: http://svn.freebsd.org/changeset/base/219593 Log: Add support for SiI spare disks creation. Bunch of small improvements. Modified: projects/graid/head/sys/geom/raid/md_jmicron.c projects/graid/head/sys/geom/raid/md_sii.c Modified: projects/graid/head/sys/geom/raid/md_jmicron.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_jmicron.c Sun Mar 13 08:46:58 2011 (r219592) +++ projects/graid/head/sys/geom/raid/md_jmicron.c Sun Mar 13 08:59:46 2011 (r219593) @@ -235,7 +235,7 @@ jmicron_meta_put_name(struct jmicron_rai { memset(meta->name, 0x20, 16); - memcpy(meta->name, buf, MIN(strlen(meta->name), 16)); + memcpy(meta->name, buf, MIN(strlen(buf), 16)); } static int Modified: projects/graid/head/sys/geom/raid/md_sii.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_sii.c Sun Mar 13 08:46:58 2011 (r219592) +++ projects/graid/head/sys/geom/raid/md_sii.c Sun Mar 13 08:59:46 2011 (r219593) @@ -91,8 +91,7 @@ struct sii_raid_conf { uint8_t dummy_3; uint8_t name[16]; /* 151 - 158 */ uint16_t checksum; /* 159 */ - uint8_t ata_params_160_254[190]; - uint16_t ata_checksum; /* 255 */ + uint16_t ata_params_160_255[96]; } __packed; struct g_raid_md_sii_perdisk { @@ -254,7 +253,7 @@ sii_meta_put_name(struct sii_raid_conf * { memset(meta->name, 0x20, 16); - memcpy(meta->name, buf, MIN(strlen(meta->name), 16)); + memcpy(meta->name, buf, MIN(strlen(buf), 16)); } static struct sii_raid_conf * @@ -280,6 +279,14 @@ sii_meta_read(struct g_consumer *cp) memcpy(meta, buf, min(sizeof(*meta), pp->sectorsize)); g_free(buf); + /* Check vendor ID. */ + if (meta->vendor_id != 0x1095) { + G_RAID_DEBUG(1, "SiI vendor ID check failed on %s (0x%04x)", + pp->name, meta->vendor_id); + free(meta, M_MD_SII); + return (NULL); + } + /* Check metadata major version. */ if (meta->version_major != 2) { G_RAID_DEBUG(1, "SiI version check failed on %s (%d.%d)", @@ -370,6 +377,33 @@ sii_meta_erase(struct g_consumer *cp) return (error); } +static int +sii_meta_write_spare(struct g_consumer *cp) +{ + struct sii_raid_conf *meta; + int error; + + meta = malloc(sizeof(*meta), M_MD_SII, M_WAITOK | M_ZERO); + meta->total_sectors = cp->provider->mediasize / + cp->provider->sectorsize - 0x800; + meta->vendor_id = 0x1095; + meta->version_minor = 0; + meta->version_major = 2; + meta->timestamp[0] = arc4random(); + meta->timestamp[1] = arc4random(); + meta->timestamp[2] = arc4random(); + meta->timestamp[3] = arc4random(); + meta->timestamp[4] = arc4random(); + meta->timestamp[5] = arc4random(); + meta->type = SII_T_SPARE; + meta->generation = 1; + meta->raid1_ident = 0xff; + meta->raid_location = arc4random(); + error = sii_meta_write(cp, meta); + free(meta, M_MD_SII); + return (error); +} + static struct g_raid_disk * g_raid_md_sii_get_disk(struct g_raid_softc *sc, int id) { @@ -1436,8 +1470,10 @@ g_raid_md_ctl_sii(struct g_raid_md_objec /* Welcome the "new" disk. */ update += g_raid_md_sii_start_disk(disk); - if (disk->d_state != G_RAID_DISK_S_ACTIVE && - disk->d_state != G_RAID_DISK_S_SPARE) { + if (disk->d_state == G_RAID_DISK_S_SPARE) { + sii_meta_write_spare(cp); + g_raid_destroy_disk(disk); + } else if (disk->d_state != G_RAID_DISK_S_ACTIVE) { gctl_error(req, "Disk '%s' doesn't fit.", diskname); g_raid_destroy_disk(disk); @@ -1549,14 +1585,14 @@ g_raid_md_write_sii(struct g_raid_md_obj if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1) { pd->pd_meta->disk_number = sd->sd_pos; pd->pd_meta->raid0_ident = 0xff; - pd->pd_meta->raid1_ident = sd->sd_pos; + pd->pd_meta->raid1_ident = 0; } else if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) { pd->pd_meta->disk_number = sd->sd_pos / meta->raid1_disks; pd->pd_meta->raid0_ident = sd->sd_pos % meta->raid1_disks; pd->pd_meta->raid1_ident = sd->sd_pos / meta->raid1_disks; } else { pd->pd_meta->disk_number = sd->sd_pos; - pd->pd_meta->raid0_ident = sd->sd_pos; + pd->pd_meta->raid0_ident = 0; pd->pd_meta->raid1_ident = 0xff; } }