From patchwork Fri Jan 19 13:57:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 13523814 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 31D4EC4725D for ; Fri, 19 Jan 2024 14:01:04 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQpOH-0004o3-I2; Fri, 19 Jan 2024 08:58:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQpOB-0004VP-Tx for qemu-devel@nongnu.org; Fri, 19 Jan 2024 08:58:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQpO9-0000ZW-1V for qemu-devel@nongnu.org; Fri, 19 Jan 2024 08:58:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705672707; 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=kssRlUuDYOxzrktOINuP+aWm+ItuQq6WQKh8hS6h210=; b=UOSPW40bw9IHOzus0yyCd/7VOTYdXwDCo9pD8jaldoaIILEjDRz/FIp+tRqBk4C4QTL2Cw FVCYu9LmcRNhbjVDystVUM3E6CTPEoSH5l38uxYp6XTBbKfPnbX05MnXO1TqAB/MrrDlZq jvsd98y4gO2N1cFBWPsw+dlJ8j9pxh0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-153-6fM4myGWO1KW4kjaTmJoZg-1; Fri, 19 Jan 2024 08:58:26 -0500 X-MC-Unique: 6fM4myGWO1KW4kjaTmJoZg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D0A5138562D0; Fri, 19 Jan 2024 13:58:25 +0000 (UTC) Received: from localhost (unknown [10.39.195.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36EBF1C05E0E; Fri, 19 Jan 2024 13:58:25 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Thomas Huth , Hanna Reitz , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, "Michael S. Tsirkin" , Kevin Wolf , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 0/6] virtio-blk: iothread-vq-mapping cleanups Date: Fri, 19 Jan 2024 08:57:42 -0500 Message-ID: <20240119135748.270944-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.519, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Kevin Wolf identified some issues with the virtio-blk iothread-vq-mapping patch series that was merged at the end of 2023: 1. s->rq is restarted from one AioContext and races with the other iothread-vq-mapping AioContexts. 2. Failure to set the AioContext is no longer fatal since the IO_CODE APIs can be called from any thread. We can relax the error handling behavior. 3. Starting dataplane must self-trigger the ioeventfd even in a drained section. Failure to do so could lead to an unresponsive virtio-blk device. This patch series addresses these issues. The first few patches merge the hw/block/dataplane/virtio-blk.c code into hw/block/virtio-blk.c so that s->rq can easily be restarted in the correct AioContexts. Stefan Hajnoczi (6): virtio-blk: move dataplane code into virtio-blk.c virtio-blk: rename dataplane create/destroy functions virtio-blk: rename dataplane to ioeventfd virtio-blk: restart s->rq reqs in vq AioContexts virtio-blk: tolerate failure to set BlockBackend AioContext virtio-blk: always set ioeventfd during startup meson.build | 1 - hw/block/dataplane/trace.h | 1 - hw/block/dataplane/virtio-blk.h | 34 --- include/hw/virtio/virtio-blk.h | 16 +- hw/block/dataplane/virtio-blk.c | 404 ------------------------------- hw/block/virtio-blk.c | 412 +++++++++++++++++++++++++++++--- hw/block/dataplane/meson.build | 1 - hw/block/dataplane/trace-events | 5 - 8 files changed, 391 insertions(+), 483 deletions(-) delete mode 100644 hw/block/dataplane/trace.h delete mode 100644 hw/block/dataplane/virtio-blk.h delete mode 100644 hw/block/dataplane/virtio-blk.c delete mode 100644 hw/block/dataplane/trace-events