Commit 1ace7cea authored Feb 13, 2017 by Paolo Bonzini Committed by Stefan Hajnoczi Feb 21, 2017

coroutine-lock: add mutex argument to CoQueue APIs



All that CoQueue needs in order to become thread-safe is help
from an external mutex.  Add this to the API.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20170213181244.16297-6-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

parent f8c6e1cb

block/backup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ static void coroutine_fn wait_for_overlapping_requests(BackupBlockJob *job,
		retry = false;
		QLIST_FOREACH(req, &job->inflight_reqs, list) {
		if (end > req->start && start < req->end) {
		qemu_co_queue_wait(&req->wait_queue);
		qemu_co_queue_wait(&req->wait_queue, NULL);
		retry = true;
		break;
		}

block/io.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -539,7 +539,7 @@ static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self)
		* (instead of producing a deadlock in the former case). */
		if (!req->waiting_for) {
		self->waiting_for = req;
		qemu_co_queue_wait(&req->wait_queue);
		qemu_co_queue_wait(&req->wait_queue, NULL);
		self->waiting_for = NULL;
		retry = true;
		waited = true;
		@@ -2275,7 +2275,7 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs)

		/* Wait until any previous flushes are completed */
		while (bs->active_flush_req) {
		qemu_co_queue_wait(&bs->flush_queue);
		qemu_co_queue_wait(&bs->flush_queue, NULL);
		}

		bs->active_flush_req = true;

block/nbd-client.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ static void nbd_coroutine_start(NBDClientSession *s,
		/* Poor man semaphore. The free_sema is locked when no other request
		* can be accepted, and unlocked after receiving one reply. */
		if (s->in_flight == MAX_NBD_REQUESTS) {
		qemu_co_queue_wait(&s->free_sema);
		qemu_co_queue_wait(&s->free_sema, NULL);
		assert(s->in_flight < MAX_NBD_REQUESTS);
		}
		s->in_flight++;

block/qcow2-cluster.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -932,9 +932,7 @@ static int handle_dependencies(BlockDriverState *bs, uint64_t guest_offset,
		if (bytes == 0) {
		/* Wait for the dependency to complete. We need to recheck
		* the free/allocated clusters when we continue. */
		qemu_co_mutex_unlock(&s->lock);
		qemu_co_queue_wait(&old_alloc->dependent_requests);
		qemu_co_mutex_lock(&s->lock);
		qemu_co_queue_wait(&old_alloc->dependent_requests, &s->lock);
		return -EAGAIN;
		}
		}

block/sheepdog.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -486,7 +486,7 @@ static void wait_for_overlapping_aiocb(BDRVSheepdogState s, SheepdogAIOCB acb)
		retry:
		QLIST_FOREACH(cb, &s->inflight_aiocb_head, aiocb_siblings) {
		if (AIOCBOverlapping(acb, cb)) {
		qemu_co_queue_wait(&s->overlapping_queue);
		qemu_co_queue_wait(&s->overlapping_queue, NULL);
		goto retry;
		}
		}