RISC-V: KVM: Fix guest page fault within HLV* instructions
Subsystems (3)
PATCH v3 1/1 RISC-V: KVM: Fix guest page fault within HLV* instructions
From: Fangyu Yu <[email protected]>
When executing HLV* instructions at the HS mode, a guest page fault may occur when a g-stage page table migration between triggering the virtual instruction exception and executing the HLV* instruction.
This may be a corner case, and one simpler way to handle this is to re-execute the instruction where the virtual instruction exception occurred, and the guest page fault will be automatically handled.
---
Changes in v3:
- Add a helper function to avoid repeating the same paragraph(suggested by drew)
- Link to v2: https://lore.kernel.org/linux-riscv/[email protected]/
Changes in v2:
- Remove unnecessary modifications and add comments(suggested by Anup)
- Update Fixes tag
- Link to v1: https://lore.kernel.org/linux-riscv/[email protected]/
--- arch/riscv/kvm/vcpu_insn.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/riscv/kvm/vcpu_insn.c +22 -0
@@ -298,6 +298,22 @@ static int system_opcode_insn(struct kvm_vcpu *vcpu, struct kvm_run *run,return (rc <=0 ) ? rc :1 ; } +static bool is_load_guest_page_fault (unsigned long scause) +{ +/** +* If a g-stage page fault occurs, the direct approach +* is to let the g-stage page fault handler handle it +* naturally, however, calling the g-stage page fault +* handler here seems rather strange. +* Considering this is a corner case, we can directly +* return to the guest and re-execute the same PC, this +* will trigger a g-stage page fault again and then the +* regular g-stage page fault handler will populate +* g-stage page table. +*/ +return (scause ==EXC_LOAD_GUEST_PAGE_FAULT ); +} +/** * kvm_riscv_vcpu_virtual_insn -- Handle virtual instruction trap *
@@ -323,6 +339,8 @@ int kvm_riscv_vcpu_virtual_insn(struct kvm_vcpu *vcpu, struct kvm_run *run, ct->sepc, &utrap);if (utrap.scause) { +if (is_load_guest_page_fault (utrap.scause)) +return 1 ; utrap.sepc = ct->sepc;kvm_riscv_vcpu_trap_redirect (vcpu, &utrap);return 1 ;
@@ -378,6 +396,8 @@ int kvm_riscv_vcpu_mmio_load(struct kvm_vcpu *vcpu, struct kvm_run *run, insn =kvm_riscv_vcpu_unpriv_read (vcpu, true, ct->sepc, &utrap);if (utrap.scause) { +if (is_load_guest_page_fault (utrap.scause)) +return 1 ;/* Redirect trap if we failed to read instruction */ utrap.sepc = ct->sepc;kvm_riscv_vcpu_trap_redirect (vcpu, &utrap);
@@ -504,6 +524,8 @@ int kvm_riscv_vcpu_mmio_store(struct kvm_vcpu *vcpu, struct kvm_run *run, insn =kvm_riscv_vcpu_unpriv_read (vcpu, true, ct->sepc, &utrap);if (utrap.scause) { +if (is_load_guest_page_fault (utrap.scause)) +return 1 ;/* Redirect trap if we failed to read instruction */ utrap.sepc = ct->sepc;kvm_riscv_vcpu_trap_redirect (vcpu, &utrap);
Signature · 1 line
2.50.1
Quoted 7 lines · On Fri, Nov 21, 2025 at 7:06 PM <[email protected]> wrote:
From: Fangyu Yu <[email protected]>
When executing HLV* instructions at the HS mode, a guest page fault may occur when a g-stage page table migration between triggering the virtual instruction exception and executing the HLV* instruction.
Quoted 6 lines
This may be a corner case, and one simpler way to handle this is to re-execute the instruction where the virtual instruction exception occurred, and the guest page fault will be automatically handled.
Fixes b91f0e4cb8a3 ("RISC-V: KVM: Factor-out instruction emulation into separate sources")Signed-off-by Fangyu Yu <[email protected]>
LGTM.
Queued this patch for Linux-6.19
Regards,
Anup
Quoted 71 lines
---
Changes in v3:
- Add a helper function to avoid repeating the same paragraph(suggested by drew)
- Link to v2: https://lore.kernel.org/linux-riscv/[email protected]/Changes in v2:
- Remove unnecessary modifications and add comments(suggested by Anup)
- Update Fixes tag
- Link to v1: https://lore.kernel.org/linux-riscv/[email protected]/--- arch/riscv/kvm/vcpu_insn.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/riscv/kvm/vcpu_insn.c +22
-1@@ -298,6 +298,22 @@ static int system_opcode_insn(struct kvm_vcpu *vcpu, struct kvm_run *run,return (rc <=0 ) ? rc :1 ; } +static bool is_load_guest_page_fault (unsigned long scause) +{ +/** +* If a g-stage page fault occurs, the direct approach +* is to let the g-stage page fault handler handle it +* naturally, however, calling the g-stage page fault +* handler here seems rather strange. +* Considering this is a corner case, we can directly +* return to the guest and re-execute the same PC, this +* will trigger a g-stage page fault again and then the +* regular g-stage page fault handler will populate +* g-stage page table. +*/ +return (scause ==EXC_LOAD_GUEST_PAGE_FAULT ); +} +/** * kvm_riscv_vcpu_virtual_insn -- Handle virtual instruction trap * @@ -323,6 +339,8 @@ int kvm_riscv_vcpu_virtual_insn(struct kvm_vcpu *vcpu, struct kvm_run *run, ct->sepc, &utrap);if (utrap.scause) { +if (is_load_guest_page_fault (utrap.scause)) +return 1 ; utrap.sepc = ct->sepc;kvm_riscv_vcpu_trap_redirect (vcpu, &utrap);return 1 ;@@ -378,6 +396,8 @@ int kvm_riscv_vcpu_mmio_load(struct kvm_vcpu *vcpu, struct kvm_run *run, insn =kvm_riscv_vcpu_unpriv_read (vcpu, true, ct->sepc, &utrap);if (utrap.scause) { +if (is_load_guest_page_fault (utrap.scause)) +return 1 ;/* Redirect trap if we failed to read instruction */ utrap.sepc = ct->sepc;kvm_riscv_vcpu_trap_redirect (vcpu, &utrap);@@ -504,6 +524,8 @@ int kvm_riscv_vcpu_mmio_store(struct kvm_vcpu *vcpu, struct kvm_run *run, insn =kvm_riscv_vcpu_unpriv_read (vcpu, true, ct->sepc, &utrap);if (utrap.scause) { +if (is_load_guest_page_fault (utrap.scause)) +return 1 ;/* Redirect trap if we failed to read instruction */ utrap.sepc = ct->sepc;kvm_riscv_vcpu_trap_redirect (vcpu, &utrap); --2.50.1
This patch was applied to riscv/linux.git (fixes) by Anup Patel <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (fixes)
by Anup Patel <[email protected]>:
Quoted 11 lines · On Fri, 21 Nov 2025 21:35:43 +0800 you wrote:
From: Fangyu Yu <[email protected]>
When executing HLV* instructions at the HS mode, a guest page fault may occur when a g-stage page table migration between triggering the virtual instruction exception and executing the HLV* instruction.
This may be a corner case, and one simpler way to handle this is to re-execute the instruction where the virtual instruction exception occurred, and the guest page fault will be automatically handled.
[...]
Here is the summary with links:
- [v3] RISC-V: KVM: Fix guest page fault within HLV* instructions
https://git.kernel.org/riscv/c/974555d6e417
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html