RISC-V: KVM: Fix privilege mode setting in kvm_riscv_vcpu_trap_redirect()
Subsystems (3)
PATCH v3 1/2 RISC-V: KVM: Fix privilege mode setting in kvm_riscv_vcpu_trap_redirect()
The kvm_riscv_vcpu_trap_redirect() should set guest privilege mode to supervisor mode because guest traps/interrupts are always handled in virtual supervisor mode.
--- arch/riscv/kvm/vcpu_exit.c | 3 +++ 1 file changed, 3 insertions(+)
arch/riscv/kvm/vcpu_exit.c +3 -0
@@ -160,6 +160,9 @@ void kvm_riscv_vcpu_trap_redirect(struct kvm_vcpu *vcpu,/* Set Guest PC to Guest exception vector */ vcpu->arch.guest_context.sepc =csr_read (CSR_VSTVEC ); + +/* Set Guest privilege mode to supervisor */ + vcpu->arch.guest_context.sstatus |=SR_SPP ; }/*
Signature · 1 line
2.34.1
PATCH v3 2/2 RISC-V: KVM: Redirect illegal instruction traps to guest
From: Andy Chiu <[email protected]>
The M-mode redirects an unhandled illegal instruction trap back to S-mode. However, KVM running in HS-mode terminates the VS-mode software when it receives illegal instruction trap. Instead, KVM should redirect the illegal instruction trap back to VS-mode, and let VS-mode trap handler decide the next step. This futher allows guest kernel to implement on-demand enabling of vector extension for a guest user space process upon first-use.
--- arch/riscv/kvm/vcpu_exit.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/riscv/kvm/vcpu_exit.c +6 -0
@@ -182,6 +182,12 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, ret = -EFAULT ; run->exit_reason =KVM_EXIT_UNKNOWN ;switch (trap->scause) { +case EXC_INST_ILLEGAL : +if (vcpu->arch.guest_context.hstatus &HSTATUS_SPV ) { +kvm_riscv_vcpu_trap_redirect (vcpu, trap); + ret =1 ; + } +break ;case EXC_VIRTUAL_INST_FAULT :if (vcpu->arch.guest_context.hstatus &HSTATUS_SPV ) ret =kvm_riscv_vcpu_virtual_insn (vcpu, run, trap);
Signature · 1 line
2.34.1
Re: [PATCH v3 2/2] RISC-V: KVM: Redirect illegal instruction traps to guest
Quoted 36 lines · Anup Patel
From: Andy Chiu <[email protected]>
The M-mode redirects an unhandled illegal instruction trap back to S-mode. However, KVM running in HS-mode terminates the VS-mode software when it receives illegal instruction trap. Instead, KVM should redirect the illegal instruction trap back to VS-mode, and let VS-mode trap handler decide the next step. This futher allows guest kernel to implement on-demand enabling of vector extension for a guest user space process upon first-use.
Signed-off-by Andy Chiu <[email protected]>Signed-off-by Anup Patel <[email protected]>Reviewed-by Andrew Jones <[email protected]>--- arch/riscv/kvm/vcpu_exit.c | 6 ++++++ 1 file changed, 6 insertions(+)arch/riscv/kvm/vcpu_exit.c +6
-1@@ -182,6 +182,12 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, ret = -EFAULT ; run->exit_reason =KVM_EXIT_UNKNOWN ;switch (trap->scause) { +case EXC_INST_ILLEGAL : +if (vcpu->arch.guest_context.hstatus &HSTATUS_SPV ) { +kvm_riscv_vcpu_trap_redirect (vcpu, trap); + ret =1 ; + } +break ;case EXC_VIRTUAL_INST_FAULT :if (vcpu->arch.guest_context.hstatus &HSTATUS_SPV ) ret =kvm_riscv_vcpu_virtual_insn (vcpu, run, trap); --
Quoted 2 lines
2.34.1
Signature · 2 lines
Regards, Atish
Anup Patel
maintainerRe: [PATCH v3 2/2] RISC-V: KVM: Redirect illegal instruction traps to guest
In reply to Anup PatelQuoted 11 lines · Anup Patel
From: Andy Chiu <[email protected]>
The M-mode redirects an unhandled illegal instruction trap back to S-mode. However, KVM running in HS-mode terminates the VS-mode software when it receives illegal instruction trap. Instead, KVM should redirect the illegal instruction trap back to VS-mode, and let VS-mode trap handler decide the next step. This futher allows guest kernel to implement on-demand enabling of vector extension for a guest user space process upon first-use.
Quoted 3 lines
Signed-off-by Andy Chiu <[email protected]>Signed-off-by Anup Patel <[email protected]>Reviewed-by Andrew Jones <[email protected]>
Queued this patch for Linux-6.3
Thanks,
Anup
Quoted 24 lines
--- arch/riscv/kvm/vcpu_exit.c | 6 ++++++ 1 file changed, 6 insertions(+)arch/riscv/kvm/vcpu_exit.c +6
-1@@ -182,6 +182,12 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, ret = -EFAULT ; run->exit_reason =KVM_EXIT_UNKNOWN ;switch (trap->scause) { +case EXC_INST_ILLEGAL : +if (vcpu->arch.guest_context.hstatus &HSTATUS_SPV ) { +kvm_riscv_vcpu_trap_redirect (vcpu, trap); + ret =1 ; + } +break ;case EXC_VIRTUAL_INST_FAULT :if (vcpu->arch.guest_context.hstatus &HSTATUS_SPV ) ret =kvm_riscv_vcpu_virtual_insn (vcpu, run, trap); --2.34.1
Quoted 27 lines · Anup Patel
The
kvm_riscv_vcpu_trap_redirect()should set guest privilege mode to supervisor mode because guest traps/interrupts are always handled in virtual supervisor mode.Fixes 9f7013265112 ("RISC-V: KVM: Handle MMIO exits for VCPU")Signed-off-by Anup Patel <[email protected]>--- arch/riscv/kvm/vcpu_exit.c | 3 +++ 1 file changed, 3 insertions(+)arch/riscv/kvm/vcpu_exit.c +3
-0@@ -160,6 +160,9 @@ void kvm_riscv_vcpu_trap_redirect(struct kvm_vcpu *vcpu,/* Set Guest PC to Guest exception vector */ vcpu->arch.guest_context.sepc =csr_read (CSR_VSTVEC ); + +/* Set Guest privilege mode to supervisor */ + vcpu->arch.guest_context.sstatus |=SR_SPP ; }/* Signature · 1 line
2.34.1
Thanks,
drew
Quoted 26 lines · Anup Patel
The
kvm_riscv_vcpu_trap_redirect()should set guest privilege mode to supervisor mode because guest traps/interrupts are always handled in virtual supervisor mode.Fixes 9f7013265112 ("RISC-V: KVM: Handle MMIO exits for VCPU")Signed-off-by Anup Patel <[email protected]>--- arch/riscv/kvm/vcpu_exit.c | 3 +++ 1 file changed, 3 insertions(+)arch/riscv/kvm/vcpu_exit.c +3
-1@@ -160,6 +160,9 @@ void kvm_riscv_vcpu_trap_redirect(struct kvm_vcpu *vcpu,/* Set Guest PC to Guest exception vector */ vcpu->arch.guest_context.sepc =csr_read (CSR_VSTVEC ); + +/* Set Guest privilege mode to supervisor */ + vcpu->arch.guest_context.sstatus |=SR_SPP ; }/* --
Quoted 2 lines
2.34.1
Signature · 2 lines
Regards, Atish
Anup Patel
maintainerQuoted 7 lines · Anup Patel
The
kvm_riscv_vcpu_trap_redirect()should set guest privilege mode to supervisor mode because guest traps/interrupts are always handled in virtual supervisor mode.Fixes 9f7013265112 ("RISC-V: KVM: Handle MMIO exits for VCPU")Signed-off-by Anup Patel <[email protected]>
Queued this patch for Linux-6.3
Thanks,
Anup
Quoted 21 lines
--- arch/riscv/kvm/vcpu_exit.c | 3 +++ 1 file changed, 3 insertions(+)arch/riscv/kvm/vcpu_exit.c +3
-1@@ -160,6 +160,9 @@ void kvm_riscv_vcpu_trap_redirect(struct kvm_vcpu *vcpu,/* Set Guest PC to Guest exception vector */ vcpu->arch.guest_context.sepc =csr_read (CSR_VSTVEC ); + +/* Set Guest privilege mode to supervisor */ + vcpu->arch.guest_context.sstatus |=SR_SPP ; }/* -- 2.34.1