[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] target/s390x: Exit tb after executing ex_value
From: |
Richard Henderson |
Subject: |
[PATCH] target/s390x: Exit tb after executing ex_value |
Date: |
Thu, 30 Jun 2022 08:46:35 +0530 |
When EXECUTE sets ex_value to interrupt the constructed instruction,
we implicitly disable interrupts so that the value is not corrupted.
Exit to the main loop after execution, so that we re-evaluate any
pending interrupts.
Reported-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
Hi Sven. Will you test this vs your testcase? Thanks,
r~
---
target/s390x/tcg/translate.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index fd2433d625..e52c2a4a6f 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -6620,11 +6620,18 @@ static void s390x_tr_translate_insn(DisasContextBase
*dcbase, CPUState *cs)
dc->base.is_jmp = translate_one(env, dc);
if (dc->base.is_jmp == DISAS_NEXT) {
- uint64_t page_start;
-
- page_start = dc->base.pc_first & TARGET_PAGE_MASK;
- if (dc->base.pc_next - page_start >= TARGET_PAGE_SIZE || dc->ex_value)
{
- dc->base.is_jmp = DISAS_TOO_MANY;
+ if (unlikely(dc->ex_value)) {
+ /*
+ * Because ex_value was set, s390_cpu_exec_interrupt may
+ * have skipped an interrupt. Exit to the main loop to
+ * re-evaluate interrupts, as we do for LCTL.
+ */
+ dc->base.is_jmp = DISAS_PC_STALE_NOCHAIN;
+ } else {
+ uint64_t page_start = dc->base.pc_first & TARGET_PAGE_MASK;
+ if (dc->base.pc_next - page_start >= TARGET_PAGE_SIZE) {
+ dc->base.is_jmp = DISAS_TOO_MANY;
+ }
}
}
}
--
2.34.1
- [PATCH] target/s390x: Exit tb after executing ex_value,
Richard Henderson <=