From 8ce98f8422946cc39437a06fcab4498350d4d482 Mon Sep 17 00:00:00 2001

From: David Gibson <dgibson@redhat.com>

Date: Thu, 16 Nov 2017 03:07:15 +0100

Subject: [PATCH 11/30] memory: Open code FlatView rendering

RH-Author: David Gibson <dgibson@redhat.com>

Message-id: <20171116030732.8560-6-dgibson@redhat.com>

Patchwork-id: 77695

O-Subject: [PATCH 05/22] memory: Open code FlatView rendering

Bugzilla: 1481593

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

From: Alexey Kardashevskiy <aik@ozlabs.ru>

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 <aik@ozlabs.ru>

Message-Id: <20170921085110.25598-3-aik@ozlabs.ru>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit 9a62e24f45bc97f8eaf198caf58906b47c50a8d5)

Signed-off-by: David Gibson <dgibson@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 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 f00bd4e..4fed7b7 100644

--- a/exec.c

+++ b/exec.c

@@ -1358,9 +1358,8 @@ static void register_multipage(AddressSpaceDispatch *d,

     phys_page_set(d, start_addr >> TARGET_PAGE_BITS, num_pages, section_index);

 }

-static void mem_add(MemoryListener *listener, MemoryRegionSection *section)

+void mem_add(AddressSpace *as, MemoryRegionSection *section)

 {

-    AddressSpace *as = container_of(listener, AddressSpace, dispatch_listener);

     AddressSpaceDispatch *d = as->next_dispatch;

     MemoryRegionSection now = *section, remain = *section;

     Int128 page_size = int128_make64(TARGET_PAGE_SIZE);

@@ -2684,9 +2683,8 @@ static void io_mem_init(void)

                           NULL, UINT64_MAX);

 }

-static void mem_begin(MemoryListener *listener)

+void mem_begin(AddressSpace *as)

 {

-    AddressSpace *as = container_of(listener, AddressSpace, dispatch_listener);

     AddressSpaceDispatch *d = g_new0(AddressSpaceDispatch, 1);

     uint16_t n;

@@ -2710,9 +2708,8 @@ static void address_space_dispatch_free(AddressSpaceDispatch *d)

     g_free(d);

 }

-static void mem_commit(MemoryListener *listener)

+void mem_commit(AddressSpace *as)

 {

-    AddressSpace *as = container_of(listener, AddressSpace, dispatch_listener);

     AddressSpaceDispatch *cur = as->dispatch;

     AddressSpaceDispatch *next = as->next_dispatch;

@@ -2742,24 +2739,6 @@ static void tcg_commit(MemoryListener *listener)

     tlb_flush(cpuas->cpu);

 }

-void address_space_init_dispatch(AddressSpace *as)

-{

-    as->dispatch = NULL;

-    as->dispatch_listener = (MemoryListener) {

-        .begin = mem_begin,

-        .commit = mem_commit,

-        .region_add = mem_add,

-        .region_nop = mem_add,

-        .priority = 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 = 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;

-void address_space_init_dispatch(AddressSpace *as);

-void address_space_unregister(AddressSpace *as);

 void address_space_destroy_dispatch(AddressSpace *as);

 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);

+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 400dd44..9ee0f2e 100644

--- a/include/exec/memory.h

+++ b/include/exec/memory.h

@@ -328,7 +328,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 ca160de..8bc1f56 100644

--- a/memory.c

+++ b/memory.c

@@ -883,14 +883,24 @@ static void address_space_update_topology_pass(AddressSpace *as,

     }

 }

-

 static void address_space_update_topology(AddressSpace *as)

 {

     FlatView *old_view = address_space_get_flatview(as);

     FlatView *new_view = generate_memory_topology(as->root);

+    int i;

-    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 = 0; i < new_view->nr; i++) {

+        MemoryRegionSection mrs =

+            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);

+    }

     /* Writes are protected by the BQL.  */

     atomic_rcu_set(&as->current_map, new_view);

@@ -2625,7 +2635,7 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)

     QTAILQ_INIT(&as->listeners);

     QTAILQ_INSERT_TAIL(&address_spaces, as, address_spaces_link);

     as->name = g_strdup(name ? name : "anonymous");

-    address_space_init_dispatch(as);

+    as->dispatch = NULL;

     memory_region_update_pending |= root->enabled;

     memory_region_transaction_commit();

 }

@@ -2676,7 +2686,6 @@ void address_space_destroy(AddressSpace *as)

     as->root = NULL;

     memory_region_transaction_commit();

     QTAILQ_REMOVE(&address_spaces, as, address_spaces_link);

-    address_space_unregister(as);

     /* At this point, as->dispatch and as->current_map are dummy

      * entries that the guest should never use.  Wait for the old

-- 

1.8.3.1