From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g0R73-00027p-Gj for qemu-devel@nongnu.org; Thu, 13 Sep 2018 08:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g0R6y-0001eA-Cm for qemu-devel@nongnu.org; Thu, 13 Sep 2018 08:52:49 -0400 From: Kevin Wolf Date: Thu, 13 Sep 2018 14:52:03 +0200 Message-Id: <20180913125217.23173-4-kwolf@redhat.com> In-Reply-To: <20180913125217.23173-1-kwolf@redhat.com> References: <20180913125217.23173-1-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 03/17] aio-wait: Increase num_waiters even in home thread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, famz@redhat.com, pbonzini@redhat.com, slp@redhat.com, jsnow@redhat.com, qemu-devel@nongnu.org Even if AIO_WAIT_WHILE() is called in the home context of the AioContext, we still want to allow the condition to change depending on other threads as long as they kick the AioWait. Specfically block jobs can be running in an I/O thread and should then be able to kick a drain in the main loop context. Signed-off-by: Kevin Wolf Reviewed-by: Fam Zheng --- include/block/aio-wait.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/block/aio-wait.h b/include/block/aio-wait.h index c85a62f798..46ba7f9111 100644 --- a/include/block/aio-wait.h +++ b/include/block/aio-wait.h @@ -77,10 +77,12 @@ typedef struct { AioWait *wait_ = (wait); \ AioContext *ctx_ = (ctx); \ if (ctx_ && in_aio_context_home_thread(ctx_)) { \ + atomic_inc(&wait_->num_waiters); \ while ((cond)) { \ aio_poll(ctx_, true); \ waited_ = true; \ } \ + atomic_dec(&wait_->num_waiters); \ } else { \ assert(qemu_get_current_aio_context() == \ qemu_get_aio_context()); \ -- 2.13.6