Skip to content

Commit 3f6bc9e

Browse files
dhowellsbrauner
authored andcommitted
netfs: Fix kernel async DIO
Netfslib needs to be able to handle kernel-initiated asynchronous DIO that is supplied with a bio_vec[] array. Currently, because of the async flag, this gets passed to netfs_extract_user_iter() which throws a warning and fails because it only handles IOVEC and UBUF iterators. This can be triggered through a combination of cifs and a loopback blockdev with something like: mount //my/cifs/share /foo dd if=/dev/zero of=/foo/m0 bs=4K count=1K losetup --sector-size 4096 --direct-io=on /dev/loop2046 /foo/m0 echo hello >/dev/loop2046 This causes the following to appear in syslog: WARNING: CPU: 2 PID: 109 at fs/netfs/iterator.c:50 netfs_extract_user_iter+0x170/0x250 [netfs] and the write to fail. Fix this by removing the check in netfs_unbuffered_write_iter_locked() that causes async kernel DIO writes to be handled as userspace writes. Note that this change relies on the kernel caller maintaining the existence of the bio_vec array (or kvec[] or folio_queue) until the op is complete. Fixes: 153a996 ("netfs: Implement unbuffered/DIO write support") Reported-by: Nicolas Baranger <[email protected]> Closes: https://lore.kernel.org/r/[email protected]/ Signed-off-by: David Howells <[email protected]> Link: https://lore.kernel.org/r/[email protected] Tested-by: Nicolas Baranger <[email protected]> Acked-by: Paulo Alcantara (Red Hat) <[email protected]> cc: Steve French <[email protected]> cc: Jeff Layton <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent 482d520 commit 3f6bc9e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

fs/netfs/direct_write.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *
6767
* allocate a sufficiently large bvec array and may shorten the
6868
* request.
6969
*/
70-
if (async || user_backed_iter(iter)) {
70+
if (user_backed_iter(iter)) {
7171
n = netfs_extract_user_iter(iter, len, &wreq->iter, 0);
7272
if (n < 0) {
7373
ret = n;
@@ -77,6 +77,11 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *
7777
wreq->direct_bv_count = n;
7878
wreq->direct_bv_unpin = iov_iter_extract_will_pin(iter);
7979
} else {
80+
/* If this is a kernel-generated async DIO request,
81+
* assume that any resources the iterator points to
82+
* (eg. a bio_vec array) will persist till the end of
83+
* the op.
84+
*/
8085
wreq->iter = *iter;
8186
}
8287

0 commit comments

Comments
 (0)