openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pull request 

The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the
 request needs to be resubmitted.
 
 The MAINTAINERS changes carry no risk and we might as well include them in QEMU
 6.1.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmEC1bwACgkQnKSrs4Gr
 c8g8LAf9GsnEPZPpqgKw48dZLaT2sYnrEXgGMVrLlAYp7gUL9fUEGvDn3ORTjEHW
 ERWNI/ppeN9E+bLCtpuZtZpACR4/x4pSelXpN7N+OIQELxIM1R5FIARrcjd0zlUG
 BmyINDn5fUvsS6LeeD/PALdNsQK3KZfpgiHpiEvmOVQ7HRdpH6LXyIAq653QwWpR
 B9YpUu8RG/PqdbNFWVfOWYzobBqy4wwIjR4KIWH9l8QOY2QtgqehqPLl7v4i2mIv
 yxDEtLwCL053+Y6J0PP+jULVsFpcNMeZwa/0ox1SDWP71NstKejQL+WM6ZNLraV/
 vTxQbQ65LhAR1HHYKLMRWXFou/ih9w==
 =ltc/
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging

Pull request

The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the
request needs to be resubmitted.

The MAINTAINERS changes carry no risk and we might as well include them in QEMU
6.1.

# gpg: Signature made Thu 29 Jul 2021 17:22:20 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha-gitlab/tags/block-pull-request:
  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
  block/io_uring: resubmit when result is -EAGAIN
  MAINTAINERS: add Stefano Garzarella as io_uring reviewer

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-07-30 09:14:56 +01:00
parent 7742fe64e5 cc8eecd7f1
commit dbdc621be9
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -3177,6 +3177,7 @@ F: block/null.c
NVMe Block Driver
M: Stefan Hajnoczi <stefanha@redhat.com>
R: Fam Zheng <fam@euphon.net>
R: Philippe Mathieu-Daudé <philmd@redhat.com>
L: qemu-block@nongnu.org
S: Supported
F: block/nvme*
@ -3256,6 +3257,7 @@ Linux io_uring
M: Aarushi Mehta <mehta.aaru20@gmail.com>
M: Julia Suvorova <jusual@redhat.com>
M: Stefan Hajnoczi <stefanha@redhat.com>
R: Stefano Garzarella <sgarzare@redhat.com>
L: qemu-block@nongnu.org
S: Maintained
F: block/io_uring.c

16
block/io_uring.c
View File

@ -165,7 +165,21 @@ static void luring_process_completions(LuringState *s)
total_bytes = ret + luringcb->total_read;
if (ret < 0) {
if (ret == -EINTR) {
/*
* Only writev/readv/fsync requests on regular files or host block
* devices are submitted. Therefore -EAGAIN is not expected but it's
* known to happen sometimes with Linux SCSI. Submit again and hope
* the request completes successfully.
*
* For more information, see:
* https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
*
* If the code is changed to submit other types of requests in the
* future, then this workaround may need to be extended to deal with
* genuine -EAGAIN results that should not be resubmitted
* immediately.
*/
if (ret == -EINTR || ret == -EAGAIN) {
luring_resubmit(s, luringcb);
continue;
}