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

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

KVM/arm64 updates for 6.19

 - Support for userspace handling of synchronous external aborts (SEAs),
   allowing the VMM to potentially handle the abort in a non-fatal
   manner.

 - Large rework of the VGIC's list register handling with the goal of
   supporting more active/pending IRQs than available list registers in
   hardware. In addition, the VGIC now supports EOImode==1 style
   deactivations for IRQs which may occur on a separate vCPU than the
   one that acked the IRQ.

 - Support for FEAT_XNX (user / privileged execute permissions) and
   FEAT_HAF (hardware update to the Access Flag) in the software page
   table walkers and shadow MMU.

 - Allow page table destruction to reschedule, fixing long need_resched
   latencies observed when destroying a large VM.

 - Minor fixes to KVM and selftests
parents 63a9b0bc 3eef0c83

Documentation/virt/kvm/api.rst

+47 −0
Original line number Diff line number Diff line
@@ -7286,6 +7286,41 @@ exit, even without calls to ``KVM_ENABLE_CAP`` or similar. In this case, 
it will enter with output fields already valid; in the common case, the

``unknown.ret`` field of the union will be ``TDVMCALL_STATUS_SUBFUNC_UNSUPPORTED``.

Userspace need not do anything if it does not wish to support a TDVMCALL.



::



		/* KVM_EXIT_ARM_SEA */

		struct {

  #define KVM_EXIT_ARM_SEA_FLAG_GPA_VALID   (1ULL << 0)

			__u64 flags;

			__u64 esr;

			__u64 gva;

			__u64 gpa;

		} arm_sea;



Used on arm64 systems. When the VM capability ``KVM_CAP_ARM_SEA_TO_USER`` is

enabled, a KVM exits to userspace if a guest access causes a synchronous

external abort (SEA) and the host APEI fails to handle the SEA.



``esr`` is set to a sanitized value of ESR_EL2 from the exception taken to KVM,

consisting of the following fields:



 - ``ESR_EL2.EC``

 - ``ESR_EL2.IL``

 - ``ESR_EL2.FnV``

 - ``ESR_EL2.EA``

 - ``ESR_EL2.CM``

 - ``ESR_EL2.WNR``

 - ``ESR_EL2.FSC``

 - ``ESR_EL2.SET`` (when FEAT_RAS is implemented for the VM)



``gva`` is set to the value of FAR_EL2 from the exception taken to KVM when

``ESR_EL2.FnV == 0``. Otherwise, the value of ``gva`` is unknown.



``gpa`` is set to the faulting IPA from the exception taken to KVM when

the ``KVM_EXIT_ARM_SEA_FLAG_GPA_VALID`` flag is set. Otherwise, the value of

``gpa`` is unknown.



::



		/* Fix the size of the union. */
@@ -8703,6 +8738,18 @@ This capability indicate to the userspace whether a PFNMAP memory region 
can be safely mapped as cacheable. This relies on the presence of

force write back (FWB) feature support on the hardware.



7.45 KVM_CAP_ARM_SEA_TO_USER

----------------------------



:Architecture: arm64

:Target: VM

:Parameters: none

:Returns: 0 on success, -EINVAL if unsupported.



When this capability is enabled, KVM may exit to userspace for SEAs taken to

EL2 resulting from a guest access. See ``KVM_EXIT_ARM_SEA`` for more

information.



8. Other capabilities.

======================

arch/arm64/include/asm/kvm_arm.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
#define TCR_EL2_DS		(1UL << 32)

#define TCR_EL2_RES1		((1U << 31) | (1 << 23))

#define TCR_EL2_HPD		(1 << 24)

#define TCR_EL2_HA		(1 << 21)

#define TCR_EL2_TBI		(1 << 20)

#define TCR_EL2_PS_SHIFT	16

#define TCR_EL2_PS_MASK		(7 << TCR_EL2_PS_SHIFT)

arch/arm64/include/asm/kvm_asm.h

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ enum __kvm_host_smccc_func { 
	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_range,

	__KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context,

	__KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_save_vmcr_aprs,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs,

	__KVM_HOST_SMCCC_FUNC___pkvm_reserve_vm,

	__KVM_HOST_SMCCC_FUNC___pkvm_unreserve_vm,
@@ -246,9 +246,9 @@ extern void __kvm_tlb_flush_vmid(struct kvm_s2_mmu *mmu); 
extern int __kvm_tlbi_s1e2(struct kvm_s2_mmu *mmu, u64 va, u64 sys_encoding);



extern void __kvm_timer_set_cntvoff(u64 cntvoff);

extern void __kvm_at_s1e01(struct kvm_vcpu *vcpu, u32 op, u64 vaddr);

extern void __kvm_at_s1e2(struct kvm_vcpu *vcpu, u32 op, u64 vaddr);

extern void __kvm_at_s12(struct kvm_vcpu *vcpu, u32 op, u64 vaddr);

extern int __kvm_at_s1e01(struct kvm_vcpu *vcpu, u32 op, u64 vaddr);

extern int __kvm_at_s1e2(struct kvm_vcpu *vcpu, u32 op, u64 vaddr);

extern int __kvm_at_s12(struct kvm_vcpu *vcpu, u32 op, u64 vaddr);



extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);

arch/arm64/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define KVM_REQ_NESTED_S2_UNMAP		KVM_ARCH_REQ(8)

#define KVM_REQ_GUEST_HYP_IRQ_PENDING	KVM_ARCH_REQ(9)

#define KVM_REQ_MAP_L1_VNCR_EL2		KVM_ARCH_REQ(10)

#define KVM_REQ_VGIC_PROCESS_UPDATE	KVM_ARCH_REQ(11)



#define KVM_DIRTY_LOG_MANUAL_CAPS   (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \

				     KVM_DIRTY_LOG_INITIALLY_SET)
@@ -350,6 +351,8 @@ struct kvm_arch { 
#define KVM_ARCH_FLAG_GUEST_HAS_SVE			9

	/* MIDR_EL1, REVIDR_EL1, and AIDR_EL1 are writable from userspace */

#define KVM_ARCH_FLAG_WRITABLE_IMP_ID_REGS		10

	/* Unhandled SEAs are taken to userspace */

#define KVM_ARCH_FLAG_EXIT_SEA				11

	unsigned long flags;



	/* VM-wide vCPU feature set */

arch/arm64/include/asm/kvm_hyp.h

+2 −1
Original line number Diff line number Diff line
@@ -77,12 +77,13 @@ DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params); 
int __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu);



u64 __gic_v3_get_lr(unsigned int lr);

void __gic_v3_set_lr(u64 val, int lr);



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_vmcr_aprs(struct vgic_v3_cpu_if *cpu_if);

void __vgic_v3_save_aprs(struct vgic_v3_cpu_if *cpu_if);

void __vgic_v3_restore_vmcr_aprs(struct vgic_v3_cpu_if *cpu_if);

int __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu);