The following changes since commit 928173659d6e5dc368284f73f90ea1d129e1f57d:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200130' into staging (2020-01-30 16:19:04 +0000)

https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 8dff69b9415b4287e900358744b732195e1ab2e2:

tests/qemu-iotests: use AIOMODE with various tests (2020-01-30 21:01:40 +0000)

Aarushi Mehta (15):

configure: permit use of io_uring

qapi/block-core: add option for io_uring

block/block: add BDRV flag for io_uring

block/io_uring: implements interfaces for io_uring

stubs: add stubs for io_uring interface

util/async: add aio interfaces for io_uring

blockdev: adds bdrv_parse_aio to use io_uring

block/file-posix.c: extend to use io_uring

block: add trace events for io_uring

block/io_uring: adds userspace completion polling

qemu-io: adds option to use aio engine

qemu-img: adds option to use aio engine for benchmarking

qemu-nbd: adds option for aio engines

tests/qemu-iotests: enable testing with aio options

tests/qemu-iotests: use AIOMODE with various tests

Paolo Bonzini (3):

block: eliminate BDRV_REQ_NO_SERIALISING

block/io: wait for serialising requests when a request becomes

serialising

block/io: take bs->reqs_lock in bdrv_mark_request_serialising

MAINTAINERS | 9 +

block.c | 22 ++

block/Makefile.objs | 3 +

block/file-posix.c | 99 ++++++--

block/io.c | 162 +++++++------

block/io_uring.c | 433 ++++++++++++++++++++++++++++++++++

block/trace-events | 12 +

blockdev.c | 12 +-

configure | 27 +++

docs/interop/qemu-nbd.rst | 4 +-

include/block/aio.h | 16 +-

include/block/block.h | 14 +-

include/block/block_int.h | 3 +-

include/block/raw-aio.h | 12 +

qapi/block-core.json | 4 +-

qemu-img-cmds.hx | 4 +-

qemu-img.c | 11 +-

qemu-img.texi | 5 +-

qemu-io.c | 25 +-

qemu-nbd.c | 12 +-

stubs/Makefile.objs | 1 +

stubs/io_uring.c | 32 +++

tests/qemu-iotests/028 | 2 +-

tests/qemu-iotests/058 | 2 +-

tests/qemu-iotests/089 | 4 +-

tests/qemu-iotests/091 | 4 +-

tests/qemu-iotests/109 | 2 +-

tests/qemu-iotests/147 | 5 +-

tests/qemu-iotests/181 | 8 +-

tests/qemu-iotests/183 | 4 +-

tests/qemu-iotests/185 | 10 +-

tests/qemu-iotests/200 | 2 +-

tests/qemu-iotests/201 | 8 +-

tests/qemu-iotests/check | 15 +-

tests/qemu-iotests/common.rc | 14 ++

tests/qemu-iotests/iotests.py | 12 +-

util/async.c | 36 +++

37 files changed, 878 insertions(+), 172 deletions(-)

create mode 100644 block/io_uring.c

create mode 100644 stubs/io_uring.c

2.24.1

From: Paolo Bonzini <pbonzini@redhat.com>

Marking without waiting would not result in actual serialising behavior.

Thus, make a call bdrv_mark_request_serialising sufficient for

serialisation to happen.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Message-id: 1578495356-46219-3-git-send-email-pbonzini@redhat.com

Message-Id: <1578495356-46219-3-git-send-email-pbonzini@redhat.com>

block/file-posix.c | 1 -

block/io.c | 40 +++++++++++++++++----------------------

include/block/block_int.h | 3 +--

3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c

--- a/block/file-posix.c

+++ b/block/file-posix.c

@@ -XXX,XX +XXX,XX @@ raw_do_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int bytes,

req->overlap_bytes = req->bytes;

bdrv_mark_request_serialising(req, bs->bl.request_alignment);

- bdrv_wait_serialising_requests(req);

}

#endif

diff --git a/block/io.c b/block/io.c

index XXXXXXX..XXXXXXX 100644

--- a/block/io.c

+++ b/block/io.c

