diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2017-03-02 10:31:32 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2017-03-09 10:41:43 +0000 |
| commit | d8b2239bcd8872a5c5f7534d1658fc2365caab2d (patch) | |
| tree | dae9a030d9eaf7ddf2e76669346a5f5d09669d77 /translate-all.c | |
| parent | 47e20887970c3f267a4be9afacb72dbd51e6655f (diff) | |
translate-all: exit cpu_restore_state early if translating
The translation code uses cpu_ld*_code which can trigger a tlb_fill
which if it fails will erroneously attempts a fault resolution. This
never works during translation as the TB being generated hasn't been
added yet. The target should have checked retaddr before calling
cpu_restore_state but for those that have yet to be fixed we do it
here to avoid a recursive tb_lock() under MTTCG's new locking regime.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'translate-all.c')
| -rw-r--r-- | translate-all.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/translate-all.c b/translate-all.c index d42d003e67..34480aebba 100644 --- a/translate-all.c +++ b/translate-all.c @@ -333,6 +333,19 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t retaddr) TranslationBlock *tb; bool r = false; + /* A retaddr of zero is invalid so we really shouldn't have ended + * up here. The target code has likely forgotten to check retaddr + * != 0 before attempting to restore state. We return early to + * avoid blowing up on a recursive tb_lock(). The target must have + * previously survived a failed cpu_restore_state because + * tb_find_pc(0) would have failed anyway. It still should be + * fixed though. + */ + + if (!retaddr) { + return r; + } + tb_lock(); tb = tb_find_pc(retaddr); if (tb) { |