lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'kvm-arm-fixes-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm-arm into next

Browse Source 
Fix percpu vmalloc allocations
This commit is contained in:
Gleb Natapov
2013-11-19 10:43:05 +02:00
parent f080480488 40c2729bab
commit 2ecd1aba59
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm/kvm/mmu.c
View File

@@ -334,6 +334,17 @@ out:
return err; 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 * create_hyp_mappings - duplicate a kernel virtual address range in Hyp mode
* @from: The virtual kernel start address of the range * @from: The virtual kernel start address of the range
@@ -345,16 +356,27 @@ out:
*/ */
int create_hyp_mappings(void *from, void *to) 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 start = KERN_TO_HYP((unsigned long)from);
unsigned long end = KERN_TO_HYP((unsigned long)to); unsigned long end = KERN_TO_HYP((unsigned long)to);
/* Check for a valid kernel memory mapping */ start = start & PAGE_MASK;
if (!virt_addr_valid(from) || !virt_addr_valid(to - 1)) end = PAGE_ALIGN(end);
return -EINVAL;
return __create_hyp_mappings(hyp_pgd, start, end, for (virt_addr = start; virt_addr < end; virt_addr += PAGE_SIZE) {
__phys_to_pfn(phys_addr), PAGE_HYP); 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;
} }
/** /**