@@ -XXX,XX +XXX,XX @@

#define MAX_BOUNCE_BUFFER (32768 << BDRV_SECTOR_BITS)

static void bdrv_parent_cb_resize(BlockDriverState *bs);

+static bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self);

static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,

int64_t offset, int bytes, BdrvRequestFlags flags);

@@ -XXX,XX +XXX,XX @@ static void tracked_request_begin(BdrvTrackedRequest *req,

qemu_co_mutex_unlock(&bs->reqs_lock);

-void bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align)

+bool bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align)

{

int64_t overlap_offset = req->offset & ~(align - 1);

uint64_t overlap_bytes = ROUND_UP(req->offset + req->bytes, align)

@@ -XXX,XX +XXX,XX @@ void bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align)

req->overlap_offset = MIN(req->overlap_offset, overlap_offset);

req->overlap_bytes = MAX(req->overlap_bytes, overlap_bytes);

-}

-

-static bool is_request_serialising_and_aligned(BdrvTrackedRequest *req)

-{

- /*

- * If the request is serialising, overlap_offset and overlap_bytes are set,

- * so we can check if the request is aligned. Otherwise, don't care and

- * return false.

- */

-

- return req->serialising && (req->offset == req->overlap_offset) &&

- (req->bytes == req->overlap_bytes);

+ return bdrv_wait_serialising_requests(req);

}

/**

@@ -XXX,XX +XXX,XX @@ void bdrv_dec_in_flight(BlockDriverState *bs)

bdrv_wakeup(bs);

}

-bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self)

+static bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self)

{

BlockDriverState *bs = self->bs;

BdrvTrackedRequest *req;

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild *child,

* it ensures that the CoR read and write operations are atomic and

* guest writes cannot interleave between them. */

bdrv_mark_request_serialising(req, bdrv_get_cluster_size(bs));

+ } else {

+ bdrv_wait_serialising_requests(req);

}

- bdrv_wait_serialising_requests(req);

-

if (flags & BDRV_REQ_COPY_ON_READ) {

int64_t pnum;

@@ -XXX,XX +XXX,XX @@ bdrv_co_write_req_prepare(BdrvChild *child, int64_t offset, uint64_t bytes,

assert(!(flags & ~BDRV_REQ_MASK));

if (flags & BDRV_REQ_SERIALISING) {

- bdrv_mark_request_serialising(req, bdrv_get_cluster_size(bs));

+ waited = bdrv_mark_request_serialising(req, bdrv_get_cluster_size(bs));

+ /*

+ * For a misaligned request we should have already waited earlier,

+ * because we come after bdrv_padding_rmw_read which must be called

+ * with the request already marked as serialising.

+ */

+ assert(!waited ||

+ (req->offset == req->overlap_offset &&

+ req->bytes == req->overlap_bytes));

+ } else {

+ bdrv_wait_serialising_requests(req);

}

- waited = bdrv_wait_serialising_requests(req);

-

- assert(!waited || !req->serialising ||

- is_request_serialising_and_aligned(req));

assert(req->overlap_offset <= offset);

assert(offset + bytes <= req->overlap_offset + req->overlap_bytes);

assert(end_sector <= bs->total_sectors || child->perm & BLK_PERM_RESIZE);

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvChild *child,

padding = bdrv_init_padding(bs, offset, bytes, &pad);

if (padding) {

bdrv_mark_request_serialising(req, align);

- bdrv_wait_serialising_requests(req);

bdrv_padding_rmw_read(child, req, &pad, true);

@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,

if (bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, &pad)) {

bdrv_mark_request_serialising(&req, align);

- bdrv_wait_serialising_requests(&req);

bdrv_padding_rmw_read(child, &req, &pad, false);

}

diff --git a/include/block/block_int.h b/include/block/block_int.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -XXX,XX +XXX,XX @@ extern unsigned int bdrv_drain_all_count;

void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_parent);

void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent);

-bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self);

-void bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align);

+bool coroutine_fn bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align);

BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_request(BlockDriverState *bs);

int get_tmp_filename(char *filename, int size);

2.24.1