From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJmC6-0004q4-CC for qemu-devel@nongnu.org; Fri, 06 Feb 2015 11:55:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJmBu-0006tH-Ev for qemu-devel@nongnu.org; Fri, 06 Feb 2015 11:55:50 -0500 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:57986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJmBu-0006sp-8Q for qemu-devel@nongnu.org; Fri, 06 Feb 2015 11:55:38 -0500 Received: by mail-wi0-f174.google.com with SMTP id n3so3945699wiv.1 for ; Fri, 06 Feb 2015 08:55:37 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 6 Feb 2015 17:55:20 +0100 Message-Id: <1423241728-21758-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1423241728-21758-1-git-send-email-pbonzini@redhat.com> References: <1423241728-21758-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/9] exec: introduce cpu_reload_memory_map List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mike Day , famz@redhat.com, stefanha@redhat.com This for now is a simple TLB flush. This can change later for two reasons: 1) an AddressSpaceDispatch will be cached in the CPUState object 2) it will not be possible to do tlb_flush once the TCG-generated code runs outside the BQL. Reviewed-by: Fam Zheng Signed-off-by: Paolo Bonzini --- cpu-exec.c | 6 ++++++ exec.c | 2 +- include/exec/exec-all.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cpu-exec.c b/cpu-exec.c index fa506e6..78fe382 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -141,6 +141,12 @@ void cpu_resume_from_signal(CPUState *cpu, void *puc) cpu->exception_index = -1; siglongjmp(cpu->jmp_env, 1); } + +void cpu_reload_memory_map(CPUState *cpu) +{ + /* The TLB is protected by the iothread lock. */ + tlb_flush(cpu, 1); +} #endif /* Execute a TB, and fix up the CPU state afterwards if necessary */ diff --git a/exec.c b/exec.c index 6b79ad1..5a75909 100644 --- a/exec.c +++ b/exec.c @@ -2026,7 +2026,7 @@ static void tcg_commit(MemoryListener *listener) if (cpu->tcg_as_listener != listener) { continue; } - tlb_flush(cpu, 1); + cpu_reload_memory_map(cpu); } } diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 6a15448..1b30813 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -96,6 +96,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_reload_memory_map(CPUState *cpu); void tcg_cpu_address_space_init(CPUState *cpu, AddressSpace *as); /* cputlb.c */ void tlb_flush_page(CPUState *cpu, target_ulong addr); -- 1.8.3.1