diff options
| author | Brian Behlendorf <[email protected]> | 2016-06-29 13:59:51 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-07-27 13:38:46 -0700 |
| commit | fcf64f45d9bf4270f6c6bfe9df6ef253a7bfc766 (patch) | |
| tree | 94d97899f6eb1e8e18e1c1a53fef3ba8eee033cc /module/zfs/zio.c | |
| parent | a0cacb760a0d9de2be3f2f569cb0febd77d7064a (diff) | |
Fix zdb crash with 4K-only devices
Here's the problem - on 4K native devices in userland on
Linux using O_DIRECT, buffers must be 4K aligned or I/O
will fail with EINVAL, causing zdb (and others) to coredump.
Since userland probably doesn't need optimized buffer caches,
we just force 4K alignment on everything.
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Gvozden Neskovic <[email protected]>
Closes #4479
Diffstat (limited to 'module/zfs/zio.c')
| -rw-r--r-- | module/zfs/zio.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/module/zfs/zio.c b/module/zfs/zio.c index de56a1283..3dd8cffe9 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -143,12 +143,21 @@ zio_init(void) */ if (arc_watch && !IS_P2ALIGNED(size, PAGESIZE)) continue; -#endif + /* + * Here's the problem - on 4K native devices in userland on + * Linux using O_DIRECT, buffers must be 4K aligned or I/O + * will fail with EINVAL, causing zdb (and others) to coredump. + * Since userland probably doesn't need optimized buffer caches, + * we just force 4K alignment on everything. + */ + align = 8 * SPA_MINBLOCKSIZE; +#else if (size <= 4 * SPA_MINBLOCKSIZE) { align = SPA_MINBLOCKSIZE; } else if (IS_P2ALIGNED(size, p2 >> 2)) { align = MIN(p2 >> 2, PAGESIZE); } +#endif if (align != 0) { char name[36]; |