From: Jintack Lim <jintack....@linaro.org>

Forward the EL1 virtual memory register traps to the virtual EL2 if they
are not coming from the virtual EL2 and the virtual HCR_EL2.TVM or TRVM
bit is set.

This is for recursive nested virtualization.

Signed-off-by: Jintack Lim <jintack....@linaro.org>
Signed-off-by: Marc Zyngier <m...@kernel.org>
---
 arch/arm64/kvm/sys_regs.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index b948afd20e97..7cf5096bc11a 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -470,6 +470,13 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,
        if (el12_reg(p) && forward_nv_traps(vcpu))
                return false;
 
+       if (!el12_reg(p)) {
+               u64 bit = p->is_write ? HCR_TVM : HCR_TRVM;
+
+               if (forward_traps(vcpu, bit))
+                       return false;
+       }
+
        BUG_ON(!vcpu_mode_el2(vcpu) && !p->is_write);
 
        if (!p->is_write) {
-- 
2.20.1

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

Reply via email to