{"id":816761,"url":"http://patchwork.ozlabs.org/api/patches/816761/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170921085110.25598-14-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":"<20170921085110.25598-14-aik@ozlabs.ru>","list_archive_url":null,"date":"2017-09-21T08:51:05","name":"[qemu,v5,13/18] memory: Do not allocate FlatView in address_space_init","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"88afa2cc8da5fd26fe109f4e2c17b0f21ddba7e8","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/20170921085110.25598-14-aik@ozlabs.ru/mbox/","series":[{"id":4333,"url":"http://patchwork.ozlabs.org/api/series/4333/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4333","date":"2017-09-21T08:50:55","name":"memory: Store physical root MR in FlatView","version":5,"mbox":"http://patchwork.ozlabs.org/series/4333/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816761/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816761/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 3xyVn00TX7z9s81\n\tfor ;\n\tThu, 21 Sep 2017 18:55:16 +1000 (AEST)","from localhost ([::1]:52433 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duxGM-0007bH-3F\n\tfor incoming@patchwork.ozlabs.org; Thu, 21 Sep 2017 04:55:14 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48524)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duxCs-00056z-AN\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 04:51:39 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duxCp-0001Jd-Tc\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 04:51:37 -0400","from ozlabs.ru ([107.173.13.209]:54112)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duxCp-0001CA-NQ\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 04:51:35 -0400","from vpl1.ozlabs.ibm.com (localhost [IPv6:::1])\n\tby ozlabs.ru (Postfix) with ESMTP id 965D13A60051;\n\tThu, 21 Sep 2017 04:52:51 -0400 (EDT)"],"From":"Alexey Kardashevskiy ","To":"qemu-devel@nongnu.org","Date":"Thu, 21 Sep 2017 18:51:05 +1000","Message-Id":"<20170921085110.25598-14-aik@ozlabs.ru>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170921085110.25598-1-aik@ozlabs.ru>","References":"<20170921085110.25598-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 v5 13/18] memory: Do not allocate FlatView\n\tin address_space_init","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":"This creates a new AS object without any FlatView as\nmemory_region_transaction_commit() may want to reuse the empty FV.\n\nSigned-off-by: Alexey Kardashevskiy \n---\n\nI do not really want to add view!=NULL into\nflatview_ref()/flatview_unref() as this is quite special case when\nview==NULL.\n---\n memory.c | 29 +++++++++++++++++++++++------\n 1 file changed, 23 insertions(+), 6 deletions(-)","diff":"diff --git a/memory.c b/memory.c\nindex 56b3dd47ab..c623575dac 100644\n--- a/memory.c\n+++ b/memory.c\n@@ -962,22 +962,37 @@ static void flatviews_reset(void)\n \n static void address_space_set_flatview(AddressSpace *as)\n {\n- FlatView *old_view = address_space_get_flatview(as);\n+ FlatView *old_view = address_space_to_flatview(as);\n MemoryRegion *physmr = memory_region_get_flatview_root(as->root);\n FlatView *new_view = g_hash_table_lookup(flat_views, physmr);\n \n assert(new_view);\n \n+ if (old_view == new_view) {\n+ return;\n+ }\n+\n+ if (old_view) {\n+ flatview_ref(old_view);\n+ }\n+\n flatview_ref(new_view);\n \n if (!QTAILQ_EMPTY(&as->listeners)) {\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+ FlatView tmpview = { 0 }, *old_view2 = old_view;\n+\n+ if (!old_view2) {\n+ old_view2 = &tmpview;\n+ }\n+ address_space_update_topology_pass(as, old_view2, new_view, false);\n+ address_space_update_topology_pass(as, old_view2, new_view, true);\n }\n \n /* Writes are protected by the BQL. */\n atomic_rcu_set(&as->current_map, new_view);\n- flatview_unref(old_view);\n+ if (old_view) {\n+ flatview_unref(old_view);\n+ }\n \n /* Note that all the old MemoryRegions are still alive up to this\n * point. This relieves most MemoryListeners from the need to\n@@ -985,7 +1000,9 @@ static void address_space_set_flatview(AddressSpace *as)\n * outside the iothread mutex, in which case precise reference\n * counting is necessary.\n */\n- flatview_unref(old_view);\n+ if (old_view) {\n+ flatview_unref(old_view);\n+ }\n }\n \n void memory_region_transaction_begin(void)\n@@ -2703,7 +2720,7 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)\n as->ref_count = 1;\n as->root = root;\n as->malloced = false;\n- as->current_map = flatview_new(root);\n+ as->current_map = NULL;\n as->ioeventfd_nb = 0;\n as->ioeventfds = NULL;\n QTAILQ_INIT(&as->listeners);\n","prefixes":["qemu","v5","13/18"]}