illumos gate

I'm updating hg diff. It's the same as before but this time with a proper text formatting.

$ hg status -v
M usr/src/uts/common/fs/zfs/vdev_disk.c

$ hg diff
diff -r 4f23f0abcff2 usr/src/uts/common/fs/zfs/vdev_disk.c
--- a/usr/src/uts/common/fs/zfs/vdev_disk.c     Thu Dec 09 17:47:03 2010 -0800
+++ b/usr/src/uts/common/fs/zfs/vdev_disk.c     Wed Dec 15 11:55:58 2010 +0100
@@ -107,7 +107,7 @@
 {
        spa_t *spa = vd->vdev_spa;
        vdev_disk_t *dvd;
-       struct dk_minfo_ext dkmext;
+       struct dk_minfo dkm;
        int error;
        dev_t dev;
        int otyp;
@@ -287,11 +287,11 @@
         * Determine the device's minimum transfer size.
         * If the ioctl isn't supported, assume DEV_BSIZE.
         */
-       if (ldi_ioctl(dvd->vd_lh, DKIOCGMEDIAINFOEXT, (intptr_t)&dkmext,
+       if (ldi_ioctl(dvd->vd_lh, DKIOCGMEDIAINFO, (intptr_t)&dkm,
            FKIOCTL, kcred, NULL) != 0)
-               dkmext.dki_pbsize = DEV_BSIZE;
+               dkm.dki_lbsize = DEV_BSIZE;

-       *ashift = highbit(MAX(dkmext.dki_pbsize, SPA_MINBLOCKSIZE)) - 1;
+       *ashift = highbit(MAX(dkm.dki_lbsize, SPA_MINBLOCKSIZE)) - 1;

        /*
         * Clear the nowritecache bit, so that on a vdev_reopen() we will

$ hg heads
changeset:   13256:4f23f0abcff2
tag:         tip
user:        Chris Love <cjlove@san.rr.com>
date:        Thu Dec 09 17:47:03 2010 -0800
summary:     436 webrev URLs need updated

$ hg id -n
13256+

I'm facing the same issue on an HP DL360 G4p. However, the latest dev-il build of oi_151a (illumos changeset 170f0c3a9064) works fine when I use a more recent driver downloaded from HP.

I'm still doing load testing, but version 2.4.4 and 2.4.6 of cpqary3 seem to work OK with the internal Smart Array 6i controller. If I revert back to the OI-bundled 2.2.0.a driver, the machine will panic in cpqary3_retrieve() during boot.

If this is indeed a driver issue then we should probably re-file this bug under OpenIndiana and maybe the team can package a newer driver for the 151 release. Otherwise some HP systems will not be able to install the OS.

cpqary3 is actually part of ON's closed bits. Even if the root cause of the panic is fixed, it may make sense to drop it entirely since it's outdated and there is an alternative source (unless someone can convince HP to provide a new driver under a licence that allows unlimited redistribution).

While bringing up a certain blkdev driver, I encountered problems with this as well (mostly pertaining to bad EXPANDSZ, see #3878). I have proposed a fallback-to-DKIOCGMEDIA for ZFS. I need to run it past all of the affected parties, however. This fallback code may completely solve this bug.

commit a5b577712a34346841d970e0827b4920ace408af
Author: Dan McDonald <danmcd@nexenta.com>
Date: Wed Jul 10 10:58:11 2013 -0400

348 ZFS should handle DKIOCGMEDIAINFOEXT failure
    Reviewed by: Garrett D'Amore <garrett@damore.org>
    Reviewed by: George Wilson <george.wilson@delphix.com>
    Approved by: Garrett D'Amore <garrett@damore.org>