diff options
| author | Rich Ercolani <[email protected]> | 2021-09-20 13:30:50 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-09-20 10:30:50 -0700 |
| commit | 59eab1093a361ca76849ca76b2ec079c8736e8e3 (patch) | |
| tree | 60fb341fef9c77919f5de628b579a41937608503 | |
| parent | 1d901c3ee5965e9b3b4c33cd40942bcf9df2531a (diff) | |
Handle partial reads in zfs_read
Currently, dmu_read_uio_dnode can read 64K of a requested 1M in one
loop, get EFAULT back from zfs_uiomove() (because the iovec only holds
64k), and return EFAULT, which turns into EAGAIN on the way out. EAGAIN
gets interpreted as "I didn't read anything", the caller tries again
without consuming the 64k we already read, and we're stuck.
This apparently works on newer kernels because the caller which breaks
on older Linux kernels by happily passing along a 1M read request and a
64k iovec just requests 64k at a time.
With this, we now won't return EFAULT if we got a partial read.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Rich Ercolani <[email protected]>
Closes #12370
Closes #12509
Closes #12516
| -rw-r--r-- | module/zfs/zfs_vnops.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c index 8229bc9a9..9bd75c011 100644 --- a/module/zfs/zfs_vnops.c +++ b/module/zfs/zfs_vnops.c @@ -254,6 +254,7 @@ zfs_read(struct znode *zp, zfs_uio_t *uio, int ioflag, cred_t *cr) } ASSERT(zfs_uio_offset(uio) < zp->z_size); + ssize_t start_offset = zfs_uio_offset(uio); ssize_t n = MIN(zfs_uio_resid(uio), zp->z_size - zfs_uio_offset(uio)); ssize_t start_resid = n; @@ -276,6 +277,13 @@ zfs_read(struct znode *zp, zfs_uio_t *uio, int ioflag, cred_t *cr) /* convert checksum errors into IO errors */ if (error == ECKSUM) error = SET_ERROR(EIO); + /* + * if we actually read some bytes, bubbling EFAULT + * up to become EAGAIN isn't what we want here. + */ + if (error == EFAULT && + (zfs_uio_offset(uio) - start_offset) != 0) + error = 0; break; } |