diff options
author | Ilya Leoshkevich <iii@linux.ibm.com> | 2025-01-16 22:31:33 +0100 |
---|---|---|
committer | Richard Henderson <richard.henderson@linaro.org> | 2025-01-17 08:24:43 -0800 |
commit | 5313b1aaaccca99b2fe5a03fc6b3bfad65597b22 (patch) | |
tree | a761b1e0521fab759495d783074e25446756921b | |
parent | d3203d5a0cff5a7064fe52b99510835e6b7eb03b (diff) | |
download | qemu-5313b1aaaccca99b2fe5a03fc6b3bfad65597b22.zip qemu-5313b1aaaccca99b2fe5a03fc6b3bfad65597b22.tar.gz qemu-5313b1aaaccca99b2fe5a03fc6b3bfad65597b22.tar.bz2 |
accel/tcg: Call tcg_tb_insert() for one-insn TBs
Currently one-insn TBs created from I/O memory are not added to
region_trees. Therefore, when they generate exceptions, they are not
handled by cpu_restore_state_from_tb().
For x86 this is not a problem, because x86_restore_state_to_opc() only
restores pc and cc, which already have the correct values if the first
TB instruction causes an exception. However, on several other
architectures, restore_state_to_opc() is not stricly limited to state
restoration and affects some exception-related registers, where guests
can notice incorrect values, for example:
- arm's exception.syndrome;
- hppa's unwind_breg;
- riscv's excp_uw2;
- s390x's int_pgm_ilen.
Fix by always calling tcg_tb_insert(). This may increase the size of
region_trees, but tcg_region_reset_all() clears it once code_gen_buffer
fills up, so it will not grow uncontrollably.
Do not call tb_link_page(), which would add such TBs to the QHT, to
prevent tb_lookup() from finding them. These TBs are single-use, since
subsequent reads from I/O memory may return different values; they are
not removed from code_gen_buffer only in order to keep things simple.
Co-developed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20250116213214.5695-2-iii@linux.ibm.com>
-rw-r--r-- | accel/tcg/translate-all.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 453eb20..7ec1c53 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -532,9 +532,25 @@ TranslationBlock *tb_gen_code(CPUState *cpu, } /* + * Insert TB into the corresponding region tree before publishing it + * through QHT. Otherwise rewinding happened in the TB might fail to + * lookup itself using host PC. + */ + tcg_tb_insert(tb); + + /* * If the TB is not associated with a physical RAM page then it must be - * a temporary one-insn TB, and we have nothing left to do. Return early - * before attempting to link to other TBs or add to the lookup table. + * a temporary one-insn TB. + * + * Such TBs must be added to region trees in order to make sure that + * restore_state_to_opc() - which on some architectures is not limited to + * rewinding, but also affects exception handling! - is called when such a + * TB causes an exception. + * + * At the same time, temporary one-insn TBs must be executed at most once, + * because subsequent reads from, e.g., I/O memory may return different + * values. So return early before attempting to link to other TBs or add + * to the QHT. */ if (tb_page_addr0(tb) == -1) { assert_no_pages_locked(); @@ -542,13 +558,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, } /* - * Insert TB into the corresponding region tree before publishing it - * through QHT. Otherwise rewinding happened in the TB might fail to - * lookup itself using host PC. - */ - tcg_tb_insert(tb); - - /* * No explicit memory barrier is required -- tb_link_page() makes the * TB visible in a consistent state. */ |