From c9e4957ccb24c7edfa169a9742bb81dff5a7de45 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Tue, 25 Feb 2020 00:40:05 +0000 Subject: [PATCH] New ioctl DIOCGPHYSSECTORSIZE for disks. Like DIOCGSECTORSIZE, but returns the `physical' sector size, which is the smallest natural unit of I/O for the medium, rather than the smallest unit the medium supports by doing R/M/W cycles. Use it to let zpool figure realize that doing 512-byte writes on a disk that naturally wants 4096-byte disks. --- .../cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c | 15 ++++++++++++++- sys/dev/ata/wd.c | 15 ++++++++++++++- sys/dev/ata/wdvar.h | 1 + sys/sys/dkio.h | 3 +++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c index 000174281f46..a8dfff5d9386 100644 --- a/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c +++ b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c @@ -151,6 +151,7 @@ vdev_disk_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize, struct disk *pdk; int error, cmd; struct partinfo pinfo; + unsigned physsecsize; /* * We must have a pathname, and it must be absolute. @@ -292,7 +293,19 @@ skip_open: *max_psize = *psize; *ashift = highbit(MAX(pinfo.pi_secsize, SPA_MINBLOCKSIZE)) - 1; - *pashift = *ashift; + + /* + * Try to determine whether the disk has a preferred physical + * sector size even if it can emulate a smaller logical sector + * size with r/m/w cycles, e.g. a disk with 4096-byte sectors + * that for compatibility claims to support 512-byte ones. + */ + if (VOP_IOCTL(vp, DIOCGPHYSSECTORSIZE, &physsecsize, FREAD, + NOCRED) == 0) + *pashift = highbit(physsecsize) - 1; + else + *pashift = *ashift; + vd->vdev_wholedisk = (pinfo.pi_offset == 0); /* XXXNETBSD */ /* diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 039fd844c0d5..d02b5e491a85 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -430,16 +430,25 @@ wdattach(device_t parent, device_t self, void *aux) } else { wd->sc_blksize = 512; } + wd->sc_physblksize = wd->sc_blksize; + if ((wd->sc_params.atap_secsz & ATA_SECSZ_VALID_MASK) == ATA_SECSZ_VALID + && ((wd->sc_params.atap_secsz & ATA_SECSZ_LPS) != 0)) { + wd->sc_physblksize <<= + wd->sc_params.atap_secsz & ATA_SECSZ_LPS_SZMSK; + } wd->sc_capacity512 = (wd->sc_capacity * wd->sc_blksize) / DEV_BSIZE; format_bytes(pbuf, sizeof(pbuf), wd->sc_capacity * wd->sc_blksize); aprint_normal_dev(self, "%s, %d cyl, %d head, %d sec, " - "%d bytes/sect x %llu sectors\n", + "%d bytes/sect x %llu sectors", pbuf, (wd->sc_flags & WDF_LBA) ? (int)(wd->sc_capacity / (wd->sc_params.atap_heads * wd->sc_params.atap_sectors)) : wd->sc_params.atap_cylinders, wd->sc_params.atap_heads, wd->sc_params.atap_sectors, wd->sc_blksize, (unsigned long long)wd->sc_capacity); + if (wd->sc_physblksize != wd->sc_blksize) + aprint_normal(" (%d bytes/physsect)\n", wd->sc_physblksize); + aprint_normal("\n"); ATADEBUG_PRINT(("%s: atap_dmatiming_mimi=%d, atap_dmatiming_recom=%d\n", device_xname(self), wd->sc_params.atap_dmatiming_mimi, @@ -1409,6 +1418,10 @@ wdioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l) return(error1); } + case DIOCGPHYSSECTORSIZE: + *(u_int *)addr = wd->sc_physblksize; + return 0; + default: return dk_ioctl(dksc, dev, cmd, addr, flag, l); } diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h index 2f13ded15e38..1cd371ade736 100644 --- a/sys/dev/ata/wdvar.h +++ b/sys/dev/ata/wdvar.h @@ -59,6 +59,7 @@ struct wd_softc { uint64_t sc_capacity512; /* ... in DEV_BSIZE blocks */ uint32_t sc_capacity28; /* capacity accessible with LBA28 commands */ uint32_t sc_blksize; /* logical block size, in bytes */ + uint32_t sc_physblksize; /* physical block size, in bytes */ #ifdef WD_SOFTBADSECT SLIST_HEAD(, disk_badsectors) sc_bslist; diff --git a/sys/sys/dkio.h b/sys/sys/dkio.h index 84046268d0a4..634a7c14e9c0 100644 --- a/sys/sys/dkio.h +++ b/sys/sys/dkio.h @@ -133,4 +133,7 @@ /* mass removal */ #define DIOCRMWEDGES _IOR('d', 134, int) /* remove all wedges */ + /* physical sector size */ +#define DIOCGPHYSSECTORSIZE _IOR('d', 135, u_int) /* phys sector size, bytes */ + #endif /* _SYS_DKIO_H_ */