afd46fcad2
In icount mode, instructions that access io memory spaces in the middle
of the translation block invoke TB recompilation. After recompilation,
such instructions become last in the TB and are allowed to access io
memory spaces.
When the code includes instruction like i386 'xchg eax, 0xffffd080'
which accesses APIC, QEMU goes into an infinite loop of the recompilation.
This instruction includes two memory accesses - one read and one write.
After the first access, APIC calls cpu_report_tpr_access, which restores
the CPU state to get the current eip. But cpu_restore_state_from_tb
resets the cpu->can_do_io flag which makes the second memory access invalid.
Therefore the second memory access causes a recompilation of the block.
Then these operations repeat again and again.
This patch moves resetting cpu->can_do_io flag from
cpu_restore_state_from_tb to cpu_loop_exit* functions.
It also adds a parameter for cpu_restore_state which controls restoring
icount. There is no need to restore icount when we only query CPU state
without breaking the TB. Restoring it in such cases leads to the
incorrect flow of the virtual time.
In most cases new parameter is true (icount should be recalculated).
But there are two cases in i386 and openrisc when the CPU state is only
queried without the need to break the TB. This patch fixes both of
these cases.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Message-Id: <20180409091320.12504.35329.stgit@pasha-VirtualBox>
[rth: Make can_do_io setting unconditional; move from cpu_exec;
make cpu_loop_exit_{noexc,restore} call cpu_loop_exit.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
84 lines
2.8 KiB
C
84 lines
2.8 KiB
C
/*
|
|
* emulator main execution loop
|
|
*
|
|
* Copyright (c) 2003-2005 Fabrice Bellard
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "cpu.h"
|
|
#include "sysemu/cpus.h"
|
|
#include "exec/exec-all.h"
|
|
|
|
bool tcg_allowed;
|
|
|
|
/* exit the current TB, but without causing any exception to be raised */
|
|
void cpu_loop_exit_noexc(CPUState *cpu)
|
|
{
|
|
cpu->exception_index = -1;
|
|
cpu_loop_exit(cpu);
|
|
}
|
|
|
|
#if defined(CONFIG_SOFTMMU)
|
|
void cpu_reloading_memory_map(void)
|
|
{
|
|
if (qemu_in_vcpu_thread() && current_cpu->running) {
|
|
/* The guest can in theory prolong the RCU critical section as long
|
|
* as it feels like. The major problem with this is that because it
|
|
* can do multiple reconfigurations of the memory map within the
|
|
* critical section, we could potentially accumulate an unbounded
|
|
* collection of memory data structures awaiting reclamation.
|
|
*
|
|
* Because the only thing we're currently protecting with RCU is the
|
|
* memory data structures, it's sufficient to break the critical section
|
|
* in this callback, which we know will get called every time the
|
|
* memory map is rearranged.
|
|
*
|
|
* (If we add anything else in the system that uses RCU to protect
|
|
* its data structures, we will need to implement some other mechanism
|
|
* to force TCG CPUs to exit the critical section, at which point this
|
|
* part of this callback might become unnecessary.)
|
|
*
|
|
* This pair matches cpu_exec's rcu_read_lock()/rcu_read_unlock(), which
|
|
* only protects cpu->as->dispatch. Since we know our caller is about
|
|
* to reload it, it's safe to split the critical section.
|
|
*/
|
|
rcu_read_unlock();
|
|
rcu_read_lock();
|
|
}
|
|
}
|
|
#endif
|
|
|
|
void cpu_loop_exit(CPUState *cpu)
|
|
{
|
|
/* Undo the setting in cpu_tb_exec. */
|
|
cpu->can_do_io = 1;
|
|
siglongjmp(cpu->jmp_env, 1);
|
|
}
|
|
|
|
void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc)
|
|
{
|
|
if (pc) {
|
|
cpu_restore_state(cpu, pc, true);
|
|
}
|
|
cpu_loop_exit(cpu);
|
|
}
|
|
|
|
void cpu_loop_exit_atomic(CPUState *cpu, uintptr_t pc)
|
|
{
|
|
cpu->exception_index = EXCP_ATOMIC;
|
|
cpu_loop_exit_restore(cpu, pc);
|
|
}
|