From patchwork Mon Feb 18 16:18:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 10818431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 220D5922 for ; Mon, 18 Feb 2019 16:21:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DFFB2B0C2 for ; Mon, 18 Feb 2019 16:21:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 026B42B0C5; Mon, 18 Feb 2019 16:21:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A26E12B297 for ; Mon, 18 Feb 2019 16:21:46 +0000 (UTC) Received: from localhost ([127.0.0.1]:33088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvlft-00088p-TX for patchwork-qemu-devel@patchwork.kernel.org; Mon, 18 Feb 2019 11:21:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvldO-0006GJ-Sm for qemu-devel@nongnu.org; Mon, 18 Feb 2019 11:19:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvldL-0002Nk-Jd for qemu-devel@nongnu.org; Mon, 18 Feb 2019 11:19:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37846) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gvldH-0002C5-Gk; Mon, 18 Feb 2019 11:19:03 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 42E633DE03; Mon, 18 Feb 2019 16:18:45 +0000 (UTC) Received: from dhcp-200-176.str.redhat.com (dhcp-200-176.str.redhat.com [10.33.200.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B3C15D70E; Mon, 18 Feb 2019 16:18:41 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 18 Feb 2019 17:18:10 +0100 Message-Id: <20190218161822.3573-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 18 Feb 2019 16:18:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 00/12] block: bdrv_set_aio_context() related fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Background for this series is the following bug report, which is about a crash with virtio-blk + iothread and request resubmission for werror/rerror: https://bugzilla.redhat.com/show_bug.cgi?id=1671173 The reason is that bdrv_set_aio_context() didn't correctly quiesce everything. Instead, it had a local hack to call aio_poll() for the source AioContext, which covered some, but not all cases, and is wrong because you can only call aio_poll() from the home thread. So this series tries to make bdrv_drain() actually drain the known cases (fixes virtio-blk and the NBD client) and use the regular drain functions in bdrv_set_aio_context() instead of open-coding something similar. Kevin Wolf (12): block-backend: Make blk_inc/dec_in_flight public virtio-blk: Increase in_flight for request restart BH nbd: Restrict connection_co reentrance io: Make qio_channel_yield() interruptible nbd: Move nbd_read_eof() to nbd/client.c nbd: Use low-level QIOChannel API in nbd_read_eof() nbd: Increase bs->in_flight during AioContext switch block: Don't poll in bdrv_set_aio_context() block: Fix AioContext switch for drained node test-bdrv-drain: AioContext switch in drained section block: Use normal drain for bdrv_set_aio_context() aio-posix: Assert that aio_poll() is always called in home thread block/nbd-client.h | 2 ++ include/block/nbd.h | 4 ++- include/io/channel.h | 9 +++-- include/sysemu/block-backend.h | 2 ++ nbd/nbd-internal.h | 19 ---------- block.c | 25 +++++++------- block/block-backend.c | 4 +-- block/nbd-client.c | 27 ++++++++++++++- hw/block/virtio-blk.c | 4 +++ io/channel.c | 10 ++++++ nbd/client.c | 63 ++++++++++++++++++++++++++++++++-- tests/test-bdrv-drain.c | 32 +++++++++++++++++ util/aio-posix.c | 3 +- 13 files changed, 162 insertions(+), 42 deletions(-)