Commit 924ebaef authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM/arm64 updates for 6.18

- Add support for FF-A 1.2 as the secure memory conduit for pKVM,
  allowing more registers to be used as part of the message payload.

- Change the way pKVM allocates its VM handles, making sure that the
  privileged hypervisor is never tricked into using uninitialised
  data.

- Speed up MMIO range registration by avoiding unnecessary RCU
  synchronisation, which results in VMs starting much quicker.

- Add the dump of the instruction stream when panic-ing in the EL2
  payload, just like the rest of the kernel has always done. This will
  hopefully help debugging non-VHE setups.

- Add 52bit PA support to the stage-1 page-table walker, and make use
  of it to populate the fault level reported to the guest on failing
  to translate a stage-1 walk.

- Add NV support to the GICv3-on-GICv5 emulation code, ensuring
  feature parity for guests, irrespective of the host platform.

- Fix some really ugly architecture problems when dealing with debug
  in a nested VM. This has some bad performance impacts, but is at
  least correct.

- Add enough infrastructure to be able to disable EL2 features and
  give effective values to the EL2 control registers. This then allows
  a bunch of features to be turned off, which helps cross-host
  migration.

- Large rework of the selftest infrastructure to allow most tests to
  transparently run at EL2. This is the first step towards enabling
  NV testing.

- Various fixes and improvements all over the map, including one BE
  fix, just in time for the removal of the feature.
parents 8cbb0df2 10fd0285

arch/arm64/include/asm/kvm_asm.h

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ enum __kvm_host_smccc_func { 
	__KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_save_vmcr_aprs,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs,

	__KVM_HOST_SMCCC_FUNC___pkvm_reserve_vm,

	__KVM_HOST_SMCCC_FUNC___pkvm_unreserve_vm,

	__KVM_HOST_SMCCC_FUNC___pkvm_init_vm,

	__KVM_HOST_SMCCC_FUNC___pkvm_init_vcpu,

	__KVM_HOST_SMCCC_FUNC___pkvm_teardown_vm,

arch/arm64/include/asm/kvm_emulate.h

+28 −6
Original line number Diff line number Diff line
@@ -220,6 +220,20 @@ static inline bool vcpu_el2_tge_is_set(const struct kvm_vcpu *vcpu) 


static inline bool vcpu_el2_amo_is_set(const struct kvm_vcpu *vcpu)

{

	/*

	 * DDI0487L.b Known Issue D22105

	 *

	 * When executing at EL2 and HCR_EL2.{E2H,TGE} = {1, 0} it is

	 * IMPLEMENTATION DEFINED whether the effective value of HCR_EL2.AMO

	 * is the value programmed or 1.

	 *

	 * Make the implementation choice of treating the effective value as 1 as

	 * we cannot subsequently catch changes to TGE or AMO that would

	 * otherwise lead to the SError becoming deliverable.

	 */

	if (vcpu_is_el2(vcpu) && vcpu_el2_e2h_is_set(vcpu) && !vcpu_el2_tge_is_set(vcpu))

		return true;



	return ctxt_sys_reg(&vcpu->arch.ctxt, HCR_EL2) & HCR_AMO;

}
@@ -511,21 +525,29 @@ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu) 
	if (vcpu_mode_is_32bit(vcpu)) {

		*vcpu_cpsr(vcpu) |= PSR_AA32_E_BIT;

	} else {

		u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1);

		enum vcpu_sysreg r;

		u64 sctlr;



		r = vcpu_has_nv(vcpu) ? SCTLR_EL2 : SCTLR_EL1;



		sctlr = vcpu_read_sys_reg(vcpu, r);

		sctlr |= SCTLR_ELx_EE;

		vcpu_write_sys_reg(vcpu, sctlr, SCTLR_EL1);

		vcpu_write_sys_reg(vcpu, sctlr, r);

	}

}



static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)

{

	enum vcpu_sysreg r;

	u64 bit;



	if (vcpu_mode_is_32bit(vcpu))

		return !!(*vcpu_cpsr(vcpu) & PSR_AA32_E_BIT);



	if (vcpu_mode_priv(vcpu))

		return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & SCTLR_ELx_EE);

	else

		return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & SCTLR_EL1_E0E);

	r = is_hyp_ctxt(vcpu) ? SCTLR_EL2 : SCTLR_EL1;

	bit = vcpu_mode_priv(vcpu) ? SCTLR_ELx_EE : SCTLR_EL1_E0E;



	return vcpu_read_sys_reg(vcpu, r) & bit;

}



