From patchwork Fri Mar 10 15:14:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 9615157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB5EF60417 for ; Fri, 10 Mar 2017 07:18:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDFB028700 for ; Fri, 10 Mar 2017 07:18:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1D8028705; Fri, 10 Mar 2017 07:18:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4F32C28700 for ; Fri, 10 Mar 2017 07:18:06 +0000 (UTC) Received: from localhost ([::1]:37710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmEoQ-0006eF-0M for patchwork-qemu-devel@patchwork.kernel.org; Fri, 10 Mar 2017 02:18:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmEo2-0006aw-Av for qemu-devel@nongnu.org; Fri, 10 Mar 2017 02:17:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmEnz-0004KT-7O for qemu-devel@nongnu.org; Fri, 10 Mar 2017 02:17:42 -0500 Received: from mga02.intel.com ([134.134.136.20]:50058) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cmEny-0004IN-UB for qemu-devel@nongnu.org; Fri, 10 Mar 2017 02:17:39 -0500 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2017 23:17:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,139,1486454400"; d="scan'208";a="234479550" Received: from yangzhon-virtual.bj.intel.com ([10.238.144.108]) by fmsmga004.fm.intel.com with ESMTP; 09 Mar 2017 23:17:36 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Fri, 10 Mar 2017 23:14:57 +0800 Message-Id: <1489158897-9206-2-git-send-email-yang.zhong@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489158897-9206-1-git-send-email-yang.zhong@intel.com> References: <1489158897-9206-1-git-send-email-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH v1 2/2] reduce qemu's heap Rss size from 12252kB to 2752KB 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: Yang Zhong , pbonzini@redhat.com, chao.p.peng@intel.com, anthony.xu@intel.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP There is no need to delete subregion and do memory begin/commit for subpage in memory_region_finalize(). This patch is from Anthony Xu . Signed-off-by: Yang Zhong --- memory.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/memory.c b/memory.c index 284894b..3e9bfff 100644 --- a/memory.c +++ b/memory.c @@ -1505,13 +1505,14 @@ static void memory_region_finalize(Object *obj) * and cause an infinite loop. */ mr->enabled = false; - memory_region_transaction_begin(); - while (!QTAILQ_EMPTY(&mr->subregions)) { - MemoryRegion *subregion = QTAILQ_FIRST(&mr->subregions); - memory_region_del_subregion(mr, subregion); + if (!mr->subpage) { + memory_region_transaction_begin(); + while (!QTAILQ_EMPTY(&mr->subregions)) { + MemoryRegion *subregion = QTAILQ_FIRST(&mr->subregions); + memory_region_del_subregion(mr, subregion); + } + memory_region_transaction_commit(); } - memory_region_transaction_commit(); - mr->destructor(mr); memory_region_clear_coalescing(mr); g_free((char *)mr->name);