Commit 181ce6b0 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/misc-6.18 into kvmarm-master/next 



* kvm-arm64/misc-6.18:
  : .
  : .
  : Misc improvements and bug fixes:
  :
  : - Fix XN handling in the S2 page table dumper
  :   (20250809135356.1003520-1-r09922117@csie.ntu.edu.tw)
  :
  : - Fix sanitity checks for huge mapping with pKVM running np guests
  :   (20250815162655.121108-1-ben.horgan@arm.com)
  :
  : - Fix use of TRBE when KVM is disabled, and Linux running under
  :   a lesser hypervisor (20250902-etm_crash-v2-1-aa9713a7306b@oss.qualcomm.com)
  :
  : - Fix out of date MTE-related comments (20250915155234.196288-1-alexandru.elisei@arm.com)
  :
  : - Fix PSCI BE support when running a NV guest (20250916161103.1040727-1-maz@kernel.org)
  :
  : - Fix page reference leak when refusing to map a page due to mismatched attributes
  :   (20250917130737.2139403-1-tabba@google.com)
  :
  : - Add trap handling for PMSDSFR_EL1
  :   (20250901-james-perf-feat_spe_eft-v8-7-2e2738f24559@linaro.org)
  :
  : - Add advertisement from FEAT_LSFE (Large System Float Extension)
  :   (20250918-arm64-lsfe-v4-1-0abc712101c7@kernel.org)
  : .
  KVM: arm64: Expose FEAT_LSFE to guests
  KVM: arm64: Add trap configs for PMSDSFR_EL1
  KVM: arm64: Fix page leak in user_mem_abort()
  KVM: arm64: Fix kvm_vcpu_{set,is}_be() to deal with EL2 state
  KVM: arm64: Update stale comment for sanitise_mte_tags()
  KVM: arm64: Return early from trace helpers when KVM isn't available
  KVM: arm64: Fix debug checking for np-guests using huge mappings
  KVM: arm64: ptdump: Don't test PTE_VALID alongside other attributes

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 47f15744 5d20605c

arch/arm64/include/asm/kvm_emulate.h

+14 −6
Original line number Diff line number Diff line
@@ -525,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/vncr_mapping.h

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ 
#define VNCR_PMSICR_EL1         0x838

#define VNCR_PMSIRR_EL1         0x840

#define VNCR_PMSLATFR_EL1       0x848

#define VNCR_PMSNEVFR_EL1       0x850

#define VNCR_PMSDSFR_EL1        0x858

#define VNCR_TRFCR_EL1          0x880

#define VNCR_MPAM1_EL1          0x900

#define VNCR_MPAMHCR_EL2        0x930

arch/arm64/kvm/debug.c

+11 −11
Original line number Diff line number Diff line
@@ -233,29 +233,29 @@ void kvm_debug_handle_oslar(struct kvm_vcpu *vcpu, u64 val) 
	preempt_enable();

}



void kvm_enable_trbe(void)

static bool skip_trbe_access(bool skip_condition)

{

	if (has_vhe() || is_protected_kvm_enabled() ||

	    WARN_ON_ONCE(preemptible()))

		return;

	return (WARN_ON_ONCE(preemptible()) || skip_condition ||

		is_protected_kvm_enabled() || !is_kvm_arm_initialised());

}



void kvm_enable_trbe(void)

{

	if (!skip_trbe_access(has_vhe()))

		host_data_set_flag(TRBE_ENABLED);

}

EXPORT_SYMBOL_GPL(kvm_enable_trbe);



void kvm_disable_trbe(void)

{

	if (has_vhe() || is_protected_kvm_enabled() ||

	    WARN_ON_ONCE(preemptible()))

		return;



	if (!skip_trbe_access(has_vhe()))

		host_data_clear_flag(TRBE_ENABLED);

}

EXPORT_SYMBOL_GPL(kvm_disable_trbe);



void kvm_tracing_set_el1_configuration(u64 trfcr_while_in_guest)

{

	if (is_protected_kvm_enabled() || WARN_ON_ONCE(preemptible()))

	if (skip_trbe_access(false))

		return;



	if (has_vhe()) {

arch/arm64/kvm/emulate-nested.c

+1 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,7 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = { 
	SR_TRAP(SYS_PMSIRR_EL1,		CGT_MDCR_TPMS),

	SR_TRAP(SYS_PMSLATFR_EL1,	CGT_MDCR_TPMS),

	SR_TRAP(SYS_PMSNEVFR_EL1,	CGT_MDCR_TPMS),

	SR_TRAP(SYS_PMSDSFR_EL1,	CGT_MDCR_TPMS),

	SR_TRAP(SYS_TRFCR_EL1,		CGT_MDCR_TTRF),

	SR_TRAP(SYS_TRBBASER_EL1,	CGT_MDCR_E2TB),

	SR_TRAP(SYS_TRBLIMITR_EL1,	CGT_MDCR_E2TB),

arch/arm64/kvm/hyp/nvhe/mem_protect.c

+6 −3
Original line number Diff line number Diff line
@@ -1010,9 +1010,12 @@ static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, u64 ip 
		return ret;

	if (!kvm_pte_valid(pte))

		return -ENOENT;

	if (kvm_granule_size(level) != size)

	if (size && kvm_granule_size(level) != size)

		return -E2BIG;



	if (!size)

		size = kvm_granule_size(level);



	state = guest_get_page_state(pte, ipa);

	if (state != PKVM_PAGE_SHARED_BORROWED)

		return -EPERM;
@@ -1100,7 +1103,7 @@ int __pkvm_host_relax_perms_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu, enum kvm_ 
	if (prot & ~KVM_PGTABLE_PROT_RWX)

		return -EINVAL;



	assert_host_shared_guest(vm, ipa, PAGE_SIZE);

	assert_host_shared_guest(vm, ipa, 0);

	guest_lock_component(vm);

	ret = kvm_pgtable_stage2_relax_perms(&vm->pgt, ipa, prot, 0);

	guest_unlock_component(vm);
@@ -1156,7 +1159,7 @@ int __pkvm_host_mkyoung_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu) 
	if (pkvm_hyp_vm_is_protected(vm))

		return -EPERM;



	assert_host_shared_guest(vm, ipa, PAGE_SIZE);

	assert_host_shared_guest(vm, ipa, 0);

	guest_lock_component(vm);

	kvm_pgtable_stage2_mkyoung(&vm->pgt, ipa, 0);

	guest_unlock_component(vm);