static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,

arch/arm64/include/asm/kvm_host.h

+3 −2
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ struct kvm_protected_vm { 
	pkvm_handle_t handle;

	struct kvm_hyp_memcache teardown_mc;

	struct kvm_hyp_memcache stage2_teardown_mc;

	bool enabled;

	bool is_protected;

	bool is_created;

};



struct kvm_mpidr_data {
@@ -1442,7 +1443,7 @@ struct kvm *kvm_arch_alloc_vm(void); 


#define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLBS_RANGE



#define kvm_vm_is_protected(kvm)	(is_protected_kvm_enabled() && (kvm)->arch.pkvm.enabled)

#define kvm_vm_is_protected(kvm)	(is_protected_kvm_enabled() && (kvm)->arch.pkvm.is_protected)



#define vcpu_is_protected(vcpu)		kvm_vm_is_protected((vcpu)->kvm)

arch/arm64/include/asm/kvm_nested.h

+25 −2
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ extern void check_nested_vcpu_requests(struct kvm_vcpu *vcpu); 
extern void kvm_nested_flush_hwstate(struct kvm_vcpu *vcpu);

extern void kvm_nested_sync_hwstate(struct kvm_vcpu *vcpu);



extern void kvm_nested_setup_mdcr_el2(struct kvm_vcpu *vcpu);



struct kvm_s2_trans {

	phys_addr_t output;

	unsigned long block_size;
@@ -265,7 +267,7 @@ static inline u64 decode_range_tlbi(u64 val, u64 *range, u16 *asid) 
	return base;

}



static inline unsigned int ps_to_output_size(unsigned int ps)

static inline unsigned int ps_to_output_size(unsigned int ps, bool pa52bit)

{

	switch (ps) {

	case 0: return 32;
@@ -273,7 +275,10 @@ static inline unsigned int ps_to_output_size(unsigned int ps) 
	case 2: return 40;

	case 3: return 42;

	case 4: return 44;

	case 5:

	case 5: return 48;

	case 6: if (pa52bit)

			return 52;

		fallthrough;

	default:

		return 48;

	}
@@ -285,13 +290,28 @@ enum trans_regime { 
	TR_EL2,

};



struct s1_walk_info;



struct s1_walk_context {

	struct s1_walk_info	*wi;

	u64			table_ipa;

	int			level;

};



struct s1_walk_filter {

	int	(*fn)(struct s1_walk_context *, void *);

	void	*priv;

};



struct s1_walk_info {

	struct s1_walk_filter	*filter;

	u64	     		baddr;

	enum trans_regime	regime;

	unsigned int		max_oa_bits;

	unsigned int		pgshift;

	unsigned int		txsz;

	int 	     		sl;

	u8			sh;

	bool			as_el0;

	bool	     		hpd;

	bool			e0poe;
@@ -299,6 +319,7 @@ struct s1_walk_info { 
	bool			pan;

	bool	     		be;

	bool	     		s2;

	bool			pa52bit;

};



struct s1_walk_result {
@@ -334,6 +355,8 @@ struct s1_walk_result { 


int __kvm_translate_va(struct kvm_vcpu *vcpu, struct s1_walk_info *wi,

		       struct s1_walk_result *wr, u64 va);

int __kvm_find_s1_desc_level(struct kvm_vcpu *vcpu, u64 va, u64 ipa,

			     int *level);



/* VNCR management */

int kvm_vcpu_allocate_vncr_tlb(struct kvm_vcpu *vcpu);

arch/arm64/include/asm/kvm_pkvm.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


int pkvm_init_host_vm(struct kvm *kvm);

int pkvm_create_hyp_vm(struct kvm *kvm);

bool pkvm_hyp_vm_is_created(struct kvm *kvm);

void pkvm_destroy_hyp_vm(struct kvm *kvm);

int pkvm_create_hyp_vcpu(struct kvm_vcpu *vcpu);