sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

vfs_io_uring: retry after a short read in vfs_io_uring_pread_completion()

Browse Source 
We need to be prepared for short reads from the kernel depending on
the state of the page cache. Windows and Mac clients don't
expect short reads for files, so we need to retry ourself.

For the future we may be able to play with some io_uring flags
in order to avoid the retries in userspace, but for now we just fix
the data corruption bug...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14361

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2020-05-08 13:30:17 +02:00 committed by Jeremy Allison
parent c57a731c4c
commit 42e77c4cf2
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source3/modules/vfs_io_uring.c
View File

@ -489,6 +489,14 @@ static void vfs_io_uring_pread_completion(struct vfs_io_uring_request *cur,
return; return;
} }
if (cur->cqe.res == 0) {
/*
* We reached EOF, we're done
*/
tevent_req_done(cur->req);
return;
}
ok = iov_advance(&iov, &num_iov, cur->cqe.res); ok = iov_advance(&iov, &num_iov, cur->cqe.res);
if (!ok) { if (!ok) {
/* This is not expected! */ /* This is not expected! */
@ -499,8 +507,20 @@ static void vfs_io_uring_pread_completion(struct vfs_io_uring_request *cur,
return; return;
} }
state->nread = state->ur.cqe.res; /* sys_valid_io_range() already checked the boundaries */
tevent_req_done(cur->req); state->nread += state->ur.cqe.res;
if (num_iov == 0) {
/* We're done */
tevent_req_done(cur->req);
return;
}
/*
* sys_valid_io_range() already checked the boundaries
* now try to get the rest.
*/
state->offset += state->ur.cqe.res;
vfs_io_uring_pread_submit(state);
} }
static ssize_t vfs_io_uring_pread_recv(struct tevent_req *req, static ssize_t vfs_io_uring_pread_recv(struct tevent_req *req,