Skip to content

Commit

Permalink
block: introduce BDRV_REQ_NO_WAIT flag
Browse files Browse the repository at this point in the history
Add flag to make serialising request no wait: if there are conflicting
requests, just return error immediately. It's will be used in upcoming
preallocate filter.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201021145859.11201-7-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
  • Loading branch information
Vladimir Sementsov-Ogievskiy authored and XanClic committed Dec 18, 2020
1 parent 8ac5aab commit d1a764d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
11 changes: 10 additions & 1 deletion block/io.c
Expand Up @@ -1858,9 +1858,18 @@ bdrv_co_write_req_prepare(BdrvChild *child, int64_t offset, uint64_t bytes,
assert(!(bs->open_flags & BDRV_O_INACTIVE));
assert((bs->open_flags & BDRV_O_NO_IO) == 0);
assert(!(flags & ~BDRV_REQ_MASK));
assert(!((flags & BDRV_REQ_NO_WAIT) && !(flags & BDRV_REQ_SERIALISING)));

if (flags & BDRV_REQ_SERIALISING) {
bdrv_make_request_serialising(req, bdrv_get_cluster_size(bs));
QEMU_LOCK_GUARD(&bs->reqs_lock);

tracked_request_set_serialising(req, bdrv_get_cluster_size(bs));

if ((flags & BDRV_REQ_NO_WAIT) && bdrv_find_conflicting_request(req)) {
return -EBUSY;
}

bdrv_wait_serialising_requests_locked(req);
} else {
bdrv_wait_serialising_requests(req);
}
Expand Down
9 changes: 8 additions & 1 deletion include/block/block.h
Expand Up @@ -77,8 +77,15 @@ typedef enum {
* written to qiov parameter which may be NULL.
*/
BDRV_REQ_PREFETCH = 0x200,

/*
* If we need to wait for other requests, just fail immediately. Used
* only together with BDRV_REQ_SERIALISING.
*/
BDRV_REQ_NO_WAIT = 0x400,

/* Mask of valid flags */
BDRV_REQ_MASK = 0x3ff,
BDRV_REQ_MASK = 0x7ff,
} BdrvRequestFlags;

typedef struct BlockSizes {
Expand Down

0 comments on commit d1a764d

Please sign in to comment.