[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/7] accel/tcg: Allow the second page of an instruction to be MMIO
From: |
Richard Henderson |
Subject: |
[PULL 1/7] accel/tcg: Allow the second page of an instruction to be MMIO |
Date: |
Sun, 19 Feb 2023 17:23:32 -1000 |
If an instruction straddles a page boundary, and the first page
was ram, but the second page was MMIO, we would abort. Handle
this as if both pages are MMIO, by setting the ram_addr_t for
the first page to -1.
Reported-by: Sid Manning <sidneym@quicinc.com>
Reported-by: Jørgen Hansen <Jorgen.Hansen@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/translator.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index ef5193c67e..1cf404ced0 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -176,8 +176,16 @@ static void *translator_access(CPUArchState *env,
DisasContextBase *db,
if (host == NULL) {
tb_page_addr_t phys_page =
get_page_addr_code_hostp(env, base, &db->host_addr[1]);
- /* We cannot handle MMIO as second page. */
- assert(phys_page != -1);
+
+ /*
+ * If the second page is MMIO, treat as if the first page
+ * was MMIO as well, so that we do not cache the TB.
+ */
+ if (unlikely(phys_page == -1)) {
+ tb_set_page_addr0(tb, -1);
+ return NULL;
+ }
+
tb_set_page_addr1(tb, phys_page);
#ifdef CONFIG_USER_ONLY
page_protect(end);
--
2.34.1
- [PULL 0/7] tcg patch queue, Richard Henderson, 2023/02/19
- [PULL 1/7] accel/tcg: Allow the second page of an instruction to be MMIO,
Richard Henderson <=
- [PULL 2/7] linux-user/sparc: Raise SIGILL for all unhandled software traps, Richard Henderson, 2023/02/19
- [PULL 3/7] linux-user: Always exit from exclusive state in fork_end(), Richard Henderson, 2023/02/19
- [PULL 4/7] cpus: Make {start,end}_exclusive() recursive, Richard Henderson, 2023/02/19
- [PULL 5/7] linux-user/microblaze: Handle privileged exception, Richard Henderson, 2023/02/19
- [PULL 6/7] tests/tcg/linux-test: Add linux-fork-trap test, Richard Henderson, 2023/02/19
- [PULL 7/7] target/microblaze: Add gdbstub xml, Richard Henderson, 2023/02/19
- Re: [PULL 0/7] tcg patch queue, Peter Maydell, 2023/02/21