From patchwork Tue May 16 19:02:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 13243524 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BAE48C77B75 for ; Tue, 16 May 2023 19:03:14 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.535454.833168 (Exim 4.92) (envelope-from ) id 1pyzwm-0002Ug-SK; Tue, 16 May 2023 19:02:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 535454.833168; Tue, 16 May 2023 19:02:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pyzwm-0002UZ-Od; Tue, 16 May 2023 19:02:56 +0000 Received: by outflank-mailman (input) for mailman id 535454; Tue, 16 May 2023 19:02:55 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pyzwl-0002US-Hz for xen-devel@lists.xenproject.org; Tue, 16 May 2023 19:02:55 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 411fffb8-f41c-11ed-8611-37d641c3527e; Tue, 16 May 2023 21:02:52 +0200 (CEST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-170-nJeA-3YaMay_1Lj1RYmoHw-1; Tue, 16 May 2023 15:02:47 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3E45586C60F; Tue, 16 May 2023 19:02:46 +0000 (UTC) Received: from localhost (unknown [10.39.192.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id B453C4021D9; Tue, 16 May 2023 19:02:44 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 411fffb8-f41c-11ed-8611-37d641c3527e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684263770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSavnLJy34agtHvxXyiVShndCbcr4jJazu6AYV1BQac=; b=TyQL9RBAGHXzgu7zC7j7phD1K0+mrRdy+VNiYtVy9so8RdpAMVbMj9n38qnjd2+h0YqfBK 0jamgNj3Cu/CuwKb2erCf/iiabthqm9draWkDEB8NT1z3FDr9Z+yOnf4Or7Tfny7KknTys 1crt6SZfDmB4r5sKmIXhupk2JcLJYuc= X-MC-Unique: nJeA-3YaMay_1Lj1RYmoHw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Coiby Xu , Marcel Apfelbaum , "Michael S. Tsirkin" , "Richard W.M. Jones" , Peter Xu , xen-devel@lists.xenproject.org, Kevin Wolf , Ronnie Sahlberg , Stefano Stabellini , Richard Henderson , Stefan Hajnoczi , Julia Suvorova , Hanna Reitz , Leonardo Bras , eesposit@redhat.com, Fam Zheng , Aarushi Mehta , David Woodhouse , Xie Yongji , Stefano Garzarella , qemu-block@nongnu.org, Eduardo Habkost , Paul Durrant , Stefan Weil , Anthony Perard , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Lieven , Paolo Bonzini , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= , Juan Quintela Subject: [PATCH v6 00/20] block: remove aio_disable_external() API Date: Tue, 16 May 2023 15:02:18 -0400 Message-Id: <20230516190238.8401-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 v6: - Fix scsi_device_unrealize() -> scsi_qdev_unrealize() mistake in Patch 4 commit description [Kevin] - Explain why we don't schedule a BH in .drained_begin() in Patch 16 [Kevin] - Copy the comment explaining why the event notifier is tested and cleared in Patch 16 [Kevin] - Fix EPOLL_ENABLE_THRESHOLD mismerge in util/fdmon-epoll.c [Kevin] v5: - Use atomic accesses for in_flight counter in vhost-user-server.c [Kevin] - Stash SCSIDevice id/lun values for VIRTIO_SCSI_T_TRANSPORT_RESET event before unrealizing the SCSIDevice [Kevin] - Keep vhost-user-blk export .detach() callback so ctx is set to NULL [Kevin] - Narrow BdrvChildClass and BlockDriver drained_{begin/end/poll} callbacks from IO_OR_GS_CODE() to GLOBAL_STATE_CODE() [Kevin] - Include Kevin's "block: Fix use after free in blockdev_mark_auto_del()" to fix a latent bug that was exposed by this series v4: - Remove external_disable_cnt variable [Philippe] - Add Patch 1 to fix assertion failure in .drained_end() -> blk_get_aio_context() v3: - Resend full patch series. v2 was sent in the middle of a git rebase and was missing patches. [Eric] - Apply Reviewed-by tags. v2: - Do not rely on BlockBackend request queuing, implement .drained_begin/end() instead in xen-block, virtio-blk, and virtio-scsi [Paolo] - Add qdev_is_realized() API [Philippe] - Add patch to avoid AioContext lock around blk_exp_ref/unref() [Paolo] - Add patch to call .drained_begin/end() from main loop thread to simplify callback implementations The aio_disable_external() API temporarily suspends file descriptor monitoring in the event loop. The block layer uses this to prevent new I/O requests being submitted from the guest and elsewhere between bdrv_drained_begin() and bdrv_drained_end(). While the block layer still needs to prevent new I/O requests in drained sections, the aio_disable_external() API can be replaced with .drained_begin/end/poll() callbacks that have been added to BdrvChildClass and BlockDevOps. This newer .bdrained_begin/end/poll() approach is attractive because it works without specifying a specific AioContext. The block layer is moving towards multi-queue and that means multiple AioContexts may be processing I/O simultaneously. The aio_disable_external() was always somewhat hacky. It suspends all file descriptors that were registered with is_external=true, even if they have nothing to do with the BlockDriverState graph nodes that are being drained. It's better to solve a block layer problem in the block layer than to have an odd event loop API solution. The approach in this patch series is to implement BlockDevOps .drained_begin/end() callbacks that temporarily stop file descriptor handlers. This ensures that new I/O requests are not submitted in drained sections. Stefan Hajnoczi (20): block-backend: split blk_do_set_aio_context() hw/qdev: introduce qdev_is_realized() helper virtio-scsi: avoid race between unplug and transport event virtio-scsi: stop using aio_disable_external() during unplug util/vhost-user-server: rename refcount to in_flight counter block/export: wait for vhost-user-blk requests when draining block/export: stop using is_external in vhost-user-blk server hw/xen: do not use aio_set_fd_handler(is_external=true) in xen_xenstore block: add blk_in_drain() API block: drain from main loop thread in bdrv_co_yield_to_drain() xen-block: implement BlockDevOps->drained_begin() hw/xen: do not set is_external=true on evtchn fds block/export: rewrite vduse-blk drain code block/export: don't require AioContext lock around blk_exp_ref/unref() block/fuse: do not set is_external=true on FUSE fd virtio: make it possible to detach host notifier from any thread virtio-blk: implement BlockDevOps->drained_begin() virtio-scsi: implement BlockDevOps->drained_begin() virtio: do not set is_external=true on host notifiers aio: remove aio_disable_external() API hw/block/dataplane/xen-block.h | 2 + include/block/aio.h | 57 --------- include/block/block_int-common.h | 90 +++++++------- include/block/export.h | 2 + include/hw/qdev-core.h | 17 ++- include/hw/scsi/scsi.h | 14 +++ include/qemu/vhost-user-server.h | 8 +- include/sysemu/block-backend-common.h | 25 ++-- include/sysemu/block-backend-global-state.h | 1 + util/aio-posix.h | 1 - block.c | 7 -- block/blkio.c | 15 +-- block/block-backend.c | 78 ++++++------ block/curl.c | 10 +- block/export/export.c | 13 +- block/export/fuse.c | 56 ++++++++- block/export/vduse-blk.c | 128 ++++++++++++++------ block/export/vhost-user-blk-server.c | 52 +++++++- block/io.c | 16 ++- block/io_uring.c | 4 +- block/iscsi.c | 3 +- block/linux-aio.c | 4 +- block/nfs.c | 5 +- block/nvme.c | 8 +- block/ssh.c | 4 +- block/win32-aio.c | 6 +- hw/block/dataplane/virtio-blk.c | 23 +++- hw/block/dataplane/xen-block.c | 42 +++++-- hw/block/virtio-blk.c | 38 +++++- hw/block/xen-block.c | 24 +++- hw/i386/kvm/xen_xenstore.c | 2 +- hw/scsi/scsi-bus.c | 46 ++++++- hw/scsi/scsi-disk.c | 27 ++++- hw/scsi/virtio-scsi-dataplane.c | 32 +++-- hw/scsi/virtio-scsi.c | 127 ++++++++++++++----- hw/virtio/virtio.c | 9 +- hw/xen/xen-bus.c | 11 +- io/channel-command.c | 6 +- io/channel-file.c | 3 +- io/channel-socket.c | 3 +- migration/rdma.c | 16 +-- tests/unit/test-aio.c | 27 +---- tests/unit/test-bdrv-drain.c | 15 +-- tests/unit/test-fdmon-epoll.c | 73 ----------- util/aio-posix.c | 20 +-- util/aio-win32.c | 8 +- util/async.c | 3 +- util/fdmon-epoll.c | 10 -- util/fdmon-io_uring.c | 8 +- util/fdmon-poll.c | 3 +- util/main-loop.c | 7 +- util/qemu-coroutine-io.c | 7 +- util/vhost-user-server.c | 33 ++--- hw/scsi/trace-events | 2 + tests/unit/meson.build | 3 - 55 files changed, 725 insertions(+), 529 deletions(-) delete mode 100644 tests/unit/test-fdmon-epoll.c