From patchwork Fri Nov 22 15:15:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 293496 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A23E82C009A for ; Sat, 23 Nov 2013 02:21:43 +1100 (EST) Received: from localhost ([::1]:39431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjsY9-0003i5-13 for incoming@patchwork.ozlabs.org; Fri, 22 Nov 2013 10:21:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjsXQ-0003Q8-Mf for qemu-devel@nongnu.org; Fri, 22 Nov 2013 10:21:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjsXI-0000Bk-4c for qemu-devel@nongnu.org; Fri, 22 Nov 2013 10:20:56 -0500 Received: from mail-la0-x22f.google.com ([2a00:1450:4010:c03::22f]:36979) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjsXH-0000Bc-9I for qemu-devel@nongnu.org; Fri, 22 Nov 2013 10:20:48 -0500 Received: by mail-la0-f47.google.com with SMTP id ep20so1037817lab.20 for ; Fri, 22 Nov 2013 07:20:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=mdyLPW8ns0cry42IwAfQrVzIOVsnKLO22UCHIANl2yY=; b=0NqOEmxjVhMc+FTfc/GxFo9Bc3cJHQahW01XU7k7D1o2ks8OMPlGi3DI3rxiIT+h9E bovV59+oBnbpSHIRh87/wyQpDsG12QnNCkR/jwb3iEUz9KbhFnEmzZlVr8pFcHlon9gc UI24oPjyWclSobR8uHYQkfQQXLANcVgJj9uoKflK0l3QswoJUX6dgB8dEto+naTzBksO A+qZ6NZ/Vd/pR9238K3jMUhHwCf3zuPCLaLgwiEkaDttUog3dggn/V8C4NakLJoJbSyl gYrYb3XJVUXPaXrOA9Fm5qcwLKzaAtRCRwLzeOIWnXzEDGyMa2I2DLxysKBTi9ERPxNr 3+NQ== X-Received: by 10.152.115.230 with SMTP id jr6mr1317015lab.45.1385133646333; Fri, 22 Nov 2013 07:20:46 -0800 (PST) Received: from localhost (h59ec325f.selukar.dyn.perspektivbredband.net. [89.236.50.95]) by mx.google.com with ESMTPSA id c10sm24177451lbd.9.2013.11.22.07.20.44 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 Nov 2013 07:20:45 -0800 (PST) From: edgar.iglesias@gmail.com To: qemu-devel@nongnu.org Date: Fri, 22 Nov 2013 16:15:57 +0100 Message-Id: <1385133359-13770-7-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1385133359-13770-1-git-send-email-edgar.iglesias@gmail.com> References: <1385133359-13770-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22f Subject: [Qemu-devel] [RFC PATCH 6/8] cpu: Add per-cpu address space 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: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- cputlb.c | 4 ++-- exec.c | 31 +++++++++++++++++++++++-------- include/exec/cpu-defs.h | 3 +++ include/exec/exec-all.h | 1 + include/exec/softmmu_template.h | 4 ++-- include/qom/cpu.h | 2 ++ 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/cputlb.c b/cputlb.c index 0399172..a2264a3 100644 --- a/cputlb.c +++ b/cputlb.c @@ -254,7 +254,7 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, } sz = size; - section = address_space_translate_for_iotlb(&address_space_memory, paddr, + section = address_space_translate_for_iotlb(env->as, paddr, &xlat, &sz); assert(sz >= TARGET_PAGE_SIZE); @@ -327,7 +327,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) cpu_ldub_code(env1, addr); } pd = env1->iotlb[mmu_idx][page_index] & ~TARGET_PAGE_MASK; - mr = iotlb_to_region(&address_space_memory, pd); + mr = iotlb_to_region(env1->as, pd); if (memory_region_is_unassigned(mr)) { CPUState *cpu = ENV_GET_CPU(env1); CPUClass *cc = CPU_GET_CLASS(cpu); diff --git a/exec.c b/exec.c index 0162eb3..acbd2e6 100644 --- a/exec.c +++ b/exec.c @@ -129,6 +129,7 @@ static PhysPageMap next_map; static void io_mem_init(void); static void memory_map_init(void); +static void tcg_commit(MemoryListener *listener); static MemoryRegion io_mem_watch; #endif @@ -361,6 +362,25 @@ CPUState *qemu_get_cpu(int index) return NULL; } +#if !defined(CONFIG_USER_ONLY) +void cpu_address_space_init(CPUState *cpu, AddressSpace *as) +{ + CPUArchState *env = cpu->env_ptr; + + if (tcg_enabled()) { + if (cpu->tcg_as_listener) { + memory_listener_unregister(cpu->tcg_as_listener); + } else { + cpu->tcg_as_listener = g_new0(MemoryListener, 1); + } + cpu->tcg_as_listener->commit = tcg_commit; + memory_listener_register(cpu->tcg_as_listener, as); + } + + env->as = as; +} +#endif + void cpu_exec_init(CPUArchState *env) { CPUState *cpu = ENV_GET_CPU(env); @@ -380,6 +400,7 @@ void cpu_exec_init(CPUArchState *env) QTAILQ_INIT(&env->breakpoints); QTAILQ_INIT(&env->watchpoints); #ifndef CONFIG_USER_ONLY + cpu_address_space_init(cpu, &address_space_memory); cpu->thread_id = qemu_get_thread_id(); #endif QTAILQ_INSERT_TAIL(&cpus, cpu, node); @@ -409,9 +430,10 @@ static void breakpoint_invalidate(CPUState *cpu, target_ulong pc) #else static void breakpoint_invalidate(CPUState *cpu, target_ulong pc) { + CPUArchState *env = cpu->env_ptr; hwaddr phys = cpu_get_phys_page_debug(cpu, pc); if (phys != -1) { - tb_invalidate_phys_addr(&address_space_memory, + tb_invalidate_phys_addr(env->as, phys | (pc & ~TARGET_PAGE_MASK)); } } @@ -1717,10 +1739,6 @@ static MemoryListener core_memory_listener = { .priority = 1, }; -static MemoryListener tcg_memory_listener = { - .commit = tcg_commit, -}; - void address_space_init_dispatch(AddressSpace *as) { as->dispatch = NULL; @@ -1755,9 +1773,6 @@ static void memory_map_init(void) address_space_init(&address_space_io, system_io, "I/O"); memory_listener_register(&core_memory_listener, &address_space_memory); - if (tcg_enabled()) { - memory_listener_register(&tcg_memory_listener, &address_space_memory); - } } MemoryRegion *get_system_memory(void) diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 01cd8c7..406b36c 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -176,6 +176,9 @@ typedef struct CPUWatchpoint { sigjmp_buf jmp_env; \ int exception_index; \ \ + /* Per CPU address-space. */ \ + AddressSpace *as; \ + \ /* user data */ \ void *opaque; \ diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 6129365..61770ee 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -95,6 +95,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end, int is_cpu_write_access); #if !defined(CONFIG_USER_ONLY) +void cpu_address_space_init(CPUState *cpu, AddressSpace *as); /* cputlb.c */ void tlb_flush_page(CPUArchState *env, target_ulong addr); void tlb_flush(CPUArchState *env, int flush_global); diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h index 69d856a..1dacb4d 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -119,7 +119,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, uintptr_t retaddr) { uint64_t val; - MemoryRegion *mr = iotlb_to_region(&address_space_memory, physaddr); + MemoryRegion *mr = iotlb_to_region(env->as, physaddr); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; env->mem_io_pc = retaddr; @@ -325,7 +325,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, target_ulong addr, uintptr_t retaddr) { - MemoryRegion *mr = iotlb_to_region(&address_space_memory, physaddr); + MemoryRegion *mr = iotlb_to_region(env->as, physaddr); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) { diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 7739e00..c1febae 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -186,6 +186,8 @@ struct CPUState { uint32_t interrupt_request; int singlestep_enabled; + MemoryListener *tcg_as_listener; + void *env_ptr; /* CPUArchState */ struct TranslationBlock *current_tb; struct GDBRegisterState *gdb_regs;