Received: from eggs.gnu.org ([2001:4830:134:3::10]:33272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coXrw-00016a-Ga for qemu-devel@nongnu.org; Thu, 16 Mar 2017 12:03:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coXrs-0000CH-MY for qemu-devel@nongnu.org; Thu, 16 Mar 2017 12:03:16 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:40046 helo=mx01.kamp.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coXrs-0000AQ-Dy for qemu-devel@nongnu.org; Thu, 16 Mar 2017 12:03:12 -0400 From: Peter Lieven Date: Thu, 16 Mar 2017 17:02:49 +0100 Message-Id: <1489680169-7638-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH for-2.9] thread-pool: add missing qemu_bh_cancel in completion function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, kwolf@redhat.com, stefanha@gmail.com, pbonzini@redhat.com, berrange@redhat.com, Peter Lieven , qemu-stable@nongnu.org commit 3c80ca15 fixed a deadlock scenarion with nested aio_poll invocations. However, the rescheduling of the completion BH introcuded unnecessary spinning in the main-loop. On very fast file backends this can even lead to the "WARNING: I/O thread spun for 1000 iterations" message popping up. Callgrind reports about 3-4% less instructions with this patch running qemu-img bench on a ramdisk based VMDK file. Fixes: 3c80ca158c96ff902a30883a8933e755988948b1 Cc: qemu-stable@nongnu.org Signed-off-by: Peter Lieven --- util/thread-pool.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/util/thread-pool.c b/util/thread-pool.c index ce6cd30..610646d 100644 --- a/util/thread-pool.c +++ b/util/thread-pool.c @@ -188,6 +188,13 @@ restart: aio_context_release(pool->ctx); elem->common.cb(elem->common.opaque, elem->ret); aio_context_acquire(pool->ctx); + + /* We can safely cancel the completion_bh here regardless of someone + * else having scheduled it meanwhile because we reenter the + * completion function anyway (goto restart). + */ + qemu_bh_cancel(pool->completion_bh); + qemu_aio_unref(elem); goto restart; } else { -- 1.9.1