From patchwork Mon Mar 7 17:36:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 593092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1F875140273 for ; Tue, 8 Mar 2016 04:43:36 +1100 (AEDT) Received: from localhost ([::1]:57438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aczBu-0005sH-7K for incoming@patchwork.ozlabs.org; Mon, 07 Mar 2016 12:43:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acz5q-0003p0-Gv for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acz5m-0003JH-DO for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acz5m-0003JD-8Y for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:14 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id E1B3F8E3CB for ; Mon, 7 Mar 2016 17:37:13 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u27Hb1ZY001810; Mon, 7 Mar 2016 12:37:12 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 7 Mar 2016 18:36:53 +0100 Message-Id: <1457372221-19285-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1457372221-19285-1-git-send-email-pbonzini@redhat.com> References: <1457372221-19285-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Fam Zheng Subject: [Qemu-devel] [PULL 07/15] exec: Pass RAMBlock pointer to qemu_ram_free X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Fam Zheng The only caller now knows exactly which RAMBlock to free, so it's not necessary to do the lookup. Reviewed-by: Gonglei Signed-off-by: Fam Zheng Message-Id: <1456813104-25902-6-git-send-email-famz@redhat.com> Signed-off-by: Paolo Bonzini --- exec.c | 21 +++++++-------------- include/exec/ram_addr.h | 2 +- memory.c | 4 ++-- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/exec.c b/exec.c index 6ed4203..ad8b826 100644 --- a/exec.c +++ b/exec.c @@ -1751,22 +1751,15 @@ static void reclaim_ramblock(RAMBlock *block) g_free(block); } -void qemu_ram_free(ram_addr_t addr) +void qemu_ram_free(RAMBlock *block) { - RAMBlock *block; - qemu_mutex_lock_ramlist(); - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { - if (addr == block->offset) { - QLIST_REMOVE_RCU(block, next); - ram_list.mru_block = NULL; - /* Write list before version */ - smp_wmb(); - ram_list.version++; - call_rcu(block, reclaim_ramblock, rcu); - break; - } - } + QLIST_REMOVE_RCU(block, next); + ram_list.mru_block = NULL; + /* Write list before version */ + smp_wmb(); + ram_list.version++; + call_rcu(block, reclaim_ramblock, rcu); qemu_mutex_unlock_ramlist(); } diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 865e19b..5adf7a4 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -108,7 +108,7 @@ RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t max_size, int qemu_get_ram_fd(ram_addr_t addr); void qemu_set_ram_fd(ram_addr_t addr, int fd); void *qemu_get_ram_block_host_ptr(ram_addr_t addr); -void qemu_ram_free(ram_addr_t addr); +void qemu_ram_free(RAMBlock *block); int qemu_ram_resize(ram_addr_t base, ram_addr_t newsize, Error **errp); diff --git a/memory.c b/memory.c index 5b5791c..9f5c458 100644 --- a/memory.c +++ b/memory.c @@ -902,12 +902,12 @@ static void memory_region_destructor_none(MemoryRegion *mr) static void memory_region_destructor_ram(MemoryRegion *mr) { - qemu_ram_free(memory_region_get_ram_addr(mr)); + qemu_ram_free(mr->ram_block); } static void memory_region_destructor_rom_device(MemoryRegion *mr) { - qemu_ram_free(memory_region_get_ram_addr(mr) & TARGET_PAGE_MASK); + qemu_ram_free(mr->ram_block); } static bool memory_region_need_escape(char c)