Commit be08c3cf authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/pkvm/fixed-features into kvmarm-master/next 



* kvm-arm64/pkvm/fixed-features: (22 commits)
  : .
  : Add the pKVM fixed feature that allows a bunch of exceptions
  : to either be forbidden or be easily handled at EL2.
  : .
  KVM: arm64: pkvm: Give priority to standard traps over pvm handling
  KVM: arm64: pkvm: Pass vpcu instead of kvm to kvm_get_exit_handler_array()
  KVM: arm64: pkvm: Move kvm_handle_pvm_restricted around
  KVM: arm64: pkvm: Consolidate include files
  KVM: arm64: pkvm: Preserve pending SError on exit from AArch32
  KVM: arm64: pkvm: Handle GICv3 traps as required
  KVM: arm64: pkvm: Drop sysregs that should never be routed to the host
  KVM: arm64: pkvm: Drop AArch32-specific registers
  KVM: arm64: pkvm: Make the ERR/ERX*_EL1 registers RAZ/WI
  KVM: arm64: pkvm: Use a single function to expose all id-regs
  KVM: arm64: Fix early exit ptrauth handling
  KVM: arm64: Handle protected guests at 32 bits
  KVM: arm64: Trap access to pVM restricted features
  KVM: arm64: Move sanitized copies of CPU features
  KVM: arm64: Initialize trap registers for protected VMs
  KVM: arm64: Add handlers for protected VM System Registers
  KVM: arm64: Simplify masking out MTE in feature id reg
  KVM: arm64: Add missing field descriptor for MDCR_EL2
  KVM: arm64: Pass struct kvm to per-EC handlers
  KVM: arm64: Move early handlers to per-EC handlers
  ...

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 5f8b2591 07305590

arch/arm64/include/asm/kvm_arm.h

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ 
#define MDCR_EL2_HPMFZO		(UL(1) << 29)

#define MDCR_EL2_MTPME		(UL(1) << 28)

#define MDCR_EL2_TDCC		(UL(1) << 27)

#define MDCR_EL2_HLP		(UL(1) << 26)

#define MDCR_EL2_HCCD		(UL(1) << 23)

#define MDCR_EL2_TTRF		(UL(1) << 19)

#define MDCR_EL2_HPMD		(UL(1) << 17)

arch/arm64/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ enum __kvm_host_smccc_func { 
	__KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs,

	__KVM_HOST_SMCCC_FUNC___pkvm_vcpu_init_traps,

};



#define DECLARE_KVM_VHE_SYM(sym)	extern char sym[]

arch/arm64/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -781,6 +781,8 @@ static inline bool kvm_vm_is_protected(struct kvm *kvm) 
	return false;

}



void kvm_init_protected_traps(struct kvm_vcpu *vcpu);



int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature);

bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu);

arch/arm64/include/asm/kvm_hyp.h

+5 −0
Original line number Diff line number Diff line
@@ -115,7 +115,12 @@ int __pkvm_init(phys_addr_t phys, unsigned long size, unsigned long nr_cpus, 
void __noreturn __host_enter(struct kvm_cpu_context *host_ctxt);

#endif



extern u64 kvm_nvhe_sym(id_aa64pfr0_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64pfr1_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64isar0_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64isar1_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64mmfr0_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64mmfr1_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64mmfr2_el1_sys_val);



#endif /* __ARM64_KVM_HYP_H__ */

arch/arm64/kvm/arm.c

+13 −0
Original line number Diff line number Diff line
@@ -622,6 +622,14 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) 


	ret = kvm_arm_pmu_v3_enable(vcpu);



	/*

	 * Initialize traps for protected VMs.

	 * NOTE: Move to run in EL2 directly, rather than via a hypercall, once

	 * the code is in place for first run initialization at EL2.

	 */

	if (kvm_vm_is_protected(kvm))

		kvm_call_hyp_nvhe(__pkvm_vcpu_init_traps, vcpu);



	return ret;

}
@@ -1819,8 +1827,13 @@ static int kvm_hyp_init_protection(u32 hyp_va_bits) 
	void *addr = phys_to_virt(hyp_mem_base);

	int ret;



	kvm_nvhe_sym(id_aa64pfr0_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1);

	kvm_nvhe_sym(id_aa64pfr1_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64PFR1_EL1);

	kvm_nvhe_sym(id_aa64isar0_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64ISAR0_EL1);

	kvm_nvhe_sym(id_aa64isar1_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64ISAR1_EL1);

	kvm_nvhe_sym(id_aa64mmfr0_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1);

	kvm_nvhe_sym(id_aa64mmfr1_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1);

	kvm_nvhe_sym(id_aa64mmfr2_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64MMFR2_EL1);



	ret = create_hyp_mappings(addr, addr + hyp_mem_size, PAGE_HYP);

	if (ret)