target/riscv: Ignore reserved bits in PTE for RV64
PATCH 1/1 target/riscv: Ignore reserved bits in PTE for RV64
From: Guo Ren <[email protected]>
Highest bits of PTE has been used for svpbmt, ref: [1], [2], so we need to ignore them. They cannot be a part of ppn.
1: The RISC-V Instruction Set Manual, Volume II: Privileged Architecture
4.4 Sv39: Page-Based 39-bit Virtual-Memory System
4.5 Sv48: Page-Based 48-bit Virtual-Memory System
2: https://github.com/riscv/virtual-memory/blob/main/specs/663-Svpbmt-diff.pdf
---
Changelog V7:
- Update svpbmt reason in commit log
Changelog V6:
- Add Reviewer: Alistair Francis
Changelog V5:
- Add Reviewer and Tester: Bin Meng
Changelog V4:
- Change title to Ignore not Bugfix
- Use PTE_PPN_MASK for RV32 and RV64
Changelog V3:
- Use UUL define for PTE_RESERVED
- Keep ppn >> PTE_PPN_SHIFT
Changelog V2:
- Bugfix pte destroyed cause boot fail
- Change to AND with a mask instead of shifting both directions
--- target/riscv/cpu_bits.h | 7 +++++++ target/riscv/cpu_helper.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
target/riscv/cpu_bits.h +7 -0
@@ -479,6 +479,13 @@ typedef enum {/* Page table PPN shift amount */ #define PTE_PPN_SHIFT 10 +/* Page table PPN mask */ +#if defined(TARGET_RISCV32 ) +#define PTE_PPN_MASK 0xffffffffUL +#elif defined(TARGET_RISCV64 ) +#define PTE_PPN_MASK 0x3fffffffffffffULL +#endif +/* Leaf page shift amount */ #define PGSHIFT 12
target/riscv/cpu_helper.c +1 -1
@@ -619,7 +619,7 @@ restart:return TRANSLATE_FAIL ; } -hwaddr ppn = pte >>PTE_PPN_SHIFT ; +hwaddr ppn = (pte &PTE_PPN_MASK ) >>PTE_PPN_SHIFT ;if (!(pte &PTE_V )) {/* Invalid PTE */
Signature · 1 line
2.25.1
Quoted 69 lines · On Mon, Jan 17, 2022 at 5:18 PM <[email protected]> wrote:
From: Guo Ren <[email protected]>
Highest bits of PTE has been used for svpbmt, ref: [1], [2], so we need to ignore them. They cannot be a part of ppn.
1: The RISC-V Instruction Set Manual, Volume II: Privileged Architecture
4.4 Sv39: Page-Based 39-bit Virtual-Memory System
4.5 Sv48: Page-Based 48-bit Virtual-Memory System2: https://github.com/riscv/virtual-memory/blob/main/specs/663-Svpbmt-diff.pdf
Signed-off-by Guo Ren <[email protected]>Tested-by Bin Meng <[email protected]>Reviewed-by Liu Zhiwei <[email protected]>Reviewed-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>Cc Weiwei Li <[email protected]>Cc Junqiang Wang <[email protected]>---
Changelog V7:
- Update svpbmt reason in commit logChangelog V6:
- Add Reviewer: Alistair FrancisChangelog V5:
- Add Reviewer and Tester: Bin MengChangelog V4:
- Change title to Ignore not Bugfix
- UsePTE_PPN_MASKfor RV32 and RV64Changelog V3:
- Use UUL define forPTE_RESERVED
- Keep ppn >>PTE_PPN_SHIFTChangelog V2:
- Bugfix pte destroyed cause boot fail
- Change to AND with a mask instead of shifting both directions--- target/riscv/cpu_bits.h | 7 +++++++ target/riscv/cpu_helper.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)target/riscv/cpu_bits.h +7
-0@@ -479,6 +479,13 @@ typedef enum {/* Page table PPN shift amount */ #define PTE_PPN_SHIFT 10 +/* Page table PPN mask */ +#if defined(TARGET_RISCV32 ) +#define PTE_PPN_MASK 0xffffffffUL +#elif defined(TARGET_RISCV64 ) +#define PTE_PPN_MASK 0x3fffffffffffffULL +#endif +/* Leaf page shift amount */ #define PGSHIFT 12target/riscv/cpu_helper.c +0
-0
target/riscv/cpu_helper.c restart: · line 622
Quoted 5 lines
target/riscv/cpu_helper.c +1
-1@@ -619,7 +619,7 @@ restart:return TRANSLATE_FAIL ; } -hwaddr ppn = pte >>PTE_PPN_SHIFT ; +hwaddr ppn = (pte &PTE_PPN_MASK ) >>PTE_PPN_SHIFT ;
This will need to be dynamic based on get_xl()
It does look like we should check the existence of the extensions though:
"Bit 63 is reserved for use by the Svnapot extension in Chapter 5. If Svnapot is not implemented, bit 63 remains reserved and must be zeroed by software for forward compatibility, or else a page-fault exception is raised. Bits 62–61 are reserved for use by the Svpbmt extension in Chapter 6. If Svpbmt is not implemented, bits 62–61 remain reserved and must be zeroed by software for forward compatibility, or else a page-fault exception is raised."
Alistair
Quoted 7 lines
target/riscv/cpu_helper.c +0
-1if (!(pte &PTE_V )) {/* Invalid PTE */ --2.25.1