From patchwork Wed Jan 16 18:25:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 212939 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 302192C0080 for ; Thu, 17 Jan 2013 05:26:10 +1100 (EST) Received: from localhost ([::1]:37773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvXge-0004ZM-BQ for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 13:26:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvXgU-0004Wl-W0 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 13:26:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvXgR-0007uk-Na for qemu-devel@nongnu.org; Wed, 16 Jan 2013 13:25:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvXgR-0007ue-Fd; Wed, 16 Jan 2013 13:25:55 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0GIPsmo001911 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Jan 2013 13:25:54 -0500 Received: from dhcp-5-188.str.redhat.com (vpn1-6-32.ams2.redhat.com [10.36.6.32]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r0GIPqVJ024797; Wed, 16 Jan 2013 13:25:53 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 19:25:51 +0100 Message-Id: <1358360751-1745-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-stable@nongnu.org, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2] aio-posix: Fix return value of aio_poll() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org aio_poll() must return true if any work is still pending, even if it didn't make progress, so that bdrv_drain_all() doesn't stop waiting too early. The possibility of stopping early occasionally lead to a failed assertion in bdrv_drain_all(), when some in-flight request was missed and the function didn't really drain all requests. In order to make that change, the return value as specified in the function comment must change for blocking = false; fortunately, the return value of blocking = false callers is only used in test cases, so this change shouldn't cause any trouble. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf --- aio-posix.c | 3 ++- aio-win32.c | 3 ++- include/block/aio.h | 6 ++---- tests/test-aio.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aio-posix.c b/aio-posix.c index 88d09e1..fe4dbb4 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -264,5 +264,6 @@ bool aio_poll(AioContext *ctx, bool blocking) } } - return progress; + assert(progress || busy); + return true; } diff --git a/aio-win32.c b/aio-win32.c index f5ea027..38723bf 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -214,5 +214,6 @@ bool aio_poll(AioContext *ctx, bool blocking) events[ret - WAIT_OBJECT_0] = events[--count]; } - return progress; + assert(progress || busy); + return true; } diff --git a/include/block/aio.h b/include/block/aio.h index 0933f05..8eda924 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -173,16 +173,14 @@ bool aio_pending(AioContext *ctx); * aio as a result of executing I/O completion or bh callbacks. * * If there is no pending AIO operation or completion (bottom half), - * return false. If there are pending bottom halves, return true. + * return false. If there are pending AIO operations of bottom halves, + * return true. * * If there are no pending bottom halves, but there are pending AIO * operations, it may not be possible to make any progress without * blocking. If @blocking is true, this function will wait until one * or more AIO events have completed, to ensure something has moved * before returning. - * - * If @blocking is false, this function will also return false if the - * function cannot make any progress without blocking. */ bool aio_poll(AioContext *ctx, bool blocking); diff --git a/tests/test-aio.c b/tests/test-aio.c index e4ebef7..c173870 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -315,13 +315,13 @@ static void test_wait_event_notifier_noflush(void) event_notifier_set(&data.e); g_assert(aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 1); - g_assert(!aio_poll(ctx, false)); + g_assert(aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 1); event_notifier_set(&data.e); g_assert(aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 2); - g_assert(!aio_poll(ctx, false)); + g_assert(aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 2); event_notifier_set(&dummy.e);