From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [PULL 10/12] cputlb: Fix tlb_vaddr_to_host
Date: Fri, 25 Oct 2019 10:21:57 -0400 [thread overview]
Message-ID: <20191025142159.12459-11-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191025142159.12459-1-richard.henderson@linaro.org>
Using uintptr_t instead of target_ulong meant that, for 64-bit guest
and 32-bit host, we truncated the guest address comparator and so may
not hit the tlb when we should.
Fixes: 4811e9095c0
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/cputlb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 6f4194df96..5eebddcca8 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1189,7 +1189,7 @@ void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr,
MMUAccessType access_type, int mmu_idx)
{
CPUTLBEntry *entry = tlb_entry(env, mmu_idx, addr);
- uintptr_t tlb_addr, page;
+ target_ulong tlb_addr, page;
size_t elt_ofs;
switch (access_type) {
--
2.17.1
next prev parent reply other threads:[~2019-10-25 14:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 14:21 [PULL 00/12] tcg patch queue Richard Henderson
2019-10-25 14:21 ` [PULL 01/12] tci: Add implementation for INDEX_op_ld16u_i64 Richard Henderson
2019-10-25 14:21 ` [PULL 02/12] cputlb: ensure _cmmu helper functions follow the naming standard Richard Henderson
2019-10-25 14:21 ` [PULL 03/12] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN Richard Henderson
2019-10-25 14:21 ` [PULL 04/12] exec: Split out variable page size support to exec-vary.c Richard Henderson
2019-10-25 14:21 ` [PULL 05/12] configure: Detect compiler support for __attribute__((alias)) Richard Henderson
2019-10-25 14:21 ` [PULL 06/12] exec: Use const alias for TARGET_PAGE_BITS_VARY Richard Henderson
2019-10-25 14:21 ` [PULL 07/12] exec: Restrict TARGET_PAGE_BITS_VARY assert to CONFIG_DEBUG_TCG Richard Henderson
2019-10-25 14:21 ` [PULL 08/12] exec: Promote TARGET_PAGE_MASK to target_long Richard Henderson
2019-10-25 14:21 ` [PULL 09/12] exec: Cache TARGET_PAGE_MASK for TARGET_PAGE_BITS_VARY Richard Henderson
2019-10-25 14:21 ` Richard Henderson [this message]
2019-10-25 14:21 ` [PULL 11/12] translate-all: fix uninitialized tb->orig_tb Richard Henderson
2019-10-25 14:21 ` [PULL 12/12] translate-all: Remove tb_alloc Richard Henderson
2019-10-25 16:12 ` [PULL 00/12] tcg patch queue Peter Maydell
2019-10-25 20:48 ` Richard Henderson
2019-10-26 11:04 ` no-reply
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=20191025142159.12459-11-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).