From nobody Sun May 5 13:25:50 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516814653012980.5082353527433; Wed, 24 Jan 2018 09:24:13 -0800 (PST) Received: from localhost ([::1]:33512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeOmJ-0000EL-FT for importer@patchew.org; Wed, 24 Jan 2018 12:24:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeOl4-0007yw-8A for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeOl2-0006Xv-90 for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33466) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eeOl2-0006Wf-2c for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:44 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D55F61B21; Wed, 24 Jan 2018 17:22:43 +0000 (UTC) Received: from redhat.com (ovpn-123-218.rdu2.redhat.com [10.10.123.218]) by smtp.corp.redhat.com (Postfix) with SMTP id 75C696090C; Wed, 24 Jan 2018 17:22:41 +0000 (UTC) Date: Wed, 24 Jan 2018 19:22:40 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1516814467-25906-2-git-send-email-mst@redhat.com> References: <1516814467-25906-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1516814467-25906-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 24 Jan 2018 17:22:43 +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] [PULL v2 1/3] Revert "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: Peter Maydell , Gal Hammer , Jose Ricardo Ziviani , Greg Kurz , Sitong Liu , Paolo Bonzini , Daniel Henrique Barboza , Xiaoling Gao 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 Content-Type: text/plain; charset="utf-8" This reverts commit 6f0bb230722931d17fb284eee8efd40b9d653822. This reverts commit f87d72f5c5bff0837d409a56bd34f439a90119ca as that is reported to break cleanup and migration. Cc: Gal Hammer Cc: Sitong Liu Cc: Xiaoling Gao Suggested-by: Greg Kurz Suggested-by: Paolo Bonzini Reported-by: Jose Ricardo Ziviani Reported-by: Daniel Henrique Barboza --- hw/virtio/virtio.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 3ac3491..d6002ee 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2574,7 +2574,6 @@ 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)) { @@ -2597,7 +2596,6 @@ 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: @@ -2611,7 +2609,6 @@ assign_error: r =3D virtio_bus_set_host_notifier(qbus, n, false); assert(r >=3D 0); } - memory_region_transaction_commit(); return err; } =20 @@ -2628,7 +2625,6 @@ 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 @@ -2639,7 +2635,6 @@ 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 MST From nobody Sun May 5 13:25:50 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 1516814733138350.69383701301376; Wed, 24 Jan 2018 09:25:33 -0800 (PST) Received: from localhost ([::1]:33601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeOnh-0001Hm-FI for importer@patchew.org; Wed, 24 Jan 2018 12:25:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeOl4-0007z5-Vn for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeOl3-0006aj-WB for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eeOl3-0006Zi-Pz for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:45 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED13255892; Wed, 24 Jan 2018 17:22:44 +0000 (UTC) Received: from redhat.com (ovpn-123-218.rdu2.redhat.com [10.10.123.218]) by smtp.corp.redhat.com (Postfix) with SMTP id B9AFC5C890; Wed, 24 Jan 2018 17:22:43 +0000 (UTC) Date: Wed, 24 Jan 2018 19:22:43 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1516814467-25906-3-git-send-email-mst@redhat.com> References: <1516814467-25906-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1516814467-25906-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 24 Jan 2018 17:22:45 +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] [PULL v2 2/3] Revert "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: Peter Maydell , kvm@vger.kernel.org, Gal Hammer , Jose Ricardo Ziviani , Greg Kurz , Sitong Liu , Paolo Bonzini , Daniel Henrique Barboza , Xiaoling Gao 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 Content-Type: text/plain; charset="utf-8" This reverts commit 4fe6d78b2e241f41208dfb07605aace4becfc747 as it is reported to break cleanup and migration. Cc: Gal Hammer Cc: Sitong Liu Cc: Xiaoling Gao Suggested-by: Greg Kurz Suggested-by: Paolo Bonzini Reported-by: Jose Ricardo Ziviani Reported-by: Daniel Henrique Barboza --- accel/kvm/kvm-all.c | 4 ---- hw/virtio/virtio-bus.c | 19 ++++++++----------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 071f4f5..f290f48 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -812,10 +812,6 @@ 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 8106346..3042232 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -256,15 +256,6 @@ 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. @@ -292,13 +283,19 @@ 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= ); - virtio_bus_cleanup_event_notifier(notifier); + goto cleanup_event_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 MST From nobody Sun May 5 13:25:50 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 1516814804319808.3620864399753; Wed, 24 Jan 2018 09:26:44 -0800 (PST) Received: from localhost ([::1]:33643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeOot-00023b-N6 for importer@patchew.org; Wed, 24 Jan 2018 12:26:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeOl7-00080O-8B for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeOl6-0006ez-BY for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eeOl6-0006de-5A for qemu-devel@nongnu.org; Wed, 24 Jan 2018 12:22:48 -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 5C9A537E80; Wed, 24 Jan 2018 17:22:47 +0000 (UTC) Received: from redhat.com (ovpn-123-218.rdu2.redhat.com [10.10.123.218]) by smtp.corp.redhat.com (Postfix) with SMTP id 75C4D60C4D; Wed, 24 Jan 2018 17:22:45 +0000 (UTC) Date: Wed, 24 Jan 2018 19:22:45 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1516814467-25906-4-git-send-email-mst@redhat.com> References: <1516814467-25906-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1516814467-25906-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent 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.29]); Wed, 24 Jan 2018 17:22:47 +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] [PULL v2 3/3] Revert "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: Peter Maydell , Gal Hammer , Stefan Weil , Jose Ricardo Ziviani , Greg Kurz , Sitong Liu , Paolo Bonzini , Daniel Henrique Barboza , Xiaoling Gao 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 Content-Type: text/plain; charset="utf-8" This reverts commit f87d72f5c5bff0837d409a56bd34f439a90119ca as that is part of a patchset reported to break cleanup and migration. Cc: Gal Hammer Cc: Sitong Liu Cc: Xiaoling Gao Suggested-by: Greg Kurz Suggested-by: Paolo Bonzini Reported-by: Jose Ricardo Ziviani Reported-by: Daniel Henrique Barboza --- include/qemu/event_notifier.h | 1 - util/event_notifier-posix.c | 5 +---- util/event_notifier-win32.c | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/qemu/event_notifier.h b/include/qemu/event_notifier.h index b30a454..599c99f 100644 --- a/include/qemu/event_notifier.h +++ b/include/qemu/event_notifier.h @@ -26,7 +26,6 @@ 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 6525666..73c4046 100644 --- a/util/event_notifier-posix.c +++ b/util/event_notifier-posix.c @@ -29,7 +29,6 @@ void event_notifier_init_fd(EventNotifier *e, int fd) { e->rfd =3D fd; e->wfd =3D fd; - e->cleanup =3D NULL; } #endif =20 @@ -66,7 +65,6 @@ 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); } @@ -82,11 +80,10 @@ 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 eff8670..62c53b0 100644 --- a/util/event_notifier-win32.c +++ b/util/event_notifier-win32.c @@ -19,7 +19,6 @@ 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 @@ -27,7 +26,6 @@ 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 MST