From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMY-00089b-JS for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdJMV-0006Yh-Ud for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:40301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMV-0006YU-Oe for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:35 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 16:43:12 +0200 Message-Id: <1442673810-2679-4-git-send-email-afaerber@suse.de> In-Reply-To: <1442673810-2679-1-git-send-email-afaerber@suse.de> References: <1442673810-2679-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 03/21] qdev: Do not use slow [*] expansion for GPIO creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Pavel Fedin , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Pavel Fedin Expansion of [*] suffix is very slow because index expansion is done usin= g trial and error strategy, starting every time from zero and retrying with the next index until insertion succeeds. With large number of already add= ed properties this process takes huge amount of time (O(n^2) complexity). Some architectures (like ARM) use very large amount of IRQ pins in interr= upt controller models. This flaw makes machine startup extremely slow (~20 seconds for ARM64 with 32 CPUs). This patch decreases this time down= to ~10 seconds. Also in qdev_init_gpio_out_named() memset() is now called only once for t= he whole array instead of per-cell cleaning Signed-off-by: Pavel Fedin Reviewed-by: Daniel P. Berrange Signed-off-by: Andreas F=C3=A4rber --- hw/core/qdev.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index a24493a..4ab04aa 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -417,17 +417,21 @@ void qdev_init_gpio_in_named(DeviceState *dev, qemu= _irq_handler handler, { int i; NamedGPIOList *gpio_list =3D qdev_get_named_gpio_list(dev, name); - char *propname =3D g_strdup_printf("%s[*]", name ? name : "unnamed-g= pio-in"); =20 assert(gpio_list->num_out =3D=3D 0 || !name); gpio_list->in =3D qemu_extend_irqs(gpio_list->in, gpio_list->num_in,= handler, dev, n); =20 + if (!name) { + name =3D "unnamed-gpio-in"; + } for (i =3D gpio_list->num_in; i < gpio_list->num_in + n; i++) { + gchar *propname =3D g_strdup_printf("%s[%u]", name, i); + object_property_add_child(OBJECT(dev), propname, OBJECT(gpio_list->in[i]), &error_abort= ); + g_free(propname); } - g_free(propname); =20 gpio_list->num_in +=3D n; } @@ -442,20 +446,25 @@ void qdev_init_gpio_out_named(DeviceState *dev, qem= u_irq *pins, { int i; NamedGPIOList *gpio_list =3D qdev_get_named_gpio_list(dev, name); - char *propname =3D g_strdup_printf("%s[*]", name ? name : "unnamed-g= pio-out"); =20 assert(gpio_list->num_in =3D=3D 0 || !name); - gpio_list->num_out +=3D n; =20 + if (!name) { + name =3D "unnamed-gpio-out"; + } + memset(pins, 0, sizeof(*pins) * n); for (i =3D 0; i < n; ++i) { - memset(&pins[i], 0, sizeof(*pins)); + gchar *propname =3D g_strdup_printf("%s[%u]", name, + gpio_list->num_out + i); + object_property_add_link(OBJECT(dev), propname, TYPE_IRQ, (Object **)&pins[i], object_property_allow_set_link, OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); + g_free(propname); } - g_free(propname); + gpio_list->num_out +=3D n; } =20 void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n) --=20 2.1.4