netfs: Miscellaneous fixes
Subsystems (9)
David Howells
maintainercover netfs: Miscellaneous fixes
Hi Christian,
Here are a couple of fixes for netfslib:
(1) Fix an i_dio_count leak on a DIO read starting beyond EOF.
(2) Fix a missing zero-length check in an unbuffered write causing 9p to indicate EIO.
The patches can also be found here:
https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=netfs-fixes
Thanks,
David
David Howells (1):
netfs: Fix missing zero-length check in unbuffered write
Marc Dionne (1):
netfs: Fix i_dio_count leak on DIO read past i_size
fs/netfs/buffered_write.c | 3 +++ fs/netfs/direct_write.c | 5 ++++- fs/netfs/io.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-)
David Howells
maintainerPATCH 1/2 netfs: Fix i_dio_count leak on DIO read past i_size
From: Marc Dionne <[email protected]>
If netfs_begin_read gets a NETFS_DIO_READ request that begins past i_size, it won't perform any i/o and just return 0. This will leak an increment to i_dio_count that is done at the top of the function.
This can cause subsequent buffered read requests to block indefinitely, waiting for a non existing dio operation to complete.
Add a inode_dio_end() for the NETFS_DIO_READ case, before returning.
--- fs/netfs/io.c | 2 ++ 1 file changed, 2 insertions(+)
fs/netfs/io.c +2 -0
@@ -748,6 +748,8 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync)if (!rreq->submitted) {netfs_put_request (rreq, false, netfs_rreq_trace_put_no_submit); +if (rreq->origin ==NETFS_DIO_READ ) +inode_dio_end (rreq->inode); ret =0 ; goto out; }
Re: [PATCH 1/2] netfs: Fix i_dio_count leak on DIO read past i_size
Quoted 29 lines · David Howells
From: Marc Dionne <[email protected]>
If
netfs_begin_readgets aNETFS_DIO_READrequest that begins pasti_size, it won't perform any i/o and just return 0. This will leak an increment toi_dio_countthat is done at the top of the function.This can cause subsequent buffered read requests to block indefinitely, waiting for a non existing dio operation to complete.
Add a
inode_dio_end()for theNETFS_DIO_READcase, before returning.Signed-off-by Marc Dionne <[email protected]>Signed-off-by David Howells <[email protected]>cc Jeff Layton <[email protected]>--- fs/netfs/io.c | 2 ++ 1 file changed, 2 insertions(+)fs/netfs/io.c +0
-0
fs/netfs/io.c int netfs_begin_read(struct netfs_io_request *rreq, bool sync) · line 755
Quoted 8 lines
fs/netfs/io.c +2
-0@@ -748,6 +748,8 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync)if (!rreq->submitted) {netfs_put_request (rreq, false, netfs_rreq_trace_put_no_submit); +if (rreq->origin ==NETFS_DIO_READ ) +inode_dio_end (rreq->inode); ret =0 ; goto out; }
David Howells
maintainerPATCH 2/2 netfs: Fix missing zero-length check in unbuffered write
In reply to David HowellsFix netfs_unbuffered_write_iter() to return immediately if generic_write_checks() returns 0, indicating there's nothing to write. Note that netfs_file_write_iter() already does this.
Also, whilst we're at it, put in checks for the size being zero before we even take the locks. Note that generic_write_checks() can still reduce the size to zero, so we still need that check.
Without this, a warning similar to the following is logged to dmesg:
netfs: Zero-sized write [R=1b6da]
and the syscall fails with EIO, e.g.:
/sbin/ldconfig.real: Writing of cache extension data failed: Input/output error
This can be reproduced on 9p by:
xfs_io -f -c 'pwrite 0 0' /xfstest.test/foo
--- fs/netfs/buffered_write.c | 3 +++ fs/netfs/direct_write.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)
fs/netfs/buffered_write.c +3 -0
@@ -477,6 +477,9 @@ ssize_t netfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)_enter ("%llx,%zx,%llx" , iocb->ki_pos,iov_iter_count (from),i_size_read (inode)); +if (!iov_iter_count (from)) +return 0 ; +if ((iocb->ki_flags &IOCB_DIRECT ) ||test_bit (NETFS_ICTX_UNBUFFERED , &ictx->flags))return netfs_unbuffered_write_iter (iocb, from);
fs/netfs/direct_write.c +4 -1
@@ -139,6 +139,9 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)_enter ("%llx,%zx,%llx" , iocb->ki_pos,iov_iter_count (from),i_size_read (inode)); +if (!iov_iter_count (from)) +return 0 ; +trace_netfs_write_iter (iocb, from);netfs_stat (&netfs_n_rh_dio_write);
@@ -146,7 +149,7 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)if (ret <0 )return ret; ret =generic_write_checks (iocb, from); -if (ret <0 ) +if (ret <=0 ) goto out; ret =file_remove_privs (file);if (ret <0 )
Re: [PATCH 2/2] netfs: Fix missing zero-length check in unbuffered write
Quoted 65 lines · David Howells
Fix
netfs_unbuffered_write_iter()to return immediately ifgeneric_write_checks()returns 0, indicating there's nothing to write. Note thatnetfs_file_write_iter()already does this.Also, whilst we're at it, put in checks for the size being zero before we even take the locks. Note that
generic_write_checks()can still reduce the size to zero, so we still need that check.Without this, a warning similar to the following is logged to dmesg:
netfs: Zero-sized write [R=1b6da]
and the syscall fails with EIO, e.g.:
/sbin/ldconfig.real: Writing of cache extension data failed: Input/output errorThis can be reproduced on 9p by:
xfs_io-f -c 'pwrite 0 0' /xfstest.test/fooFixes 153a9961b551 ("netfs: Implement unbuffered/DIO write support")Reported-by Eric Van Hensbergen <[email protected]>Signed-off-by David Howells <[email protected]>cc Dominique Martinet <[email protected]>cc Jeff Layton <[email protected]>--- fs/netfs/buffered_write.c | 3 +++ fs/netfs/direct_write.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)fs/netfs/buffered_write.c +3
-0@@ -477,6 +477,9 @@ ssize_t netfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)_enter ("%llx,%zx,%llx" , iocb->ki_pos,iov_iter_count (from),i_size_read (inode)); +if (!iov_iter_count (from)) +return 0 ; +if ((iocb->ki_flags &IOCB_DIRECT ) ||test_bit (NETFS_ICTX_UNBUFFERED , &ictx->flags))return netfs_unbuffered_write_iter (iocb, from);fs/netfs/direct_write.c +3
-0@@ -139,6 +139,9 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)_enter ("%llx,%zx,%llx" , iocb->ki_pos,iov_iter_count (from),i_size_read (inode)); +if (!iov_iter_count (from)) +return 0 ; +trace_netfs_write_iter (iocb, from);netfs_stat (&netfs_n_rh_dio_write);
fs/netfs/direct_write.c ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from) · line 155
Quoted 8 lines
fs/netfs/direct_write.c +1
-1@@ -146,7 +149,7 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)if (ret <0 )return ret; ret =generic_write_checks (iocb, from); -if (ret <0 ) +if (ret <=0 ) goto out; ret =file_remove_privs (file);if (ret <0 )
Re: [PATCH 2/2] netfs: Fix missing zero-length check in unbuffered write
In reply to David HowellsDavid Howells wrote on Mon, Jan 29, 2024 at 09:49:19AM +0000:
Quoted 18 lines
Fix
netfs_unbuffered_write_iter()to return immediately ifgeneric_write_checks()returns 0, indicating there's nothing to write. Note thatnetfs_file_write_iter()already does this.Also, whilst we're at it, put in checks for the size being zero before we even take the locks. Note that
generic_write_checks()can still reduce the size to zero, so we still need that check.Without this, a warning similar to the following is logged to dmesg:
netfs: Zero-sized write [R=1b6da]
and the syscall fails with EIO, e.g.:
/sbin/ldconfig.real: Writing of cache extension data failed: Input/output errorThis can be reproduced on 9p by:
Quoted 7 lines
xfs_io-f -c 'pwrite 0 0' /xfstest.test/fooFixes 153a9961b551 ("netfs: Implement unbuffered/DIO write support")Reported-by Eric Van Hensbergen <[email protected]>Signed-off-by David Howells <[email protected]>cc Dominique Martinet <[email protected]>
Thanks!
Signature · 1 line
Dominique Martinet | Asmadeus
Re: [PATCH 2/2] netfs: Fix missing zero-length check in unbuffered write
In reply to David HowellsQuoted 16 lines · David Howells
Fix
netfs_unbuffered_write_iter()to return immediately ifgeneric_write_checks()returns 0, indicating there's nothing to write. Note thatnetfs_file_write_iter()already does this.Also, whilst we're at it, put in checks for the size being zero before we even take the locks. Note that
generic_write_checks()can still reduce the size to zero, so we still need that check.Without this, a warning similar to the following is logged to dmesg:
netfs: Zero-sized write [R=1b6da]
and the syscall fails with EIO, e.g.:
/sbin/ldconfig.real: Writing of cache extension data failed: Input/output error
Quoted 7 lines
This can be reproduced on 9p by:
xfs_io-f -c 'pwrite 0 0' /xfstest.test/fooFixes 153a9961b551 ("netfs: Implement unbuffered/DIO write support")Reported-by Eric Van Hensbergen <[email protected]>
David, thx for fixing Eric's regression, which I'm tracking.
Christian, just wondering: that patch afaics is sitting in vfs.netfs for about three weeks now -- is that intentional or did it maybe fell through the cracks somehow?
Quoted 1 line
[...]
Ciao, Thorsten (wearing his 'the Linux kernel's regression tracker' hat) --
Everything you wanna know about Linux kernel regression tracking:
https://linux-regtracking.leemhuis.info/about/#tldr
If I did something stupid, please tell me, as explained on that page.
Christian Brauner
maintainerRe: [PATCH 2/2] netfs: Fix missing zero-length check in unbuffered write
Quoted 25 lines · Linux regression tracking (Thorsten Leemhuis)
Quoted 16 lines · David Howells
Fix
netfs_unbuffered_write_iter()to return immediately ifgeneric_write_checks()returns 0, indicating there's nothing to write. Note thatnetfs_file_write_iter()already does this.Also, whilst we're at it, put in checks for the size being zero before we even take the locks. Note that
generic_write_checks()can still reduce the size to zero, so we still need that check.Without this, a warning similar to the following is logged to dmesg:
netfs: Zero-sized write [R=1b6da]
and the syscall fails with EIO, e.g.:
/sbin/ldconfig.real: Writing of cache extension data failed: Input/output errorQuoted 7 lines
This can be reproduced on 9p by:
xfs_io-f -c 'pwrite 0 0' /xfstest.test/fooFixes 153a9961b551 ("netfs: Implement unbuffered/DIO write support")Reported-by Eric Van Hensbergen <[email protected]>
Quoted 5 lines
David, thx for fixing Eric's regression, which I'm tracking.
Christian, just wondering: that patch afaics is sitting in vfs.netfs for about three weeks now -- is that intentional or did it maybe fell through the cracks somehow?
I've moved it to vfs.fixes now and will send later this week. Thanks for the reminder!
Quoted 8 lines · David Howells
Here are a couple of fixes for netfslib:
(1) Fix an
i_dio_countleak on a DIO read starting beyond EOF.(2) Fix a missing zero-length check in an unbuffered write causing 9p to indicate EIO.
[...]
Applied to the vfs.netfs branch of the vfs/vfs.git tree. Patches in the vfs.netfs branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.netfs
[1/2] netfs: Fix i_dio_count leak on DIO read past i_size
https://git.kernel.org/vfs/vfs/c/a4bb694db189 [2/2] netfs: Fix missing zero-length check in unbuffered write https://git.kernel.org/vfs/vfs/c/2d6e065e2431