Commit 022d3f08 authored by Oliver Upton's avatar Oliver Upton
Browse files

Merge branch kvm-arm64/misc into kvmarm/next 



* kvm-arm64/misc:
  : Miscellaneous updates
  :
  :  - Convert CPACR_EL1_TTA to the new, generated system register
  :    definitions.
  :
  :  - Serialize toggling CPACR_EL1.SMEN to avoid unexpected exceptions when
  :    accessing SVCR in the host.
  :
  :  - Avoid quiescing the guest if a vCPU accesses its own redistributor's
  :    SGIs/PPIs, eliminating the need to IPI. Largely an optimization for
  :    nested virtualization, as the L1 accesses the affected registers
  :    rather often.
  :
  :  - Conversion to kstrtobool()
  :
  :  - Common definition of INVALID_GPA across architectures
  :
  :  - Enable CONFIG_USERFAULTFD for CI runs of KVM selftests
  KVM: arm64: Fix non-kerneldoc comments
  KVM: selftests: Enable USERFAULTFD
  KVM: selftests: Remove redundant setbuf()
  arm64/sysreg: clean up some inconsistent indenting
  KVM: MMU: Make the definition of 'INVALID_GPA' common
  KVM: arm64: vgic-v3: Use kstrtobool() instead of strtobool()
  KVM: arm64: vgic-v3: Limit IPI-ing when accessing GICR_{C,S}ACTIVER0
  KVM: arm64: Synchronize SMEN on vcpu schedule out
  KVM: arm64: Kill CPACR_EL1_TTA definition

Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parents e4f7417e 67d953d4

arch/arm64/include/asm/kvm_arm.h

+0 −1
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ 
	ECN(SOFTSTP_CUR), ECN(WATCHPT_LOW), ECN(WATCHPT_CUR), \

	ECN(BKPT32), ECN(VECTOR32), ECN(BRK64)



#define CPACR_EL1_TTA		(1 << 28)

#define CPACR_EL1_DEFAULT	(CPACR_EL1_FPEN_EL0EN | CPACR_EL1_FPEN_EL1EN |\

				 CPACR_EL1_ZEN_EL1EN)

arch/arm64/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -918,12 +918,12 @@ void kvm_arm_vmid_clear_active(void); 


static inline void kvm_arm_pvtime_vcpu_init(struct kvm_vcpu_arch *vcpu_arch)

{

	vcpu_arch->steal.base = GPA_INVALID;

	vcpu_arch->steal.base = INVALID_GPA;

}



static inline bool kvm_arm_is_pvtime_enabled(struct kvm_vcpu_arch *vcpu_arch)

{

	return (vcpu_arch->steal.base != GPA_INVALID);

	return (vcpu_arch->steal.base != INVALID_GPA);

}



void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome);

arch/arm64/kvm/arm.c

+2 −6
Original line number Diff line number Diff line
@@ -1922,9 +1922,7 @@ static int __init kvm_hyp_init_protection(u32 hyp_va_bits) 
	return 0;

}



/**

 * Inits Hyp-mode on all online CPUs

 */

/* Inits Hyp-mode on all online CPUs */

static int __init init_hyp_mode(void)

{

	u32 hyp_va_bits;
@@ -2200,9 +2198,7 @@ void kvm_arch_irq_bypass_start(struct irq_bypass_consumer *cons) 
	kvm_arm_resume_guest(irqfd->kvm);

}



/**

 * Initialize Hyp-mode and memory mappings on all CPUs.

 */

/* Initialize Hyp-mode and memory mappings on all CPUs */

static __init int kvm_arm_init(void)

{

	int err;

arch/arm64/kvm/fpsimd.c

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) 
			sysreg_clear_set(CPACR_EL1,

					 CPACR_EL1_SMEN_EL0EN,

					 CPACR_EL1_SMEN_EL1EN);

		isb();

	}



	if (vcpu->arch.fp_state == FP_STATE_GUEST_OWNED) {

arch/arm64/kvm/hyp/vhe/switch.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static void __activate_traps(struct kvm_vcpu *vcpu) 
	___activate_traps(vcpu);



	val = read_sysreg(cpacr_el1);

	val |= CPACR_EL1_TTA;

	val |= CPACR_ELx_TTA;

	val &= ~(CPACR_EL1_ZEN_EL0EN | CPACR_EL1_ZEN_EL1EN |

		 CPACR_EL1_SMEN_EL0EN | CPACR_EL1_SMEN_EL1EN);