Drive database update

The Intel DC S3500 and Intel DC S3700 are optimized to handle 4KB
sectors well despite of their 8KB page sizes, so we move them to a new
category for enterprise drives where they will receive ashift=12. They
are joined by the Intel 730 series, which uses the same disk controller,
as well as a San Disk enterprise drive. The drive IDs for these two were
obtained by myself with the drive_id utility. The drive ID for the 240GB
Intel 730 model was extrapolated from the drive ID for the 480GB model.

Lastly, we also add some Western Digital mobile drives.  ryuo in
\#zfsonlinux on freenode obtained "ATA     WDC WD2500BEVT-0" from
running drive_id on his own hardware. The additional drives in that
family were extrapolated from that identifer.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2601

diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index 686782b077385ddd770e0260d13d9a9b609016d1..93a968dbadc72188377be5a0ed07a3e09a9adcb1 100644 (file)
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -127,20 +127,6 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
        {"ATA     INTEL SSDSA2CW16", 8192},
        {"ATA     INTEL SSDSA2CW30", 8192},
        {"ATA     INTEL SSDSA2CW60", 8192},
-       {"ATA     INTEL SSDSC2BA10", 8192},
-       {"ATA     INTEL SSDSC2BA20", 8192},
-       {"ATA     INTEL SSDSC2BA40", 8192},
-       {"ATA     INTEL SSDSC2BA80", 8192},
-       {"ATA     INTEL SSDSC2BB08", 8192},
-       {"ATA     INTEL SSDSC2BB12", 8192},
-       {"ATA     INTEL SSDSC2BB16", 8192},
-       {"ATA     INTEL SSDSC2BB24", 8192},
-       {"ATA     INTEL SSDSC2BB30", 8192},
-       {"ATA     INTEL SSDSC2BB40", 8192},
-       {"ATA     INTEL SSDSC2BB48", 8192},
-       {"ATA     INTEL SSDSC2BB60", 8192},
-       {"ATA     INTEL SSDSC2BB80", 8192},
-       {"ATA     INTEL SSDSC2BW24", 8192},
        {"ATA     INTEL SSDSC2CT06", 8192},
        {"ATA     INTEL SSDSC2CT12", 8192},
        {"ATA     INTEL SSDSC2CT18", 8192},
@@ -188,6 +174,24 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
        {"ATA     SAMSUNG MCCOE32G", 4096},
        {"ATA     SAMSUNG MCCOE64G", 4096},
        {"ATA     SAMSUNG SSD PM80", 4096},
+       /* Flash drives optimized for 4KB IOs on larger pages */
+       {"ATA     INTEL SSDSC2BA10", 4096},
+       {"ATA     INTEL SSDSC2BA20", 4096},
+       {"ATA     INTEL SSDSC2BA40", 4096},
+       {"ATA     INTEL SSDSC2BA80", 4096},
+       {"ATA     INTEL SSDSC2BB08", 4096},
+       {"ATA     INTEL SSDSC2BB12", 4096},
+       {"ATA     INTEL SSDSC2BB16", 4096},
+       {"ATA     INTEL SSDSC2BB24", 4096},
+       {"ATA     INTEL SSDSC2BB30", 4096},
+       {"ATA     INTEL SSDSC2BB40", 4096},
+       {"ATA     INTEL SSDSC2BB48", 4096},
+       {"ATA     INTEL SSDSC2BB60", 4096},
+       {"ATA     INTEL SSDSC2BB80", 4096},
+       {"ATA     INTEL SSDSC2BW24", 4096},
+       {"ATA     INTEL SSDSC2BP24", 4096},
+       {"ATA     INTEL SSDSC2BP48", 4096},
+       {"NA      SmrtStorSDLKAE9W", 4096},
        /* Imported from Open Solaris */
        {"ATA     MARVELL SD88SA02", 4096},
        /* Advanced format Hard drives */
@@ -203,6 +207,10 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
        {"ATA     WDC WD20EARS-00M", 4096},
        {"ATA     WDC WD20EARS-00S", 4096},
        {"ATA     WDC WD20EARS-00Z", 4096},
+       {"ATA     WDC WD1600BEVT-0", 4096},
+       {"ATA     WDC WD2500BEVT-0", 4096},
+       {"ATA     WDC WD3200BEVT-0", 4096},
+       {"ATA     WDC WD5000BEVT-0", 4096},
        /* Virtual disks: Assume zvols with default volblocksize */
 #if 0
        {"ATA     QEMU HARDDISK   ", 8192},