From nobody Sat May 4 21:45:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515924520825923.7390195696516; Sun, 14 Jan 2018 02:08:40 -0800 (PST) Received: from localhost ([::1]:55071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eafDQ-0001Ba-Hc for importer@patchew.org; Sun, 14 Jan 2018 05:08:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eafCA-0000Wh-1t for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eafC9-0002Vb-7L for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56906) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eafC9-0002UT-1m for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F6E981DFF for ; Sun, 14 Jan 2018 10:07:16 +0000 (UTC) Received: from wolverine.usersys.redhat.com (unknown [10.35.7.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EDF460BE3; Sun, 14 Jan 2018 10:07:15 +0000 (UTC) From: Gal Hammer To: qemu-devel@nongnu.org Date: Sun, 14 Jan 2018 12:06:54 +0200 Message-Id: <1515924416-9266-2-git-send-email-ghammer@redhat.com> In-Reply-To: <1515924416-9266-1-git-send-email-ghammer@redhat.com> References: <1515924416-9266-1-git-send-email-ghammer@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sun, 14 Jan 2018 10:07:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] qemu: add a cleanup callback function to EventNotifier 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: Gal Hammer , mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Adding a cleanup callback function to the EventNotifier struct which allows users to execute event_notifier_cleanup in a different context. Signed-off-by: Gal Hammer --- include/qemu/event_notifier.h | 1 + util/event_notifier-posix.c | 5 ++++- util/event_notifier-win32.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/qemu/event_notifier.h b/include/qemu/event_notifier.h index 599c99f..b30a454 100644 --- a/include/qemu/event_notifier.h +++ b/include/qemu/event_notifier.h @@ -26,6 +26,7 @@ struct EventNotifier { int rfd; int wfd; #endif + void (*cleanup)(EventNotifier *); }; =20 typedef void EventNotifierHandler(EventNotifier *); diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c index 73c4046..6525666 100644 --- a/util/event_notifier-posix.c +++ b/util/event_notifier-posix.c @@ -29,6 +29,7 @@ void event_notifier_init_fd(EventNotifier *e, int fd) { e->rfd =3D fd; e->wfd =3D fd; + e->cleanup =3D NULL; } #endif =20 @@ -65,6 +66,7 @@ int event_notifier_init(EventNotifier *e, int active) e->rfd =3D fds[0]; e->wfd =3D fds[1]; } + e->cleanup =3D NULL; if (active) { event_notifier_set(e); } @@ -80,10 +82,11 @@ void event_notifier_cleanup(EventNotifier *e) { if (e->rfd !=3D e->wfd) { close(e->rfd); - e->rfd =3D -1; } close(e->wfd); + e->rfd =3D -1; e->wfd =3D -1; + e->cleanup =3D NULL; } =20 int event_notifier_get_fd(const EventNotifier *e) diff --git a/util/event_notifier-win32.c b/util/event_notifier-win32.c index 62c53b0..eff8670 100644 --- a/util/event_notifier-win32.c +++ b/util/event_notifier-win32.c @@ -19,6 +19,7 @@ int event_notifier_init(EventNotifier *e, int active) { e->event =3D CreateEvent(NULL, TRUE, FALSE, NULL); assert(e->event); + e->cleanup =3D NULL; return 0; } =20 @@ -26,6 +27,7 @@ void event_notifier_cleanup(EventNotifier *e) { CloseHandle(e->event); e->event =3D NULL; + e->cleanup =3D NULL; } =20 HANDLE event_notifier_get_handle(EventNotifier *e) --=20 2.7.5 From nobody Sat May 4 21:45:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515924639612197.50464486707415; Sun, 14 Jan 2018 02:10:39 -0800 (PST) Received: from localhost ([::1]:55140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eafFO-0002ld-T1 for importer@patchew.org; Sun, 14 Jan 2018 05:10:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eafCC-0000Z3-VJ for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eafCA-0002YB-Pz for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40126) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eafCA-0002XD-KH for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B86B11F561 for ; Sun, 14 Jan 2018 10:07:17 +0000 (UTC) Received: from wolverine.usersys.redhat.com (unknown [10.35.7.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id A975D60BE3; Sun, 14 Jan 2018 10:07:16 +0000 (UTC) From: Gal Hammer To: qemu-devel@nongnu.org Date: Sun, 14 Jan 2018 12:06:55 +0200 Message-Id: <1515924416-9266-3-git-send-email-ghammer@redhat.com> In-Reply-To: <1515924416-9266-1-git-send-email-ghammer@redhat.com> References: <1515924416-9266-1-git-send-email-ghammer@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sun, 14 Jan 2018 10:07:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] virtio: postpone the execution of event_notifier_cleanup function 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: Gal Hammer , mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use the EventNotifier's cleanup callback function to execute the event_notifier_cleanup function after kvm unregistered the eventfd. This change supports running the virtio_bus_set_host_notifier function inside a memory region transaction. Otherwise, a closed fd is sent to kvm, which results in a failure. Signed-off-by: Gal Hammer --- accel/kvm/kvm-all.c | 4 ++++ hw/virtio/virtio-bus.c | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index f290f48..071f4f5 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -812,6 +812,10 @@ static void kvm_mem_ioeventfd_del(MemoryListener *list= ener, if (r < 0) { abort(); } + + if (e->cleanup) { + e->cleanup(e); + } } =20 static void kvm_io_ioeventfd_add(MemoryListener *listener, diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index 3042232..8106346 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -256,6 +256,15 @@ bool virtio_bus_ioeventfd_enabled(VirtioBusState *bus) return k->ioeventfd_assign && k->ioeventfd_enabled(proxy); } =20 +static void virtio_bus_cleanup_event_notifier(EventNotifier *notifier) +{ + /* Test and clear notifier after disabling event, + * in case poll callback didn't have time to run. + */ + virtio_queue_host_notifier_read(notifier); + event_notifier_cleanup(notifier); +} + /* * This function switches ioeventfd on/off in the device. * The caller must set or clear the handlers for the EventNotifier. @@ -283,19 +292,13 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus,= int n, bool assign) r =3D k->ioeventfd_assign(proxy, notifier, n, true); if (r < 0) { error_report("%s: unable to assign ioeventfd: %d", __func__, r= ); - goto cleanup_event_notifier; + virtio_bus_cleanup_event_notifier(notifier); } - return 0; } else { + notifier->cleanup =3D virtio_bus_cleanup_event_notifier; k->ioeventfd_assign(proxy, notifier, n, false); } =20 -cleanup_event_notifier: - /* Test and clear notifier after disabling event, - * in case poll callback didn't have time to run. - */ - virtio_queue_host_notifier_read(notifier); - event_notifier_cleanup(notifier); return r; } =20 --=20 2.7.5 From nobody Sat May 4 21:45:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515924636729740.2612965031294; Sun, 14 Jan 2018 02:10:36 -0800 (PST) Received: from localhost ([::1]:55138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eafFJ-0002gI-OI for importer@patchew.org; Sun, 14 Jan 2018 05:10:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eafCD-0000Z7-0f for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eafCC-0002Zl-7l for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56910) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eafCC-0002ZX-2K for qemu-devel@nongnu.org; Sun, 14 Jan 2018 05:07:20 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4663D81DFF for ; Sun, 14 Jan 2018 10:07:19 +0000 (UTC) Received: from wolverine.usersys.redhat.com (unknown [10.35.7.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DE1A60BE0; Sun, 14 Jan 2018 10:07:17 +0000 (UTC) From: Gal Hammer To: qemu-devel@nongnu.org Date: Sun, 14 Jan 2018 12:06:56 +0200 Message-Id: <1515924416-9266-4-git-send-email-ghammer@redhat.com> In-Reply-To: <1515924416-9266-1-git-send-email-ghammer@redhat.com> References: <1515924416-9266-1-git-send-email-ghammer@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sun, 14 Jan 2018 10:07:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] virtio: improve virtio devices initialization time 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: Gal Hammer , mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The loading time of a VM is quite significant when its virtio devices use a large amount of virt-queues (e.g. a virtio-serial device with max_ports=3D511). Most of the time is spend in the creation of all the required event notifiers (ioeventfd and memory regions). This patch pack all the changes to the memory regions in a single memory transaction. Reported-by: Sitong Liu Reported-by: Xiaoling Gao Signed-off-by: Gal Hammer --- hw/virtio/virtio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index d6002ee..3ac3491 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2574,6 +2574,7 @@ static int virtio_device_start_ioeventfd_impl(VirtIOD= evice *vdev) VirtioBusState *qbus =3D VIRTIO_BUS(qdev_get_parent_bus(DEVICE(vdev))); int n, r, err; =20 + memory_region_transaction_begin(); for (n =3D 0; n < VIRTIO_QUEUE_MAX; n++) { VirtQueue *vq =3D &vdev->vq[n]; if (!virtio_queue_get_num(vdev, n)) { @@ -2596,6 +2597,7 @@ static int virtio_device_start_ioeventfd_impl(VirtIOD= evice *vdev) } event_notifier_set(&vq->host_notifier); } + memory_region_transaction_commit(); return 0; =20 assign_error: @@ -2609,6 +2611,7 @@ assign_error: r =3D virtio_bus_set_host_notifier(qbus, n, false); assert(r >=3D 0); } + memory_region_transaction_commit(); return err; } =20 @@ -2625,6 +2628,7 @@ static void virtio_device_stop_ioeventfd_impl(VirtIOD= evice *vdev) VirtioBusState *qbus =3D VIRTIO_BUS(qdev_get_parent_bus(DEVICE(vdev))); int n, r; =20 + memory_region_transaction_begin(); for (n =3D 0; n < VIRTIO_QUEUE_MAX; n++) { VirtQueue *vq =3D &vdev->vq[n]; =20 @@ -2635,6 +2639,7 @@ static void virtio_device_stop_ioeventfd_impl(VirtIOD= evice *vdev) r =3D virtio_bus_set_host_notifier(qbus, n, false); assert(r >=3D 0); } + memory_region_transaction_commit(); } =20 void virtio_device_stop_ioeventfd(VirtIODevice *vdev) --=20 2.7.5