block: Make wait/mark serialising requests public
Make both bdrv_mark_request_serialising() and bdrv_wait_serialising_requests() public so they can be used from block drivers. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz <mreitz@redhat.com> Message-id: 20191101152510.11719-2-mreitz@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
dcfbece684
commit
304d9d7f03
24
block/io.c
24
block/io.c
|
@ -715,7 +715,7 @@ static void tracked_request_begin(BdrvTrackedRequest *req,
|
||||||
qemu_co_mutex_unlock(&bs->reqs_lock);
|
qemu_co_mutex_unlock(&bs->reqs_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mark_request_serialising(BdrvTrackedRequest *req, uint64_t align)
|
void bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align)
|
||||||
{
|
{
|
||||||
int64_t overlap_offset = req->offset & ~(align - 1);
|
int64_t overlap_offset = req->offset & ~(align - 1);
|
||||||
uint64_t overlap_bytes = ROUND_UP(req->offset + req->bytes, align)
|
uint64_t overlap_bytes = ROUND_UP(req->offset + req->bytes, align)
|
||||||
|
@ -805,7 +805,7 @@ void bdrv_dec_in_flight(BlockDriverState *bs)
|
||||||
bdrv_wakeup(bs);
|
bdrv_wakeup(bs);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self)
|
bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self)
|
||||||
{
|
{
|
||||||
BlockDriverState *bs = self->bs;
|
BlockDriverState *bs = self->bs;
|
||||||
BdrvTrackedRequest *req;
|
BdrvTrackedRequest *req;
|
||||||
|
@ -1437,14 +1437,14 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild *child,
|
||||||
* with each other for the same cluster. For example, in copy-on-read
|
* with each other for the same cluster. For example, in copy-on-read
|
||||||
* it ensures that the CoR read and write operations are atomic and
|
* it ensures that the CoR read and write operations are atomic and
|
||||||
* guest writes cannot interleave between them. */
|
* guest writes cannot interleave between them. */
|
||||||
mark_request_serialising(req, bdrv_get_cluster_size(bs));
|
bdrv_mark_request_serialising(req, bdrv_get_cluster_size(bs));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* BDRV_REQ_SERIALISING is only for write operation */
|
/* BDRV_REQ_SERIALISING is only for write operation */
|
||||||
assert(!(flags & BDRV_REQ_SERIALISING));
|
assert(!(flags & BDRV_REQ_SERIALISING));
|
||||||
|
|
||||||
if (!(flags & BDRV_REQ_NO_SERIALISING)) {
|
if (!(flags & BDRV_REQ_NO_SERIALISING)) {
|
||||||
wait_serialising_requests(req);
|
bdrv_wait_serialising_requests(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & BDRV_REQ_COPY_ON_READ) {
|
if (flags & BDRV_REQ_COPY_ON_READ) {
|
||||||
|
@ -1841,10 +1841,10 @@ bdrv_co_write_req_prepare(BdrvChild *child, int64_t offset, uint64_t bytes,
|
||||||
assert(!(flags & ~BDRV_REQ_MASK));
|
assert(!(flags & ~BDRV_REQ_MASK));
|
||||||
|
|
||||||
if (flags & BDRV_REQ_SERIALISING) {
|
if (flags & BDRV_REQ_SERIALISING) {
|
||||||
mark_request_serialising(req, bdrv_get_cluster_size(bs));
|
bdrv_mark_request_serialising(req, bdrv_get_cluster_size(bs));
|
||||||
}
|
}
|
||||||
|
|
||||||
waited = wait_serialising_requests(req);
|
waited = bdrv_wait_serialising_requests(req);
|
||||||
|
|
||||||
assert(!waited || !req->serialising ||
|
assert(!waited || !req->serialising ||
|
||||||
is_request_serialising_and_aligned(req));
|
is_request_serialising_and_aligned(req));
|
||||||
|
@ -2008,8 +2008,8 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvChild *child,
|
||||||
|
|
||||||
padding = bdrv_init_padding(bs, offset, bytes, &pad);
|
padding = bdrv_init_padding(bs, offset, bytes, &pad);
|
||||||
if (padding) {
|
if (padding) {
|
||||||
mark_request_serialising(req, align);
|
bdrv_mark_request_serialising(req, align);
|
||||||
wait_serialising_requests(req);
|
bdrv_wait_serialising_requests(req);
|
||||||
|
|
||||||
bdrv_padding_rmw_read(child, req, &pad, true);
|
bdrv_padding_rmw_read(child, req, &pad, true);
|
||||||
|
|
||||||
|
@ -2111,8 +2111,8 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, &pad)) {
|
if (bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, &pad)) {
|
||||||
mark_request_serialising(&req, align);
|
bdrv_mark_request_serialising(&req, align);
|
||||||
wait_serialising_requests(&req);
|
bdrv_wait_serialising_requests(&req);
|
||||||
bdrv_padding_rmw_read(child, &req, &pad, false);
|
bdrv_padding_rmw_read(child, &req, &pad, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3205,7 +3205,7 @@ static int coroutine_fn bdrv_co_copy_range_internal(
|
||||||
/* BDRV_REQ_SERIALISING is only for write operation */
|
/* BDRV_REQ_SERIALISING is only for write operation */
|
||||||
assert(!(read_flags & BDRV_REQ_SERIALISING));
|
assert(!(read_flags & BDRV_REQ_SERIALISING));
|
||||||
if (!(read_flags & BDRV_REQ_NO_SERIALISING)) {
|
if (!(read_flags & BDRV_REQ_NO_SERIALISING)) {
|
||||||
wait_serialising_requests(&req);
|
bdrv_wait_serialising_requests(&req);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = src->bs->drv->bdrv_co_copy_range_from(src->bs,
|
ret = src->bs->drv->bdrv_co_copy_range_from(src->bs,
|
||||||
|
@ -3336,7 +3336,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
|
||||||
* new area, we need to make sure that no write requests are made to it
|
* new area, we need to make sure that no write requests are made to it
|
||||||
* concurrently or they might be overwritten by preallocation. */
|
* concurrently or they might be overwritten by preallocation. */
|
||||||
if (new_bytes) {
|
if (new_bytes) {
|
||||||
mark_request_serialising(&req, 1);
|
bdrv_mark_request_serialising(&req, 1);
|
||||||
}
|
}
|
||||||
if (bs->read_only) {
|
if (bs->read_only) {
|
||||||
error_setg(errp, "Image is read-only");
|
error_setg(errp, "Image is read-only");
|
||||||
|
|
|
@ -999,6 +999,9 @@ extern unsigned int bdrv_drain_all_count;
|
||||||
void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_parent);
|
void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_parent);
|
||||||
void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_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);
|
||||||
|
|
||||||
int get_tmp_filename(char *filename, int size);
|
int get_tmp_filename(char *filename, int size);
|
||||||
BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
|
BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
|
||||||
const char *filename);
|
const char *filename);
|
||||||
|
|
Loading…
Reference in a new issue