[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-7.2.10 41/47] target/i386: mask high bits of CR3 in 32-bit mode
From: |
Michael Tokarev |
Subject: |
[Stable-7.2.10 41/47] target/i386: mask high bits of CR3 in 32-bit mode |
Date: |
Wed, 28 Feb 2024 23:35:09 +0300 |
From: Paolo Bonzini <pbonzini@redhat.com>
CR3 bits 63:32 are ignored in 32-bit mode (either legacy 2-level
paging or PAE paging). Do this in mmu_translate() to remove
the last where get_physical_address() meaningfully drops the high
bits of the address.
Cc: qemu-stable@nongnu.org
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Fixes: 4a1e9d4d11c ("target/i386: Use atomic operations for pte updates",
2022-10-18)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 68fb78d7d5723066ec2cacee7d25d67a4143b42f)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/target/i386/tcg/sysemu/excp_helper.c
b/target/i386/tcg/sysemu/excp_helper.c
index 55bd1194d3..c253226b3c 100644
--- a/target/i386/tcg/sysemu/excp_helper.c
+++ b/target/i386/tcg/sysemu/excp_helper.c
@@ -236,7 +236,7 @@ static bool mmu_translate(CPUX86State *env, const
TranslateParams *in,
/*
* Page table level 3
*/
- pte_addr = ((in->cr3 & ~0x1f) + ((addr >> 27) & 0x18)) & a20_mask;
+ pte_addr = ((in->cr3 & 0xffffffe0ULL) + ((addr >> 27) & 0x18)) &
a20_mask;
if (!ptw_translate(&pte_trans, pte_addr)) {
return false;
}
@@ -304,7 +304,7 @@ static bool mmu_translate(CPUX86State *env, const
TranslateParams *in,
/*
* Page table level 2
*/
- pte_addr = ((in->cr3 & ~0xfff) + ((addr >> 20) & 0xffc)) & a20_mask;
+ pte_addr = ((in->cr3 & 0xfffff000ULL) + ((addr >> 20) & 0xffc)) &
a20_mask;
if (!ptw_translate(&pte_trans, pte_addr)) {
return false;
}
--
2.39.2
- [Stable-7.2.10 v1 00/47] Patch Round-up for stable 7.2.10, freeze on 2024-03-02, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 33/47] meson: ensure dbus-display generated code is built before other units, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 35/47] docs/system: Update description for input grab key, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 36/47] system/vl: Update description for input grab key, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 37/47] .gitlab-ci.d/windows.yml: Drop msys2-32bit job, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 38/47] target/ppc: Fix lxv/stxv MSR facility check, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 39/47] hw/nvme: fix invalid endian conversion, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 40/47] pl031: Update last RTCLR value on write in case it's read back, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 41/47] target/i386: mask high bits of CR3 in 32-bit mode,
Michael Tokarev <=
- [Stable-7.2.10 44/47] target/i386: remove unnecessary/wrong application of the A20 mask, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 45/47] target/i386: leave the A20 bit set in the final NPT walk, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 42/47] target/i386: check validity of VMCB addresses, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 43/47] target/i386: Fix physical address truncation, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 46/47] tests/vm: update openbsd image to 7.4, Michael Tokarev, 2024/02/28
- [Stable-7.2.10 47/47] tests/vm: avoid re-building the VM images all the time, Michael Tokarev, 2024/02/28