Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fd64103 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-arm-for-v4.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 

From: Christoffer Dall <cdall@linaro.org>

KVM/ARM Fixes for v4.11-rc6

Fixes include:
 - Fix a problem with GICv3 userspace save/restore
 - Clarify GICv2 userspace save/restore ABI
 - Be more careful in clearing GIC LRs
 - Add missing synchronization primitive to our MMU handling code
parents 1fb883bb 6d56111c

Documentation/virtual/kvm/devices/arm-vgic.txt

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,12 @@ Groups: 


    Bits for undefined preemption levels are RAZ/WI.



    For historical reasons and to provide ABI compatibility with userspace we

    export the GICC_PMR register in the format of the GICH_VMCR.VMPriMask

    field in the lower 5 bits of a word, meaning that userspace must always

    use the lower 5 bits to communicate with the KVM device and must shift the

    value left by 3 places to obtain the actual priority mask level.



  Limitations:

    - Priorities are not implemented, and registers are RAZ/WI

    - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2.

arch/arm/kvm/arm.c

+3 −0
Original line number Diff line number Diff line
@@ -1124,6 +1124,9 @@ static void cpu_hyp_reinit(void) 
		if (__hyp_get_vectors() == hyp_default_vectors)

			cpu_init_hyp_mode(NULL);

	}



	if (vgic_present)

		kvm_vgic_init_cpu_hardware();

}



static void cpu_hyp_reset(void)

arch/arm/kvm/mmu.c

+20 −3
Original line number Diff line number Diff line
@@ -292,11 +292,18 @@ static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size) 
	phys_addr_t addr = start, end = start + size;

	phys_addr_t next;



	assert_spin_locked(&kvm->mmu_lock);

	pgd = kvm->arch.pgd + stage2_pgd_index(addr);

	do {

		next = stage2_pgd_addr_end(addr, end);

		if (!stage2_pgd_none(*pgd))

			unmap_stage2_puds(kvm, pgd, addr, next);

		/*

		 * If the range is too large, release the kvm->mmu_lock

		 * to prevent starvation and lockup detector warnings.

		 */

		if (next != end)

			cond_resched_lock(&kvm->mmu_lock);

	} while (pgd++, addr = next, addr != end);

}
@@ -803,6 +810,7 @@ void stage2_unmap_vm(struct kvm *kvm) 
	int idx;



	idx = srcu_read_lock(&kvm->srcu);

	down_read(&current->mm->mmap_sem);

	spin_lock(&kvm->mmu_lock);



	slots = kvm_memslots(kvm);
@@ -810,6 +818,7 @@ void stage2_unmap_vm(struct kvm *kvm) 
		stage2_unmap_memslot(kvm, memslot);



	spin_unlock(&kvm->mmu_lock);

	up_read(&current->mm->mmap_sem);

	srcu_read_unlock(&kvm->srcu, idx);

}
@@ -829,7 +838,10 @@ void kvm_free_stage2_pgd(struct kvm *kvm) 
	if (kvm->arch.pgd == NULL)

		return;



	spin_lock(&kvm->mmu_lock);

	unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE);

	spin_unlock(&kvm->mmu_lock);



	/* Free the HW pgd, one page at a time */

	free_pages_exact(kvm->arch.pgd, S2_PGD_SIZE);

	kvm->arch.pgd = NULL;
@@ -1801,6 +1813,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
	    (KVM_PHYS_SIZE >> PAGE_SHIFT))

		return -EFAULT;



	down_read(&current->mm->mmap_sem);

	/*

	 * A memory region could potentially cover multiple VMAs, and any holes

	 * between them, so iterate over all of them to find out if we can map
@@ -1844,8 +1857,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
			pa += vm_start - vma->vm_start;



			/* IO region dirty page logging not allowed */

			if (memslot->flags & KVM_MEM_LOG_DIRTY_PAGES)

				return -EINVAL;

			if (memslot->flags & KVM_MEM_LOG_DIRTY_PAGES) {

				ret = -EINVAL;

				goto out;

			}



			ret = kvm_phys_addr_ioremap(kvm, gpa, pa,

						    vm_end - vm_start,
@@ -1857,7 +1872,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
	} while (hva < reg_end);



	if (change == KVM_MR_FLAGS_ONLY)

		return ret;

		goto out;



	spin_lock(&kvm->mmu_lock);

	if (ret)
@@ -1865,6 +1880,8 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
	else

		stage2_flush_memslot(kvm, memslot);

	spin_unlock(&kvm->mmu_lock);

out:

	up_read(&current->mm->mmap_sem);

	return ret;

}

include/kvm/arm_vgic.h

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ void kvm_vgic_vcpu_early_init(struct kvm_vcpu *vcpu); 
void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu);

int kvm_vgic_map_resources(struct kvm *kvm);

int kvm_vgic_hyp_init(void);

void kvm_vgic_init_cpu_hardware(void);



int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int intid,

			bool level);

include/linux/irqchip/arm-gic.h

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ 
#define GICH_MISR_EOI			(1 << 0)

#define GICH_MISR_U			(1 << 1)



#define GICV_PMR_PRIORITY_SHIFT		3

#define GICV_PMR_PRIORITY_MASK		(0x1f << GICV_PMR_PRIORITY_SHIFT)



#ifndef __ASSEMBLY__



#include <linux/irqdomain.h>