accel/tcg: Allow overlapping reads in record_save
PATCH 1/1 accel/tcg: Allow overlapping reads in record_save
record_save() assumed that a target reads the bytes of an insn as a strictly ascending sequence of adjacent chunks, and asserted that each read begins exactly where the previous one ended.
That assumption no longer holds for riscv. Since f9eaa1542b ("target/riscv: support atomic instruction fetch (Ziccif)"), decode_opc() loads a full aligned word whenever pc is 4-byte aligned, even when the insn turns out to be a 2-byte compressed one, so the record may already hold bytes past the end of the insn being translated. When such a compressed insn sits at page offset 0xffc, pc_next becomes 0xffe, which is within MAX_INSN_LEN of the end of the page, and riscv_tr_translate_insn() probes the next insn to decide whether it would cross the page boundary. That probe reads at offset 2 while the record already covers [0,4), and the assert fires:
qemu-system-riscv32: accel/tcg/translator.c:395: record_save:
Assertion `offset == db->record_start + db->record_len' failed.
record_save() is only reached when the insn is fetched from MMIO, so this is visible on boards that execute code from a region created with memory_region_init_io(), such as an XIP flash window mapped over a serial flash controller.
Both sides of the collision are correct: the wide fetch is required for Ziccif atomicity, and the probe is required for correct fault reporting at a page boundary, per 00c07344fa ("target/riscv: Make translator stop before the end of a page"). Unlike a86d3352ab ("target/riscv: do not use translator_ldl in opcode_at"), where a non-translation caller had no business using translator_ld*, the probe here is a genuine translation read whose bytes must be recorded.
Relax the invariant instead. Keep requiring that a read neither moves backwards nor leaves a gap, but let a read overlapping the recorded range extend it only by the bytes past its end.
--- accel/tcg/translator.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
accel/tcg/translator.c +11 -3
@@ -387,14 +387,22 @@ static void record_save(DisasContextBase *db, vaddr pc,* Either the first or second page may be I/O. If it is the second, * then the first byte we need to record will be at a non-zero offset. * In either case, we should not need to record but a single insn. +* +* A read may re-read bytes that are already recorded: a target may +* fetch a whole aligned word to decode an insn (e.g. riscv Ziccif), +* then probe the following insn, which lies within that same word. +* Such a read extends the record only by the bytes past its end. */ if (db->record_len ==0 ) { db->record_start = offset; db->record_len = size; }else { -assert (offset == db->record_start + db->record_len); -assert (db->record_len + size <=sizeof (db->record)); - db->record_len += size; +int end = offset - db->record_start + size; + +assert (offset >= db->record_start); +assert (offset <= db->record_start + db->record_len); +assert (end <=sizeof (db->record)); + db->record_len =MAX (db->record_len, end); }memcpy (db->record + (offset - db->record_start), from, size);
Signature · 1 line
2.43.0
Quoted 35 lines · Ilya Chichkov
record_save()assumed that a target reads the bytes of an insn as a strictly ascending sequence of adjacent chunks, and asserted that each read begins exactly where the previous one ended.That assumption no longer holds for riscv. Since
f9eaa1542b("target/riscv: support atomic instruction fetch (Ziccif)"),decode_opc()loads a full aligned word whenever pc is 4-byte aligned, even when the insn turns out to be a 2-byte compressed one, so the record may already hold bytes past the end of the insn being translated. When such a compressed insn sits at page offset0xffc,pc_nextbecomes0xffe, which is withinMAX_INSN_LENof the end of the page, andriscv_tr_translate_insn()probes the next insn to decide whether it would cross the page boundary. That probe reads at offset 2 while the record already covers [0,4), and the assert fires:qemu-system-riscv32:
accel/tcg/translator.c:395:record_save:Assertion `offset == db->record_start + db->record_len' failed.
record_save()is only reached when the insn is fetched from MMIO, so this is visible on boards that execute code from a region created withmemory_region_init_io(), such as an XIP flash window mapped over a serial flash controller.Both sides of the collision are correct: the wide fetch is required for Ziccif atomicity, and the probe is required for correct fault reporting at a page boundary, per
00c07344fa("target/riscv: Make translator stop before the end of a page"). Unlikea86d3352ab("target/riscv: do not usetranslator_ldlinopcode_at"), where a non-translation caller had no business using translator_ld*, the probe here is a genuine translation read whose bytes must be recorded.Relax the invariant instead. Keep requiring that a read neither moves backwards nor leaves a gap, but let a read overlapping the recorded range extend it only by the bytes past its end.
Quoted 5 lines
Fixes f9eaa1542b ("target/riscv: support atomic instruction fetch (Ziccif)")Signed-off-by Ilya Chichkov <[email protected]>--- accel/tcg/translator.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
Applied to tcg-next.
r~