From patchwork Sat Aug 27 18:09:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umesh Deshpande X-Patchwork-Id: 111884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DF7C6B7091 for ; Sun, 28 Aug 2011 04:47:00 +1000 (EST) Received: from localhost ([::1]:54573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QxNMw-0000eX-Qx for incoming@patchwork.ozlabs.org; Sat, 27 Aug 2011 14:12:34 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QxNMP-0007MD-8i for qemu-devel@nongnu.org; Sat, 27 Aug 2011 14:12:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QxNMM-00048S-N7 for qemu-devel@nongnu.org; Sat, 27 Aug 2011 14:12:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QxNMM-00047y-EN for qemu-devel@nongnu.org; Sat, 27 Aug 2011 14:11:58 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7RIBu8o025744 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 27 Aug 2011 14:11:56 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7RIBuN9024802; Sat, 27 Aug 2011 14:11:56 -0400 Received: from umeshhome.redhat.com (vpn-11-120.rdu.redhat.com [10.11.11.120]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p7RIBs8x009125; Sat, 27 Aug 2011 14:11:55 -0400 From: Umesh Deshpande To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Sat, 27 Aug 2011 14:09:45 -0400 Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Umesh Deshpande Subject: [Qemu-devel] [PATCH 2/5] MRU ram block list 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 This patch creates a new list of RAM blocks in MRU order. So that separate locking rules can be applied to the regular RAM block list and the MRU list. Signed-off-by: Paolo Bonzini --- cpu-all.h | 2 ++ exec.c | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index e839100..6b217a2 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -925,6 +925,7 @@ typedef struct RAMBlock { uint32_t flags; char idstr[256]; QLIST_ENTRY(RAMBlock) next; + QLIST_ENTRY(RAMBlock) next_mru; #if defined(__linux__) && !defined(TARGET_S390X) int fd; #endif @@ -933,6 +934,7 @@ typedef struct RAMBlock { typedef struct RAMList { uint8_t *phys_dirty; QLIST_HEAD(ram, RAMBlock) blocks; + QLIST_HEAD(, RAMBlock) blocks_mru; } RAMList; extern RAMList ram_list; diff --git a/exec.c b/exec.c index 0e2ce57..c5c247c 100644 --- a/exec.c +++ b/exec.c @@ -113,7 +113,11 @@ static uint8_t *code_gen_ptr; int phys_ram_fd; static int in_migration; -RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list) }; +RAMList ram_list = { + .blocks = QLIST_HEAD_INITIALIZER(ram_list), + .blocks_mru = QLIST_HEAD_INITIALIZER(ram_list.blocks_mru) +}; + #endif CPUState *first_cpu; @@ -2973,6 +2977,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->length = size; QLIST_INSERT_HEAD(&ram_list.blocks, new_block, next); + QLIST_INSERT_HEAD(&ram_list.blocks_mru, new_block, next_mru); ram_list.phys_dirty = qemu_realloc(ram_list.phys_dirty, last_ram_offset() >> TARGET_PAGE_BITS); @@ -2997,6 +3002,7 @@ void qemu_ram_free_from_ptr(ram_addr_t addr) QLIST_FOREACH(block, &ram_list.blocks, next) { if (addr == block->offset) { QLIST_REMOVE(block, next); + QLIST_REMOVE(block, next_mru); qemu_free(block); return; } @@ -3010,6 +3016,7 @@ void qemu_ram_free(ram_addr_t addr) QLIST_FOREACH(block, &ram_list.blocks, next) { if (addr == block->offset) { QLIST_REMOVE(block, next); + QLIST_REMOVE(block, next_mru); if (block->flags & RAM_PREALLOC_MASK) { ; } else if (mem_path) { @@ -3113,12 +3120,12 @@ void *qemu_get_ram_ptr(ram_addr_t addr) { RAMBlock *block; - QLIST_FOREACH(block, &ram_list.blocks, next) { + QLIST_FOREACH(block, &ram_list.blocks_mru, next_mru) { if (addr - block->offset < block->length) { /* Move this entry to to start of the list. */ if (block != QLIST_FIRST(&ram_list.blocks)) { - QLIST_REMOVE(block, next); - QLIST_INSERT_HEAD(&ram_list.blocks, block, next); + QLIST_REMOVE(block, next_mru); + QLIST_INSERT_HEAD(&ram_list.blocks_mru, block, next_mru); } if (xen_mapcache_enabled()) { /* We need to check if the requested address is in the RAM @@ -3211,7 +3218,7 @@ int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr) return 0; } - QLIST_FOREACH(block, &ram_list.blocks, next) { + QLIST_FOREACH(block, &ram_list.blocks_mru, next_mru) { /* This case append when the block is not mapped. */ if (block->host == NULL) { continue;