Create a mapping from the nested VM's cpu interface to the hardware virtual cpu interface. This is to allow the nested VM to access virtual cpu interface directly.
Signed-off-by: Jintack Lim <[email protected]> --- arch/arm/include/asm/kvm_mmu.h | 3 +++ arch/arm/kvm/mmu.c | 5 +++++ arch/arm64/include/asm/kvm_mmu.h | 5 +++++ arch/arm64/kvm/mmu-nested.c | 26 ++++++++++++++++++++++++++ 4 files changed, 39 insertions(+) diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h index 0d106ae..048a021 100644 --- a/arch/arm/include/asm/kvm_mmu.h +++ b/arch/arm/include/asm/kvm_mmu.h @@ -254,6 +254,9 @@ static inline void kvm_nested_s2_teardown(struct kvm_vcpu *vcpu) { } static inline void kvm_nested_s2_all_vcpus_wp(struct kvm *kvm) { } static inline void kvm_nested_s2_all_vcpus_unmap(struct kvm *kvm) { } static inline void kvm_nested_s2_all_vcpus_flush(struct kvm *kvm) { } +static inline int kvm_nested_mmio_ondemand(struct kvm_vcpu *vcpu, + phys_addr_t fault_ipa, + phys_addr_t ipa) { return 0; } static inline u64 kvm_get_vttbr(struct kvm_s2_vmid *vmid, struct kvm_s2_mmu *mmu) diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 2cd6a19..f7c2911 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -1615,6 +1615,11 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) goto out_unlock; } + if (kvm_nested_mmio_ondemand(vcpu, fault_ipa, ipa)) { + ret = 1; + goto out_unlock; + } + /* * The IPA is reported as [MAX:12], so we need to * complement it with the bottom 12 bits from the diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index ec9e5e9..ee80a58 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -354,6 +354,8 @@ int kvm_s2_handle_perm_fault(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, void kvm_nested_s2_all_vcpus_wp(struct kvm *kvm); void kvm_nested_s2_all_vcpus_unmap(struct kvm *kvm); void kvm_nested_s2_all_vcpus_flush(struct kvm *kvm); +int kvm_nested_mmio_ondemand(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, + phys_addr_t ipa); #else static inline struct kvm_nested_s2_mmu *get_nested_mmu(struct kvm_vcpu *vcpu, u64 vttbr) @@ -389,6 +391,9 @@ static inline void kvm_nested_s2_teardown(struct kvm_vcpu *vcpu) { } static inline void kvm_nested_s2_all_vcpus_wp(struct kvm *kvm) { } static inline void kvm_nested_s2_all_vcpus_unmap(struct kvm *kvm) { } static inline void kvm_nested_s2_all_vcpus_flush(struct kvm *kvm) { } +static inline int kvm_nested_mmio_ondemand(struct kvm_vcpu *vcpu, + phys_addr_t fault_ipa, + phys_addr_t ipa) { return 0; } #endif static inline u64 kvm_get_vttbr(struct kvm_s2_vmid *vmid, diff --git a/arch/arm64/kvm/mmu-nested.c b/arch/arm64/kvm/mmu-nested.c index 65ad0da..bce0042 100644 --- a/arch/arm64/kvm/mmu-nested.c +++ b/arch/arm64/kvm/mmu-nested.c @@ -473,3 +473,29 @@ bool handle_vttbr_update(struct kvm_vcpu *vcpu, u64 vttbr) return true; } + +/* + * vcpu interface address. This address is supposed to come from the guest's + * device tree via QEMU. Here we just hardcoded it, but should be fixed. + */ +#define NESTED_VCPU_IF_ADDR 0x08010000 +int kvm_nested_mmio_ondemand(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, + phys_addr_t ipa) +{ + int ret = 0; + phys_addr_t vcpu_base = vgic_vcpu_base(); + + /* Return if this fault is not from a nested VM */ + if (vcpu->arch.hw_mmu == &vcpu->kvm->arch.mmu) + return ret; + + if (ipa == NESTED_VCPU_IF_ADDR) { + ret = __kvm_phys_addr_ioremap(vcpu->kvm, vcpu->arch.hw_mmu, + fault_ipa, vcpu_base, + KVM_VGIC_V2_CPU_SIZE, true); + if (!ret) + ret = 1; + } + + return ret; +} -- 1.9.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
