From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPuBE-0007II-DG for qemu-devel@nongnu.org; Sun, 21 Oct 2012 07:58:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPuBD-00038C-3l for qemu-devel@nongnu.org; Sun, 21 Oct 2012 07:58:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPuBC-000384-RH for qemu-devel@nongnu.org; Sun, 21 Oct 2012 07:58:55 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9LBwr5w000369 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 21 Oct 2012 07:58:53 -0400 Message-ID: <5083E370.2050502@redhat.com> Date: Sun, 21 Oct 2012 13:58:40 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1350545426-23172-1-git-send-email-quintela@redhat.com> <1350545426-23172-2-git-send-email-quintela@redhat.com> In-Reply-To: <1350545426-23172-2-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 01/30] split MRU ram list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: Paolo Bonzini , qemu-devel@nongnu.org On 10/18/2012 09:29 AM, Juan Quintela wrote: > From: Paolo Bonzini > > Outside the execution threads the normal, non-MRU-ized order of > the RAM blocks should always be enough. So manage two separate > lists, which will have separate locking rules. > > Signed-off-by: Paolo Bonzini > Signed-off-by: Juan Quintela > --- > arch_init.c | 1 + > cpu-all.h | 4 +++- > exec.c | 18 +++++++++++++----- > 3 files changed, 17 insertions(+), 6 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index e6effe8..4293557 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -48,6 +48,7 @@ > #include "qemu/page_cache.h" > #include "qmp-commands.h" > #include "trace.h" > +#include "cpu-all.h" > > #ifdef DEBUG_ARCH_INIT > #define DPRINTF(fmt, ...) \ > diff --git a/cpu-all.h b/cpu-all.h > index 6aa7e58..6558a6f 100644 > --- a/cpu-all.h > +++ b/cpu-all.h > @@ -490,8 +490,9 @@ typedef struct RAMBlock { > ram_addr_t offset; > ram_addr_t length; > uint32_t flags; > - char idstr[256]; > + QLIST_ENTRY(RAMBlock) next_mru; > QLIST_ENTRY(RAMBlock) next; > + char idstr[256]; > #if defined(__linux__) && !defined(TARGET_S390X) > int fd; > #endif > @@ -499,6 +500,7 @@ typedef struct RAMBlock { > > typedef struct RAMList { > uint8_t *phys_dirty; > + QLIST_HEAD(, RAMBlock) blocks_mru; > QLIST_HEAD(, RAMBlock) blocks; > } RAMList; > extern RAMList ram_list; > diff --git a/exec.c b/exec.c > index e63ad0d..718bbc2 100644 > --- a/exec.c > +++ b/exec.c > @@ -56,6 +56,7 @@ > #include "xen-mapcache.h" > #include "trace.h" > #endif > +#include "cpu-all.h" > > #include "cputlb.h" > > @@ -112,7 +113,10 @@ static uint8_t *code_gen_ptr; > int phys_ram_fd; > static int in_migration; > > -RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list.blocks) }; > +RAMList ram_list = { > + .blocks = QLIST_HEAD_INITIALIZER(ram_list.blocks), > + .blocks_mru = QLIST_HEAD_INITIALIZER(ram_list.blocks_mru) > +}; > > static MemoryRegion *system_memory; > static MemoryRegion *system_io; > @@ -633,6 +637,7 @@ bool tcg_enabled(void) > void cpu_exec_init_all(void) > { > #if !defined(CONFIG_USER_ONLY) > + qemu_mutex_init(&ram_list.mutex); > memory_map_init(); > io_mem_init(); > #endif > @@ -2568,6 +2573,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, > 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 = g_realloc(ram_list.phys_dirty, > last_ram_offset() >> TARGET_PAGE_BITS); > @@ -2595,6 +2601,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); > g_free(block); > return; > } > @@ -2608,6 +2615,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) { > @@ -2713,12 +2721,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_enabled()) { > /* We need to check if the requested address is in the RAM > @@ -2813,7 +2821,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; > Reviewed-by: Orit Wasserman