On 27/04/2024 03:33, Deepak Gupta wrote: >> /** >> * kvm_riscv_vcpu_trap_redirect -- Redirect trap to Guest >> * >> * @vcpu: The VCPU pointer >> * @trap: Trap details >> */ >> -void kvm_riscv_vcpu_trap_redirect(struct kvm_vcpu *vcpu, >> - struct kvm_cpu_trap *trap) >> +int kvm_riscv_vcpu_trap_redirect(struct kvm_vcpu *vcpu, >> + struct kvm_cpu_trap *trap) >> { >> unsigned long vsstatus = csr_read(CSR_VSSTATUS); >> >> + if (riscv_isa_extension_available(vcpu->arch.isa, SSDBLTRP)) { >> + if (vsstatus & SR_SDT) >> + return kvm_riscv_double_trap(vcpu, trap); >> + >> + /* Set Double Trap bit to enable double trap detection */ >> + vsstatus |= SR_SDT; > > I didn't get it. > Why do this without checking if current config allows us to do so ? > I am imagining we do this only when henvcfg for current vcpu says that > DTE=1 > for this this guest, right? We actually do not really care since if not enabled, this bit will be masked by the hardware when writing it to the CSR. I could indeed add a check for that but in the end, it will yield the same result. In that case, just ORing it with the value seems more efficient than adding an "if" to check if the extension and DTE is enabled. Clément