From: Weiwei Li <liweiwei@iscas.ac.cn>
To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org
Cc: palmer@dabbelt.com, alistair.francis@wdc.com,
bin.meng@windriver.com, dbarboza@ventanamicro.com,
zhiwei_liu@linux.alibaba.com, richard.henderson@linaro.org,
wangjunqiang@iscas.ac.cn, lazyparser@gmail.com,
Weiwei Li <liweiwei@iscas.ac.cn>
Subject: [PATCH v4 5/7] accel/tcg: Uncache the host address for instruction fetch when tlb size < 1
Date: Sat, 22 Apr 2023 21:03:27 +0800 [thread overview]
Message-ID: <20230422130329.23555-6-liweiwei@iscas.ac.cn> (raw)
In-Reply-To: <20230422130329.23555-1-liweiwei@iscas.ac.cn>
When PMP entry overlap part of the page, we'll set the tlb_size to 1, which
will make the address in tlb entry set with TLB_INVALID_MASK, and the next
access will again go through tlb_fill.However, this way will not work in
tb_gen_code() => get_page_addr_code_hostp(): the TLB host address will be
cached, and the following instructions can use this host address directly
which may lead to the bypass of PMP related check.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1542.
Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/cputlb.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index e984a98dc4..efa0cb67c9 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1696,6 +1696,11 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, target_ulong addr,
if (p == NULL) {
return -1;
}
+
+ if (full->lg_page_size < TARGET_PAGE_BITS) {
+ return -1;
+ }
+
if (hostp) {
*hostp = p;
}
--
2.25.1
next prev parent reply other threads:[~2023-04-22 13:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-22 13:03 [PATCH v4 0/7] target/riscv: Fix PMP related problem Weiwei Li
2023-04-22 13:03 ` [PATCH v4 1/7] target/riscv: Update pmp_get_tlb_size() Weiwei Li
2023-04-28 2:23 ` LIU Zhiwei
2023-04-22 13:03 ` [PATCH v4 2/7] target/riscv: Move pmp_get_tlb_size apart from get_physical_address_pmp Weiwei Li
2023-04-28 2:30 ` LIU Zhiwei
2023-04-22 13:03 ` [PATCH v4 3/7] target/riscv: Flush TLB when pmpaddr is updated Weiwei Li
2023-04-22 13:03 ` [PATCH v4 4/7] target/riscv: Flush TLB only when pmpcfg/pmpaddr really changes Weiwei Li
2023-04-22 13:03 ` Weiwei Li [this message]
2023-04-28 22:10 ` [PATCH v4 5/7] accel/tcg: Uncache the host address for instruction fetch when tlb size < 1 Richard Henderson
2023-04-22 13:03 ` [PATCH v4 6/7] target/riscv: Make the short cut really work in pmp_hart_has_privs Weiwei Li
2023-04-22 13:03 ` [PATCH v4 7/7] target/riscv: Separate pmp_update_rule() in pmpcfg_csr_write Weiwei Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230422130329.23555-6-liweiwei@iscas.ac.cn \
--to=liweiwei@iscas.ac.cn \
--cc=alistair.francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=dbarboza@ventanamicro.com \
--cc=lazyparser@gmail.com \
--cc=palmer@dabbelt.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=wangjunqiang@iscas.ac.cn \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).