Commit e1e315c4 authored by Oliver Upton's avatar Oliver Upton
Browse files

Merge branch kvm-arm64/misc into kvmarm/next 



* kvm-arm64/misc:
  : Miscellaneous updates
  :
  :  - Avoid trapping CTR_EL0 on systems with FEAT_EVT, as the register is
  :    commonly read by userspace
  :
  :  - Make use of FEAT_BTI at hyp stage-1, setting the Guard Page bit to 1
  :    for executable mappings
  :
  :  - Use a separate set of pointer authentication keys for the hypervisor
  :    when running in protected mode (i.e. pKVM)
  :
  :  - Plug a few holes in timer initialization where KVM fails to free the
  :    timer IRQ(s)
  KVM: arm64: Use different pointer authentication keys for pKVM
  KVM: arm64: timers: Fix resource leaks in kvm_timer_hyp_init()
  KVM: arm64: Use BTI for nvhe
  KVM: arm64: Relax trapping of CTR_EL0 when FEAT_EVT is available

Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parents 89a734b5 8c15c2a0

arch/arm64/include/asm/kvm_arm.h

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define HCR_ATA_SHIFT	56

#define HCR_ATA		(UL(1) << HCR_ATA_SHIFT)

#define HCR_AMVOFFEN	(UL(1) << 51)

#define HCR_TID4	(UL(1) << 49)

#define HCR_FIEN	(UL(1) << 47)

#define HCR_FWB		(UL(1) << 46)

#define HCR_API		(UL(1) << 41)
@@ -86,7 +87,7 @@ 
#define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \

			 HCR_BSU_IS | HCR_FB | HCR_TACR | \

			 HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \

			 HCR_FMO | HCR_IMO | HCR_PTW | HCR_TID3 | HCR_TID2)

			 HCR_FMO | HCR_IMO | HCR_PTW | HCR_TID3)

#define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF)

#define HCR_HOST_NVHE_FLAGS (HCR_RW | HCR_API | HCR_APK | HCR_ATA)

#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)

arch/arm64/include/asm/kvm_emulate.h

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,12 @@ static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu) 
		vcpu->arch.hcr_el2 |= HCR_TVM;

	}



	if (cpus_have_final_cap(ARM64_HAS_EVT) &&

	    !cpus_have_final_cap(ARM64_MISMATCHED_CACHE_TYPE))

		vcpu->arch.hcr_el2 |= HCR_TID4;

	else

		vcpu->arch.hcr_el2 |= HCR_TID2;



	if (vcpu_el1_is_32bit(vcpu))

		vcpu->arch.hcr_el2 &= ~HCR_RW;

arch/arm64/include/asm/sysreg.h

+1 −0
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ 
			 (BIT(18)) | (BIT(22)) | (BIT(23)) | (BIT(28)) | \

			 (BIT(29)))



#define SCTLR_EL2_BT	(BIT(36))

#ifdef CONFIG_CPU_BIG_ENDIAN

#define ENDIAN_SET_EL2		SCTLR_ELx_EE

#else

arch/arm64/kernel/cpufeature.c

+11 −0
Original line number Diff line number Diff line
@@ -2662,6 +2662,17 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.type = ARM64_CPUCAP_SYSTEM_FEATURE,

		.matches = hvhe_possible,

	},

	{

		.desc = "Enhanced Virtualization Traps",

		.capability = ARM64_HAS_EVT,

		.type = ARM64_CPUCAP_SYSTEM_FEATURE,

		.sys_reg = SYS_ID_AA64MMFR2_EL1,

		.sign = FTR_UNSIGNED,

		.field_pos = ID_AA64MMFR2_EL1_EVT_SHIFT,

		.field_width = 4,

		.min_field_value = ID_AA64MMFR2_EL1_EVT_IMP,

		.matches = has_cpuid_feature,

	},

	{},

};

arch/arm64/kvm/arch_timer.c

+9 −5
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ int __init kvm_timer_hyp_init(bool has_gic) 
					    kvm_get_running_vcpus());

		if (err) {

			kvm_err("kvm_arch_timer: error setting vcpu affinity\n");

			goto out_free_irq;

			goto out_free_vtimer_irq;

		}



		static_branch_enable(&has_gic_active_state);
@@ -1422,7 +1422,7 @@ int __init kvm_timer_hyp_init(bool has_gic) 
		if (err) {

			kvm_err("kvm_arch_timer: can't request ptimer interrupt %d (%d)\n",

				host_ptimer_irq, err);

			return err;

			goto out_free_vtimer_irq;

		}



		if (has_gic) {
@@ -1430,7 +1430,7 @@ int __init kvm_timer_hyp_init(bool has_gic) 
						    kvm_get_running_vcpus());

			if (err) {

				kvm_err("kvm_arch_timer: error setting vcpu affinity\n");

				goto out_free_irq;

				goto out_free_ptimer_irq;

			}

		}
@@ -1439,11 +1439,15 @@ int __init kvm_timer_hyp_init(bool has_gic) 
		kvm_err("kvm_arch_timer: invalid physical timer IRQ: %d\n",

			info->physical_irq);

		err = -ENODEV;

		goto out_free_irq;

		goto out_free_vtimer_irq;

	}



	return 0;

out_free_irq:



out_free_ptimer_irq:

	if (info->physical_irq > 0)

		free_percpu_irq(host_ptimer_irq, kvm_get_running_vcpus());

out_free_vtimer_irq:

	free_percpu_irq(host_vtimer_irq, kvm_get_running_vcpus());

	return err;

}