From nobody Tue Feb 10 21:40:44 2026 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; dkim=fail; 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 1506036653411778.8971439089189; Thu, 21 Sep 2017 16:30:53 -0700 (PDT) Received: from localhost ([::1]:55924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvAvk-0008WS-Ha for importer@patchew.org; Thu, 21 Sep 2017 19:30:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvAiF-0004bj-CR for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:16:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvAiD-00041d-Vo for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:16:55 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:37505) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvAiD-0003zz-Lc for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:16:53 -0400 Received: by mail-wr0-x243.google.com with SMTP id u48so3840845wrf.4 for ; Thu, 21 Sep 2017 16:16:53 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id u186sm2596278wmd.19.2017.09.21.16.16.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 16:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7sAMZTi//fBKUl9vUgi4dnKim3MhRO/zd9Gnqhe/8rg=; b=kXpVkEX/BAhkAAsk+p/3bTLuQOh3rXQdAPkEDJf8FWrjzfPzM0ZaO4GQ6me7QAgUN5 adOUR9ACZ1HXy81sk9LbSeA2lED/937niLOuiAC2GZNx9PjNeMqbrlCPuE+fmNXG+f6e 4OZD8dcA436gIJ+N3l02m5/mw/LXE4LBho+mzkE71ojtfuJ2LSdFsD9VbwQptl9INyPu mkaE/qu8MtFJOepCzMU9MDs0EikasQrryf7D3kDh2pO/rHjjlLn2lqd9a8KOLT+geWpk gsJtX7hMjXKbrameraRHdUdPp2jete6lbi5mkRxPp4LR1FfwEsE8cIDAwfoGPm5W1fMk nwWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7sAMZTi//fBKUl9vUgi4dnKim3MhRO/zd9Gnqhe/8rg=; b=PX1aLEdhpSrctai06RDmqZ806mxpEVT/mPxbzpe9FHutxV/1zr2n4ThnIOvwLHoRFe 1OehRj8f4Ks46iQwIDnhUjguYg50wJ2Oe0FFkfH8kzxqZkHppHzm+9x7kfsfxRYL1xT5 dG78KrWWB+cPXn0+20oec3pgGCr3QlENqr5ppCLqKaxyFy4utbh01qwYmJcilRxltqWT 7mD3yy8lyZwaJKOQeJCjbFpDW12ZvyAgfrmhtH8r9ayFsd4SQUbBzUCz0LRWdCw8OghV 8HctAwzHo8Y1hXH8Rkalr60A8AupPisrKlZtHhFiH9foZcIN0+Iy8zmZKY8l8rxT/ryt wXLQ== X-Gm-Message-State: AHPjjUgBX/Yq/LNIj4XLkrPipa4aKIEEXqDiqC/YaS69MOtZJzjHAIzk QDQoxaZThOgCNl9IM/p4qsDgbdkM X-Google-Smtp-Source: AOwi7QBrSzS7OlHZuE4wJAuYiBvwnx2pX5/l2itx+o4H9+ShQlIvoKMOZpoA+7UlqMZ7j7ad9h17Jg== X-Received: by 10.223.151.54 with SMTP id r51mr3367893wrb.207.1506035812342; Thu, 21 Sep 2017 16:16:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 01:16:15 +0200 Message-Id: <1506035800-30509-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1506035800-30509-1-git-send-email-pbonzini@redhat.com> References: <1506035800-30509-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 07/32] memory: Open code FlatView rendering 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: Alexey Kardashevskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Alexey Kardashevskiy We are going to share FlatView's between AddressSpace's and per-AS memory listeners won't suit the purpose anymore so open code the dispatch tree rendering. Since there is a good chance that dispatch_listener was the only listener, this avoids address_space_update_topology_pass() if there is no registered listeners; this should improve starting time. This should cause no behavioural change. Signed-off-by: Alexey Kardashevskiy Message-Id: <20170921085110.25598-3-aik@ozlabs.ru> Signed-off-by: Paolo Bonzini --- exec.c | 27 +++------------------------ include/exec/memory-internal.h | 6 ++++-- include/exec/memory.h | 1 - memory.c | 19 ++++++++++++++----- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/exec.c b/exec.c index fd8994b..1626d25 100644 --- a/exec.c +++ b/exec.c @@ -1347,9 +1347,8 @@ static void register_multipage(AddressSpaceDispatch *= d, phys_page_set(d, start_addr >> TARGET_PAGE_BITS, num_pages, section_in= dex); } =20 -static void mem_add(MemoryListener *listener, MemoryRegionSection *section) +void mem_add(AddressSpace *as, MemoryRegionSection *section) { - AddressSpace *as =3D container_of(listener, AddressSpace, dispatch_lis= tener); AddressSpaceDispatch *d =3D as->next_dispatch; MemoryRegionSection now =3D *section, remain =3D *section; Int128 page_size =3D int128_make64(TARGET_PAGE_SIZE); @@ -2673,9 +2672,8 @@ static void io_mem_init(void) NULL, UINT64_MAX); } =20 -static void mem_begin(MemoryListener *listener) +void mem_begin(AddressSpace *as) { - AddressSpace *as =3D container_of(listener, AddressSpace, dispatch_lis= tener); AddressSpaceDispatch *d =3D g_new0(AddressSpaceDispatch, 1); uint16_t n; =20 @@ -2699,9 +2697,8 @@ static void address_space_dispatch_free(AddressSpaceD= ispatch *d) g_free(d); } =20 -static void mem_commit(MemoryListener *listener) +void mem_commit(AddressSpace *as) { - AddressSpace *as =3D container_of(listener, AddressSpace, dispatch_lis= tener); AddressSpaceDispatch *cur =3D as->dispatch; AddressSpaceDispatch *next =3D as->next_dispatch; =20 @@ -2731,24 +2728,6 @@ static void tcg_commit(MemoryListener *listener) tlb_flush(cpuas->cpu); } =20 -void address_space_init_dispatch(AddressSpace *as) -{ - as->dispatch =3D NULL; - as->dispatch_listener =3D (MemoryListener) { - .begin =3D mem_begin, - .commit =3D mem_commit, - .region_add =3D mem_add, - .region_nop =3D mem_add, - .priority =3D 0, - }; - memory_listener_register(&as->dispatch_listener, as); -} - -void address_space_unregister(AddressSpace *as) -{ - memory_listener_unregister(&as->dispatch_listener); -} - void address_space_destroy_dispatch(AddressSpace *as) { AddressSpaceDispatch *d =3D as->dispatch; diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index fb467ac..9abde2f 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -22,8 +22,6 @@ #ifndef CONFIG_USER_ONLY typedef struct AddressSpaceDispatch AddressSpaceDispatch; =20 -void address_space_init_dispatch(AddressSpace *as); -void address_space_unregister(AddressSpace *as); void address_space_destroy_dispatch(AddressSpace *as); =20 extern const MemoryRegionOps unassigned_mem_ops; @@ -31,5 +29,9 @@ extern const MemoryRegionOps unassigned_mem_ops; bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, unsigned size, bool is_write); =20 +void mem_add(AddressSpace *as, MemoryRegionSection *section); +void mem_begin(AddressSpace *as); +void mem_commit(AddressSpace *as); + #endif #endif diff --git a/include/exec/memory.h b/include/exec/memory.h index 1dcd312..9581f7a 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -318,7 +318,6 @@ struct AddressSpace { struct MemoryRegionIoeventfd *ioeventfds; struct AddressSpaceDispatch *dispatch; struct AddressSpaceDispatch *next_dispatch; - MemoryListener dispatch_listener; QTAILQ_HEAD(memory_listeners_as, MemoryListener) listeners; QTAILQ_ENTRY(AddressSpace) address_spaces_link; }; diff --git a/memory.c b/memory.c index 51f54ab..3241e44 100644 --- a/memory.c +++ b/memory.c @@ -884,14 +884,24 @@ static void address_space_update_topology_pass(Addres= sSpace *as, } } =20 - static void address_space_update_topology(AddressSpace *as) { FlatView *old_view =3D address_space_get_flatview(as); FlatView *new_view =3D generate_memory_topology(as->root); + int i; =20 - address_space_update_topology_pass(as, old_view, new_view, false); - address_space_update_topology_pass(as, old_view, new_view, true); + mem_begin(as); + for (i =3D 0; i < new_view->nr; i++) { + MemoryRegionSection mrs =3D + section_from_flat_range(&new_view->ranges[i], as); + mem_add(as, &mrs); + } + mem_commit(as); + + if (!QTAILQ_EMPTY(&as->listeners)) { + address_space_update_topology_pass(as, old_view, new_view, false); + address_space_update_topology_pass(as, old_view, new_view, true); + } =20 /* Writes are protected by the BQL. */ atomic_rcu_set(&as->current_map, new_view); @@ -2626,7 +2636,7 @@ void address_space_init(AddressSpace *as, MemoryRegio= n *root, const char *name) QTAILQ_INIT(&as->listeners); QTAILQ_INSERT_TAIL(&address_spaces, as, address_spaces_link); as->name =3D g_strdup(name ? name : "anonymous"); - address_space_init_dispatch(as); + as->dispatch =3D NULL; memory_region_update_pending |=3D root->enabled; memory_region_transaction_commit(); } @@ -2677,7 +2687,6 @@ void address_space_destroy(AddressSpace *as) as->root =3D NULL; memory_region_transaction_commit(); QTAILQ_REMOVE(&address_spaces, as, address_spaces_link); - address_space_unregister(as); =20 /* At this point, as->dispatch and as->current_map are dummy * entries that the guest should never use. Wait for the old --=20 1.8.3.1