Commit 38060944 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD 

KVM/arm64 updates for Linux 5.8:

- Move the arch-specific code into arch/arm64/kvm
- Start the post-32bit cleanup
- Cherry-pick a few non-invasive pre-NV patches
parents 09d952c9 8f7f4fe7

Documentation/virt/kvm/api.rst

+1 −1
Original line number Diff line number Diff line
@@ -5799,7 +5799,7 @@ will be initialized to 1 when created. This also improves performance because 
dirty logging can be enabled gradually in small chunks on the first call

to KVM_CLEAR_DIRTY_LOG.  KVM_DIRTY_LOG_INITIALLY_SET depends on

KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE (it is also only available on

x86 for now).

x86 and arm64 for now).



KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 was previously available under the name

KVM_CAP_MANUAL_DIRTY_LOG_PROTECT, but the implementation had bugs that make

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -9295,7 +9295,6 @@ F: arch/arm64/include/asm/kvm* 
F:	arch/arm64/include/uapi/asm/kvm*

F:	arch/arm64/kvm/

F:	include/kvm/arm_*

F:	virt/kvm/arm/









KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)









L:	linux-mips@vger.kernel.org
































arch/arm64/include/asm/kvm_asm.h



+3
−1






























Original line number
Diff line number
Diff line







@@ -64,12 +64,14 @@ extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);







extern void __kvm_tlb_flush_vmid(struct kvm *kvm);









extern void __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu);



















extern void __kvm_timer_set_cntvoff(u32 cntvoff_low, u32 cntvoff_high);









extern void __kvm_timer_set_cntvoff(u64 cntvoff);



















extern int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu);



















extern int __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu);



















extern void __kvm_enable_ssbs(void);



















extern u64 __vgic_v3_get_ich_vtr_el2(void);









extern u64 __vgic_v3_read_vmcr(void);









extern void __vgic_v3_write_vmcr(u32 vmcr);
































arch/arm64/include/asm/kvm_host.h



+4
−40






























Original line number
Diff line number
Diff line







@@ -46,6 +46,9 @@







#define KVM_REQ_RECORD_STEAL	KVM_ARCH_REQ(3)









#define KVM_REQ_RELOAD_GICv4	KVM_ARCH_REQ(4)



















#define KVM_DIRTY_LOG_MANUAL_CAPS   (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \









				     KVM_DIRTY_LOG_INITIALLY_SET)



















DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



















extern unsigned int kvm_sve_max_vl;








@@ -112,12 +115,8 @@ struct kvm_vcpu_fault_info {







	u64 disr_el1;		/* Deferred [SError] Status Register */









};



















/*









 * 0 is reserved as an invalid value.









 * Order should be kept in sync with the save/restore code.









 */









enum vcpu_sysreg {









	__INVALID_SYSREG__,









	__INVALID_SYSREG__,   /* 0 is reserved as an invalid value */









	MPIDR_EL1,	/* MultiProcessor Affinity Register */









	CSSELR_EL1,	/* Cache Size Selection Register */









	SCTLR_EL1,	/* System Control Register */








@@ -532,39 +531,6 @@ static inline void kvm_init_host_cpu_context(struct kvm_cpu_context *cpu_ctxt)







	cpu_ctxt->sys_regs[MPIDR_EL1] = read_cpuid_mpidr();









}



















void __kvm_enable_ssbs(void);



















static inline void __cpu_init_hyp_mode(phys_addr_t pgd_ptr,









				       unsigned long hyp_stack_ptr,









				       unsigned long vector_ptr)









{









	/*









	 * Calculate the raw per-cpu offset without a translation from the









	 * kernel's mapping to the linear mapping, and store it in tpidr_el2









	 * so that we can use adr_l to access per-cpu variables in EL2.









	 */









	u64 tpidr_el2 = ((u64)this_cpu_ptr(&kvm_host_data) -









			 (u64)kvm_ksym_ref(kvm_host_data));



















	/*









	 * Call initialization code, and switch to the full blown HYP code.









	 * If the cpucaps haven't been finalized yet, something has gone very









	 * wrong, and hyp will crash and burn when it uses any









	 * cpus_have_const_cap() wrapper.









	 */









	BUG_ON(!system_capabilities_finalized());









	__kvm_call_hyp((void *)pgd_ptr, hyp_stack_ptr, vector_ptr, tpidr_el2);



















	/*









	 * Disabling SSBD on a non-VHE system requires us to enable SSBS









	 * at EL2.









	 */









	if (!has_vhe() && this_cpu_has_cap(ARM64_SSBS) &&









	    arm64_get_ssbd_state() == ARM64_SSBD_FORCE_DISABLE) {









		kvm_call_hyp(__kvm_enable_ssbs);









	}









}



















static inline bool kvm_arch_requires_vhe(void)









{









	/*








@@ -600,8 +566,6 @@ int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu,







int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu,









			       struct kvm_device_attr *attr);



















static inline void __cpu_init_stage2(void) {}



















/* Guest/host FPSIMD coordination helpers */









int kvm_arch_vcpu_run_map_fp(struct kvm_vcpu *vcpu);









void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu);
































arch/arm64/include/asm/kvm_hyp.h



+6
−6






























Original line number
Diff line number
Diff line







@@ -56,12 +56,12 @@

















int __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu);



















void __vgic_v3_save_state(struct kvm_vcpu *vcpu);









void __vgic_v3_restore_state(struct kvm_vcpu *vcpu);









void __vgic_v3_activate_traps(struct kvm_vcpu *vcpu);









void __vgic_v3_deactivate_traps(struct kvm_vcpu *vcpu);









void __vgic_v3_save_aprs(struct kvm_vcpu *vcpu);









void __vgic_v3_restore_aprs(struct kvm_vcpu *vcpu);









void __vgic_v3_save_state(struct vgic_v3_cpu_if *cpu_if);









void __vgic_v3_restore_state(struct vgic_v3_cpu_if *cpu_if);









void __vgic_v3_activate_traps(struct vgic_v3_cpu_if *cpu_if);









void __vgic_v3_deactivate_traps(struct vgic_v3_cpu_if *cpu_if);









void __vgic_v3_save_aprs(struct vgic_v3_cpu_if *cpu_if);









void __vgic_v3_restore_aprs(struct vgic_v3_cpu_if *cpu_if);









int __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu);



















void __timer_enable_traps(struct kvm_vcpu *vcpu);