{"id":814864,"url":"http://patchwork.ozlabs.org/api/patches/814864/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918101709.30421-4-aik@ozlabs.ru/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918101709.30421-4-aik@ozlabs.ru>","list_archive_url":null,"date":"2017-09-18T10:16:59","name":"[qemu,v3,03/13] memory: Open code FlatView rendering","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4deda4dff82771c3c0e119adfcca2949d5c9646a","submitter":{"id":7621,"url":"http://patchwork.ozlabs.org/api/people/7621/?format=json","name":"Alexey Kardashevskiy","email":"aik@ozlabs.ru"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918101709.30421-4-aik@ozlabs.ru/mbox/","series":[{"id":3617,"url":"http://patchwork.ozlabs.org/api/series/3617/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3617","date":"2017-09-18T10:16:57","name":"memory: Reduce memory use","version":3,"mbox":"http://patchwork.ozlabs.org/series/3617/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814864/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814864/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwhmF4QNMz9s78\n\tfor ;\n\tMon, 18 Sep 2017 20:18:21 +1000 (AEST)","from localhost ([::1]:35588 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtt87-0005nu-Kx\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 06:18:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41983)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtt7I-0005kD-CW\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtt7D-0004E6-WA\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:28 -0400","from ozlabs.ru ([107.173.13.209]:35246)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtt7D-0004DX-Nd\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:23 -0400","from vpl1.ozlabs.ibm.com (localhost [IPv6:::1])\n\tby ozlabs.ru (Postfix) with ESMTP id C51FC3A60021;\n\tMon, 18 Sep 2017 06:18:35 -0400 (EDT)"],"From":"Alexey Kardashevskiy ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 20:16:59 +1000","Message-Id":"<20170918101709.30421-4-aik@ozlabs.ru>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170918101709.30421-1-aik@ozlabs.ru>","References":"<20170918101709.30421-1-aik@ozlabs.ru>","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [fuzzy]","X-Received-From":"107.173.13.209","Subject":"[Qemu-devel] [PATCH qemu v3 03/13] memory: Open code FlatView\n\trendering","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Alexey Kardashevskiy , Paolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We are going to share FlatView's between AddressSpace's and per-AS\nmemory listeners won't suite the purpose anymore so open code\nthe dispatch tree rendering.\n\nSigned-off-by: Alexey Kardashevskiy \n---\nChanges:\nv3:\n* inlined & simplified address_space_update_flatview\n---\n include/exec/memory-internal.h | 6 ++++--\n include/exec/memory.h | 1 -\n exec.c | 27 +++------------------------\n memory.c | 13 ++++++++++---\n 4 files changed, 17 insertions(+), 30 deletions(-)","diff":"diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h\nindex fb467acdba..9abde2f11c 100644\n--- a/include/exec/memory-internal.h\n+++ b/include/exec/memory-internal.h\n@@ -22,8 +22,6 @@\n #ifndef CONFIG_USER_ONLY\n typedef struct AddressSpaceDispatch AddressSpaceDispatch;\n \n-void address_space_init_dispatch(AddressSpace *as);\n-void address_space_unregister(AddressSpace *as);\n void address_space_destroy_dispatch(AddressSpace *as);\n \n extern const MemoryRegionOps unassigned_mem_ops;\n@@ -31,5 +29,9 @@ extern const MemoryRegionOps unassigned_mem_ops;\n bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr,\n unsigned size, bool is_write);\n \n+void mem_add(AddressSpace *as, MemoryRegionSection *section);\n+void mem_begin(AddressSpace *as);\n+void mem_commit(AddressSpace *as);\n+\n #endif\n #endif\ndiff --git a/include/exec/memory.h b/include/exec/memory.h\nindex 1dcd3122d7..9581f7a7db 100644\n--- a/include/exec/memory.h\n+++ b/include/exec/memory.h\n@@ -318,7 +318,6 @@ struct AddressSpace {\n struct MemoryRegionIoeventfd *ioeventfds;\n struct AddressSpaceDispatch *dispatch;\n struct AddressSpaceDispatch *next_dispatch;\n- MemoryListener dispatch_listener;\n QTAILQ_HEAD(memory_listeners_as, MemoryListener) listeners;\n QTAILQ_ENTRY(AddressSpace) address_spaces_link;\n };\ndiff --git a/exec.c b/exec.c\nindex bd94248390..3ed3718dea 100644\n--- a/exec.c\n+++ b/exec.c\n@@ -1348,9 +1348,8 @@ static void register_multipage(AddressSpaceDispatch *d,\n phys_page_set(d, start_addr >> TARGET_PAGE_BITS, num_pages, section_index);\n }\n \n-static void mem_add(MemoryListener *listener, MemoryRegionSection *section)\n+void mem_add(AddressSpace *as, MemoryRegionSection *section)\n {\n- AddressSpace *as = container_of(listener, AddressSpace, dispatch_listener);\n AddressSpaceDispatch *d = as->next_dispatch;\n MemoryRegionSection now = *section, remain = *section;\n Int128 page_size = int128_make64(TARGET_PAGE_SIZE);\n@@ -2674,9 +2673,8 @@ static void io_mem_init(void)\n NULL, UINT64_MAX);\n }\n \n-static void mem_begin(MemoryListener *listener)\n+void mem_begin(AddressSpace *as)\n {\n- AddressSpace *as = container_of(listener, AddressSpace, dispatch_listener);\n AddressSpaceDispatch *d = g_new0(AddressSpaceDispatch, 1);\n uint16_t n;\n \n@@ -2700,9 +2698,8 @@ static void address_space_dispatch_free(AddressSpaceDispatch *d)\n g_free(d);\n }\n \n-static void mem_commit(MemoryListener *listener)\n+void mem_commit(AddressSpace *as)\n {\n- AddressSpace *as = container_of(listener, AddressSpace, dispatch_listener);\n AddressSpaceDispatch *cur = as->dispatch;\n AddressSpaceDispatch *next = as->next_dispatch;\n \n@@ -2732,24 +2729,6 @@ static void tcg_commit(MemoryListener *listener)\n tlb_flush(cpuas->cpu);\n }\n \n-void address_space_init_dispatch(AddressSpace *as)\n-{\n- as->dispatch = NULL;\n- as->dispatch_listener = (MemoryListener) {\n- .begin = mem_begin,\n- .commit = mem_commit,\n- .region_add = mem_add,\n- .region_nop = mem_add,\n- .priority = 0,\n- };\n- memory_listener_register(&as->dispatch_listener, as);\n-}\n-\n-void address_space_unregister(AddressSpace *as)\n-{\n- memory_listener_unregister(&as->dispatch_listener);\n-}\n-\n void address_space_destroy_dispatch(AddressSpace *as)\n {\n AddressSpaceDispatch *d = as->dispatch;\ndiff --git a/memory.c b/memory.c\nindex c0adc35410..5671757011 100644\n--- a/memory.c\n+++ b/memory.c\n@@ -879,11 +879,19 @@ static void address_space_update_topology_pass(AddressSpace *as,\n }\n }\n \n-\n static void address_space_update_topology(AddressSpace *as)\n {\n FlatView *old_view = address_space_get_flatview(as);\n FlatView *new_view = generate_memory_topology(as->root);\n+ int i;\n+\n+ mem_begin(as);\n+ for (i = 0; i < new_view->nr; i++) {\n+ MemoryRegionSection mrs =\n+ section_from_flat_range(&new_view->ranges[i], as);\n+ mem_add(as, &mrs);\n+ }\n+ mem_commit(as);\n \n address_space_update_topology_pass(as, old_view, new_view, false);\n address_space_update_topology_pass(as, old_view, new_view, true);\n@@ -2621,7 +2629,7 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)\n QTAILQ_INIT(&as->listeners);\n QTAILQ_INSERT_TAIL(&address_spaces, as, address_spaces_link);\n as->name = g_strdup(name ? name : \"anonymous\");\n- address_space_init_dispatch(as);\n+ as->dispatch = NULL;\n memory_region_update_pending |= root->enabled;\n memory_region_transaction_commit();\n }\n@@ -2672,7 +2680,6 @@ void address_space_destroy(AddressSpace *as)\n as->root = NULL;\n memory_region_transaction_commit();\n QTAILQ_REMOVE(&address_spaces, as, address_spaces_link);\n- address_space_unregister(as);\n \n /* At this point, as->dispatch and as->current_map are dummy\n * entries that the guest should never use. Wait for the old\n","prefixes":["qemu","v3","03/13"]}