d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modify "4958 zdb trips assert on pools with ashift >= 0xe".

Browse Source 
Unlike Illumos FreeBSD has concept of logical ashift, that specifies
really minimal vdev block size that can be accessed.  This knowledge
allows properly pad physical I/O and correctly assert its alignment.

This change fixes L2ARC write errors when device has logical sector
size above 512 bytes.

MFC after:	1 month
This commit is contained in:
Alexander Motin 2016-03-29 19:18:34 +00:00
parent cb18f3f308
commit 86b0daa373
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
View File

@ -2775,10 +2775,19 @@ zio_vdev_io_start(zio_t *zio)
(void) atomic_cas_64(&spa->spa_last_io, old, new);
}
#ifdef illumos
align = 1ULL << vd->vdev_top->vdev_ashift;
if (!(zio->io_flags & ZIO_FLAG_PHYSICAL) &&
P2PHASE(zio->io_size, align) != 0) {
#else
if (zio->io_flags & ZIO_FLAG_PHYSICAL)
align = 1ULL << vd->vdev_top->vdev_logical_ashift;
else
align = 1ULL << vd->vdev_top->vdev_ashift;
if (P2PHASE(zio->io_size, align) != 0) {
#endif
/* Transform logical writes to be a full physical block size. */
uint64_t asize = P2ROUNDUP(zio->io_size, align);
char *abuf = NULL;
@ -2794,6 +2803,7 @@ zio_vdev_io_start(zio_t *zio)
zio_subblock);
}
#ifdef illumos
/*
* If this is not a physical io, make sure that it is properly aligned
* before proceeding.
@ -2809,6 +2819,10 @@ zio_vdev_io_start(zio_t *zio)
ASSERT0(P2PHASE(zio->io_offset, SPA_MINBLOCKSIZE));
ASSERT0(P2PHASE(zio->io_size, SPA_MINBLOCKSIZE));
}
#else
ASSERT0(P2PHASE(zio->io_offset, align));
ASSERT0(P2PHASE(zio->io_size, align));
#endif
VERIFY(zio->io_type == ZIO_TYPE_READ || spa_writeable(spa));