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

Commit c874e6fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Gleb Natapov.

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: kvm_clear_guest_page(): fix empty_zero_page usage
  kvm: mmu: delay mmu audit activation
  arm/arm64: KVM: Fix hyp mappings of vmalloc regions
parents d0f278c1 8a3caa6d

arch/arm/kvm/mmu.c

+28 −6
Original line number Diff line number Diff line
@@ -334,6 +334,17 @@ static int __create_hyp_mappings(pgd_t *pgdp, 
	return err;

}



static phys_addr_t kvm_kaddr_to_phys(void *kaddr)

{

	if (!is_vmalloc_addr(kaddr)) {

		BUG_ON(!virt_addr_valid(kaddr));

		return __pa(kaddr);

	} else {

		return page_to_phys(vmalloc_to_page(kaddr)) +

		       offset_in_page(kaddr);

	}

}



/**

 * create_hyp_mappings - duplicate a kernel virtual address range in Hyp mode

 * @from:	The virtual kernel start address of the range
@@ -345,16 +356,27 @@ static int __create_hyp_mappings(pgd_t *pgdp, 
 */

int create_hyp_mappings(void *from, void *to)

{

	unsigned long phys_addr = virt_to_phys(from);

	phys_addr_t phys_addr;

	unsigned long virt_addr;

	unsigned long start = KERN_TO_HYP((unsigned long)from);

	unsigned long end = KERN_TO_HYP((unsigned long)to);



	/* Check for a valid kernel memory mapping */

	if (!virt_addr_valid(from) || !virt_addr_valid(to - 1))

		return -EINVAL;

	start = start & PAGE_MASK;

	end = PAGE_ALIGN(end);



	return __create_hyp_mappings(hyp_pgd, start, end,

				     __phys_to_pfn(phys_addr), PAGE_HYP);

	for (virt_addr = start; virt_addr < end; virt_addr += PAGE_SIZE) {

		int err;



		phys_addr = kvm_kaddr_to_phys(from + virt_addr - start);

		err = __create_hyp_mappings(hyp_pgd, virt_addr,

					    virt_addr + PAGE_SIZE,

					    __phys_to_pfn(phys_addr),

					    PAGE_HYP);

		if (err)

			return err;

	}



	return 0;

}



/**

arch/x86/kvm/mmu_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -296,4 +296,4 @@ static struct kernel_param_ops audit_param_ops = { 
	.get = param_get_bool,

};



module_param_cb(mmu_audit, &audit_param_ops, &mmu_audit, 0644);
 
arch_param_cb(mmu_audit, &audit_param_ops, &mmu_audit, 0644);

virt/kvm/kvm_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1615,8 +1615,9 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached); 


int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)

{

	return kvm_write_guest_page(kvm, gfn, (const void *) empty_zero_page,

				    offset, len);

	const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));



	return kvm_write_guest_page(kvm, gfn, zero_page, offset, len);

}

EXPORT_SYMBOL_GPL(kvm_clear_guest_page);