From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usc0T-0003cI-D3 for qemu-devel@nongnu.org; Fri, 28 Jun 2013 12:58:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Usc0R-0001io-2n for qemu-devel@nongnu.org; Fri, 28 Jun 2013 12:58:45 -0400 Received: from mail-ea0-x22f.google.com ([2a00:1450:4013:c01::22f]:42096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usc0Q-0001iP-TY for qemu-devel@nongnu.org; Fri, 28 Jun 2013 12:58:43 -0400 Received: by mail-ea0-f175.google.com with SMTP id z7so1146612eaf.20 for ; Fri, 28 Jun 2013 09:58:42 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 28 Jun 2013 18:58:14 +0200 Message-Id: <1372438702-20491-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1372438702-20491-1-git-send-email-pbonzini@redhat.com> References: <1372438702-20491-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 03/11] exec: simplify destruction of the phys map List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, peter.maydell@linaro.org Do not bother visiting the radix tree when an address space is destroyed. Signed-off-by: Paolo Bonzini --- exec.c | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/exec.c b/exec.c index e7eadf5..9c77285 100644 --- a/exec.c +++ b/exec.c @@ -154,12 +154,6 @@ static uint16_t phys_map_node_alloc(void) return ret; } -static void phys_map_nodes_reset(void) -{ - phys_map_nodes_nb = 0; -} - - static void phys_page_set_level(PhysPageEntry *lp, hwaddr *index, hwaddr *nb, uint16_t leaf, int level) @@ -763,31 +757,6 @@ static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end, uint16_t section); static subpage_t *subpage_init(AddressSpace *as, hwaddr base); -static void destroy_l2_mapping(PhysPageEntry *lp, unsigned level) -{ - unsigned i; - PhysPageEntry *p; - - if (lp->ptr == PHYS_MAP_NODE_NIL) { - return; - } - - p = phys_map_nodes[lp->ptr]; - for (i = 0; i < L2_SIZE; ++i) { - if (!p[i].is_leaf) { - destroy_l2_mapping(&p[i], level - 1); - } - } - lp->is_leaf = 0; - lp->ptr = PHYS_MAP_NODE_NIL; -} - -static void destroy_all_mappings(AddressSpaceDispatch *d) -{ - destroy_l2_mapping(&d->phys_map, P_L2_LEVELS - 1); - phys_map_nodes_reset(); -} - static uint16_t phys_section_add(MemoryRegionSection *section) { /* The physical section number is ORed with a page-aligned @@ -820,6 +789,7 @@ static void phys_sections_clear(void) MemoryRegionSection *section = &phys_sections[--phys_sections_nb]; phys_section_destroy(section->mr); } + phys_map_nodes_nb = 0; } static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *section) @@ -1724,7 +1694,6 @@ static void mem_begin(MemoryListener *listener) { AddressSpaceDispatch *d = container_of(listener, AddressSpaceDispatch, listener); - destroy_all_mappings(d); d->phys_map.ptr = PHYS_MAP_NODE_NIL; } @@ -1791,7 +1760,6 @@ void address_space_destroy_dispatch(AddressSpace *as) AddressSpaceDispatch *d = as->dispatch; memory_listener_unregister(&d->listener); - destroy_l2_mapping(&d->phys_map, P_L2_LEVELS - 1); g_free(d); as->dispatch = NULL; } -- 1.8.1.4