Commit 7025098a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

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

KVM/arm64 fixes for 5.14, take #1

- Fix MTE shared page detection

- Fix selftest use of obsolete pthread_yield() in favour of sched_yield()

- Enable selftest's use of PMU registers when asked to
parents 2734d6c1 5cf17746

arch/arm64/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
		vma_shift = get_vma_page_shift(vma, hva);

	}



	shared = (vma->vm_flags & VM_PFNMAP);

	shared = (vma->vm_flags & VM_SHARED);



	switch (vma_shift) {

#ifndef __PAGETABLE_PMD_FOLDED

tools/testing/selftests/kvm/aarch64/get-reg-list.c

+2 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,8 @@ static __u64 sve_rejects_set[] = { 
#define VREGS_SUBLIST \

	{ "vregs", .regs = vregs, .regs_n = ARRAY_SIZE(vregs), }

#define PMU_SUBLIST \

	{ "pmu", .regs = pmu_regs, .regs_n = ARRAY_SIZE(pmu_regs), }

	{ "pmu", .capability = KVM_CAP_ARM_PMU_V3, .feature = KVM_ARM_VCPU_PMU_V3, \

	  .regs = pmu_regs, .regs_n = ARRAY_SIZE(pmu_regs), }

#define SVE_SUBLIST \

	{ "sve", .capability = KVM_CAP_ARM_SVE, .feature = KVM_ARM_VCPU_SVE, .finalize = true, \

	  .regs = sve_regs, .regs_n = ARRAY_SIZE(sve_regs), \

tools/testing/selftests/kvm/steal_time.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int main(int ac, char **av) 
		run_delay = get_run_delay();

		pthread_create(&thread, &attr, do_steal_time, NULL);

		do

			pthread_yield();

			sched_yield();

		while (get_run_delay() - run_delay < MIN_RUN_DELAY_NS);

		pthread_join(thread, NULL);

		run_delay = get_run_delay() - run_delay;