Commit 675a15f4 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-6.5-1' of... 

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

KVM/arm64 fixes for 6.5, part #1

 - Avoid pKVM finalization if KVM initialization fails

 - Add missing BTI instructions in the hypervisor, fixing an early boot
   failure on BTI systems

 - Handle MMU notifiers correctly for non hugepage-aligned memslots

 - Work around a bug in the architecture where hypervisor timer controls
   have UNKNOWN behavior under nested virt.

 - Disable preemption in kvm_arch_hardware_enable(), fixing a kernel BUG
   in cpu hotplug resulting from per-CPU accessor sanity checking.

 - Make WFI emulation on GICv4 systems robust w.r.t. preemption,
   consistently requesting a doorbell interrupt on vcpu_put()

 - Uphold RES0 sysreg behavior when emulating older PMU versions

 - Avoid macro expansion when initializing PMU register names, ensuring
   the tracepoints pretty-print the sysreg.
parents fdf0eaf1 9d2a55b4

arch/arm64/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -727,6 +727,8 @@ struct kvm_vcpu_arch { 
#define DBG_SS_ACTIVE_PENDING	__vcpu_single_flag(sflags, BIT(5))

/* PMUSERENR for the guest EL0 is on physical CPU */

#define PMUSERENR_ON_CPU	__vcpu_single_flag(sflags, BIT(6))

/* WFI instruction trapped */

#define IN_WFI			__vcpu_single_flag(sflags, BIT(7))





/* Pointer to the vcpu's SVE FFR for sve_{save,load}_state() */

arch/arm64/include/asm/kvm_pgtable.h

+9 −17
Original line number Diff line number Diff line
@@ -608,22 +608,26 @@ int kvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size); 
kvm_pte_t kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr);



/**

 * kvm_pgtable_stage2_mkold() - Clear the access flag in a page-table entry.

 * kvm_pgtable_stage2_test_clear_young() - Test and optionally clear the access

 *					   flag in a page-table entry.

 * @pgt:	Page-table structure initialised by kvm_pgtable_stage2_init*().

 * @addr:	Intermediate physical address to identify the page-table entry.

 * @size:	Size of the address range to visit.

 * @mkold:	True if the access flag should be cleared.

 *

 * The offset of @addr within a page is ignored.

 *

 * If there is a valid, leaf page-table entry used to translate @addr, then

 * clear the access flag in that entry.

 * Tests and conditionally clears the access flag for every valid, leaf

 * page-table entry used to translate the range [@addr, @addr + @size).

 *

 * Note that it is the caller's responsibility to invalidate the TLB after

 * calling this function to ensure that the updated permissions are visible

 * to the CPUs.

 *

 * Return: The old page-table entry prior to clearing the flag, 0 on failure.

 * Return: True if any of the visited PTEs had the access flag set.

 */

kvm_pte_t kvm_pgtable_stage2_mkold(struct kvm_pgtable *pgt, u64 addr);

bool kvm_pgtable_stage2_test_clear_young(struct kvm_pgtable *pgt, u64 addr,

					 u64 size, bool mkold);



/**

 * kvm_pgtable_stage2_relax_perms() - Relax the permissions enforced by a
@@ -645,18 +649,6 @@ kvm_pte_t kvm_pgtable_stage2_mkold(struct kvm_pgtable *pgt, u64 addr); 
int kvm_pgtable_stage2_relax_perms(struct kvm_pgtable *pgt, u64 addr,

				   enum kvm_pgtable_prot prot);



/**

 * kvm_pgtable_stage2_is_young() - Test whether a page-table entry has the

 *				   access flag set.

 * @pgt:	Page-table structure initialised by kvm_pgtable_stage2_init*().

 * @addr:	Intermediate physical address to identify the page-table entry.

 *

 * The offset of @addr within a page is ignored.

 *

 * Return: True if the page-table entry has the access flag set, false otherwise.

 */

bool kvm_pgtable_stage2_is_young(struct kvm_pgtable *pgt, u64 addr);



