RISC-V: KVM: Add hideleg to struct kvm_vcpu_config

The hideleg CSR state when VCPU is running in guest VS/VU-mode will
be different from when it is running in guest HS-mode. To achieve
this, add hideleg to struct kvm_vcpu_config and re-program hideleg
CSR upon every kvm_arch_vcpu_load().

Signed-off-by: Anup Patel <anup.patel@oss.qualcomm.com>
Reviewed-by: Radim Krčmář <radim.krcmar@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260120080013.2153519-8-anup.patel@oss.qualcomm.com
Signed-off-by: Anup Patel <anup@brainfault.org>

diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h
index 7ee47b83c80d5cce402503fc96741af1fa0b1161..abf4f388eac5fc9a6828a674221a66660cba0fb2 100644 (file)
--- a/arch/riscv/include/asm/kvm_host.h
+++ b/arch/riscv/include/asm/kvm_host.h
@@ -171,6 +171,7 @@ struct kvm_vcpu_config {
        u64 henvcfg;
        u64 hstateen0;
        unsigned long hedeleg;
+       unsigned long hideleg;
 };
 
 struct kvm_vcpu_smstateen_csr {

diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c
index 1d5c777eba80b044cf6ff9dd01c7bcea9fd533e6..77a9400d729348b3746fb0d5cf8a03843a63ddcc 100644 (file)
--- a/arch/riscv/kvm/vcpu.c
+++ b/arch/riscv/kvm/vcpu.c
@@ -136,6 +136,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
        vcpu->arch.ran_atleast_once = false;
 
        vcpu->arch.cfg.hedeleg = KVM_HEDELEG_DEFAULT;
+       vcpu->arch.cfg.hideleg = KVM_HIDELEG_DEFAULT;
        vcpu->arch.mmu_page_cache.gfp_zero = __GFP_ZERO;
        bitmap_zero(vcpu->arch.isa, RISCV_ISA_EXT_MAX);
 
@@ -610,6 +611,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
                nacl_csr_write(nsh, CSR_VSCAUSE, csr->vscause);
                nacl_csr_write(nsh, CSR_VSTVAL, csr->vstval);
                nacl_csr_write(nsh, CSR_HEDELEG, cfg->hedeleg);
+               nacl_csr_write(nsh, CSR_HIDELEG, cfg->hideleg);
                nacl_csr_write(nsh, CSR_HVIP, csr->hvip);
                nacl_csr_write(nsh, CSR_VSATP, csr->vsatp);
                nacl_csr_write(nsh, CSR_HENVCFG, cfg->henvcfg);
@@ -629,6 +631,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
                csr_write(CSR_VSCAUSE, csr->vscause);
                csr_write(CSR_VSTVAL, csr->vstval);
                csr_write(CSR_HEDELEG, cfg->hedeleg);
+               csr_write(CSR_HIDELEG, cfg->hideleg);
                csr_write(CSR_HVIP, csr->hvip);
                csr_write(CSR_VSATP, csr->vsatp);
                csr_write(CSR_HENVCFG, cfg->henvcfg);