From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkEPh-0006Qp-5O for qemu-devel@nongnu.org; Fri, 31 Oct 2014 11:47:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xjpx0-0007GB-Hk for qemu-devel@nongnu.org; Thu, 30 Oct 2014 09:39:48 -0400 Received: from mail.ispras.ru ([83.149.199.45]:42061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjpx0-0007Fq-AC for qemu-devel@nongnu.org; Thu, 30 Oct 2014 09:39:42 -0400 From: Pavel Dovgalyuk Date: Thu, 30 Oct 2014 16:39:41 +0300 Message-ID: <20141030133941.1088.96138.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] cpu-exec: fix cpu_exec_nocache List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mark.burton@greensocs.com, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, zealot351@gmail.com, fred.konrad@greensocs.com In icount mode cpu_exec_nocache function is used to execute part of the existing TB. At the end of cpu_exec_nocache newly created TB is deleted. Sometimes io_read function needs to recompile current TB and restart TB lookup and execution. After that tb_find_fast function finds old (bigger) TB again. This TB cannot be executed (because icount is not big enough) and cpu_exec_nocache is called again. Such a loop continues over and over. This patch deletes old TB and avoids finding it in the TB cache. Signed-off-by: Pavel Dovgalyuk --- cpu-exec.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 3913de0..8830255 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -202,13 +202,18 @@ static void cpu_exec_nocache(CPUArchState *env, int max_cycles, { CPUState *cpu = ENV_GET_CPU(env); TranslationBlock *tb; + target_ulong pc = orig_tb->pc; + target_ulong cs_base = orig_tb->cs_base; + uint64_t flags = orig_tb->flags; /* Should never happen. We only end up here when an existing TB is too long. */ if (max_cycles > CF_COUNT_MASK) max_cycles = CF_COUNT_MASK; - tb = tb_gen_code(cpu, orig_tb->pc, orig_tb->cs_base, orig_tb->flags, + /* tb_gen_code can flush our orig_tb, invalidate it now */ + tb_phys_invalidate(orig_tb, -1); + tb = tb_gen_code(cpu, pc, cs_base, flags, max_cycles); cpu->current_tb = tb; /* execute the generated code */