gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contiguous PTE: Fix requested page-shift check

Browse Source 
Change-Id: Iafc505457f7e10c94142070113870cd8b8c6922d
This commit is contained in:
Masamichi Takagi
2018-12-13 10:29:57 +09:00
committed by Dominique Martinet
parent 312c1168f3
commit 649059f2d2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm64/kernel/memory.c
View File

@ -2758,10 +2758,11 @@ int set_range_middle(void *args0, pte_t *ptep, uintptr_t base, uintptr_t start,
unsigned long pgsize;
unsigned long pgshift;
unsigned long cont_pgsize;
unsigned long cont_pgshift;
} table[] = {
{walk_pte_l1, set_range_l1, PTL2_SIZE, PTL2_SHIFT, PTL2_CONT_SIZE}, /*PTL2: second*/
{walk_pte_l2, set_range_l2, PTL3_SIZE, PTL3_SHIFT, PTL3_CONT_SIZE}, /*PTL3: first*/
{walk_pte_l3, set_range_l3, PTL4_SIZE, PTL4_SHIFT, PTL4_CONT_SIZE}, /*PTL4: zero*/
{walk_pte_l1, set_range_l1, PTL2_SIZE, PTL2_SHIFT, PTL2_CONT_SIZE, PTL2_CONT_SHIFT}, /*PTL2: second*/
{walk_pte_l2, set_range_l2, PTL3_SIZE, PTL3_SHIFT, PTL3_CONT_SIZE, PTL2_CONT_SHIFT}, /*PTL3: first*/
{walk_pte_l3, set_range_l3, PTL4_SIZE, PTL4_SHIFT, PTL4_CONT_SIZE, PTL2_CONT_SHIFT}, /*PTL4: zero*/
};
const struct table tbl = table[level-2];
@ -2780,7 +2781,9 @@ retry:
if ((start <= base) && ((base + tbl.pgsize) <= end)
&& ((args->diff & (tbl.pgsize - 1)) == 0)
&& (!args->pgshift
|| (args->pgshift == tbl.pgshift))) {
|| (args->pgshift == tbl.pgshift ||
args->pgshift == tbl.cont_pgshift))) {
phys = args->phys + (base - start);
//check head pte