/**

 * kvm_pgtable_stage2_flush_range() - Clean and invalidate data cache to Point

 * 				      of Coherency for guest stage-2 address

arch/arm64/include/asm/virt.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ extern u32 __boot_cpu_mode[2]; 


void __hyp_set_vectors(phys_addr_t phys_vector_base);

void __hyp_reset_vectors(void);

bool is_kvm_arm_initialised(void);



DECLARE_STATIC_KEY_FALSE(kvm_protected_mode_initialized);

arch/arm64/kvm/arch_timer.c

+3 −3
Original line number Diff line number Diff line
@@ -827,8 +827,8 @@ static void timer_set_traps(struct kvm_vcpu *vcpu, struct timer_map *map) 
	assign_clear_set_bit(tpt, CNTHCTL_EL1PCEN << 10, set, clr);

	assign_clear_set_bit(tpc, CNTHCTL_EL1PCTEN << 10, set, clr);



	/* This only happens on VHE, so use the CNTKCTL_EL1 accessor */

	sysreg_clear_set(cntkctl_el1, clr, set);

	/* This only happens on VHE, so use the CNTHCTL_EL2 accessor. */

	sysreg_clear_set(cnthctl_el2, clr, set);

}



void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu)
@@ -1563,7 +1563,7 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu) 
void kvm_timer_init_vhe(void)

{

	if (cpus_have_final_cap(ARM64_HAS_ECV_CNTPOFF))

		sysreg_clear_set(cntkctl_el1, 0, CNTHCTL_ECV);

		sysreg_clear_set(cnthctl_el2, 0, CNTHCTL_ECV);

}



int kvm_arm_timer_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)

arch/arm64/kvm/arm.c

+24 −4
Original line number Diff line number Diff line
@@ -53,11 +53,16 @@ DECLARE_KVM_NVHE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params); 


DECLARE_KVM_NVHE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);



static bool vgic_present;

static bool vgic_present, kvm_arm_initialised;



static DEFINE_PER_CPU(unsigned char, kvm_arm_hardware_enabled);

DEFINE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



bool is_kvm_arm_initialised(void)

{

	return kvm_arm_initialised;

}



int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_exiting_guest_mode(vcpu) == IN_GUEST_MODE;
@@ -713,13 +718,15 @@ void kvm_vcpu_wfi(struct kvm_vcpu *vcpu) 
	 */

	preempt_disable();

	kvm_vgic_vmcr_sync(vcpu);

	vgic_v4_put(vcpu, true);

	vcpu_set_flag(vcpu, IN_WFI);

	vgic_v4_put(vcpu);

	preempt_enable();



	kvm_vcpu_halt(vcpu);

	vcpu_clear_flag(vcpu, IN_WFIT);



	preempt_disable();

	vcpu_clear_flag(vcpu, IN_WFI);

	vgic_v4_load(vcpu);

	preempt_enable();

}
@@ -787,7 +794,7 @@ static int check_vcpu_requests(struct kvm_vcpu *vcpu) 
		if (kvm_check_request(KVM_REQ_RELOAD_GICv4, vcpu)) {

			/* The distributor enable bits were changed */

			preempt_disable();

			vgic_v4_put(vcpu, false);

			vgic_v4_put(vcpu);

			vgic_v4_load(vcpu);

			preempt_enable();

		}
@@ -1867,8 +1874,17 @@ static void _kvm_arch_hardware_enable(void *discard) 


int kvm_arch_hardware_enable(void)

{

	int was_enabled = __this_cpu_read(kvm_arm_hardware_enabled);

	int was_enabled;



	/*

	 * Most calls to this function are made with migration

	 * disabled, but not with preemption disabled. The former is

	 * enough to ensure correctness, but most of the helpers

	 * expect the later and will throw a tantrum otherwise.

	 */

	preempt_disable();



	was_enabled = __this_cpu_read(kvm_arm_hardware_enabled);

	_kvm_arch_hardware_enable(NULL);



	if (!was_enabled) {
@@ -1876,6 +1892,8 @@ int kvm_arch_hardware_enable(void) 
		kvm_timer_cpu_up();

	}



	preempt_enable();



	return 0;

}
@@ -2482,6 +2500,8 @@ static __init int kvm_arm_init(void) 
	if (err)

		goto out_subs;



	kvm_arm_initialised = true;



	return 0;



out_subs: