From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEJ3E-0005wf-J8 for qemu-devel@nongnu.org; Thu, 22 Jan 2015 09:48:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEJ3D-00028O-LU for qemu-devel@nongnu.org; Thu, 22 Jan 2015 09:48:04 -0500 Received: from mail-wg0-x22f.google.com ([2a00:1450:400c:c00::22f]:55238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEJ3D-00028G-FL for qemu-devel@nongnu.org; Thu, 22 Jan 2015 09:48:03 -0500 Received: by mail-wg0-f47.google.com with SMTP id n12so2158397wgh.6 for ; Thu, 22 Jan 2015 06:48:02 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 22 Jan 2015 15:47:26 +0100 Message-Id: <1421938053-10318-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1421938053-10318-1-git-send-email-pbonzini@redhat.com> References: <1421938053-10318-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/15] exec: introduce cpu_reload_memory_map List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, 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. 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 a4f0eff..5a9e23f 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -144,6 +144,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 410371d..d79a1bc 100644 --- a/exec.c +++ b/exec.c @@ -2025,7 +2025,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