Skip to content

Commit

Permalink
x86: fix c_p_a() boot crash
Browse files Browse the repository at this point in the history
fix:

> hm, i just found a failing 64-bit .config while testing your CPA
> patchset:
>
>  [    1.916541] CPA mapping 4k 0 large 2048 gb 0 x 0[0-0] miss 0
>  [    1.919874] Unable to handle kernel paging request at 000000000335aea8 RIP:
>  [    1.919874]  [<ffffffff8021d2d3>] change_page_attr+0x3/0x61
>  [    1.919874] PGD 0
>  [    1.919874] Oops: 0000 [1]
>  [    1.919874] CPU 0

This handles addresses which don't have a mem_map entry.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Andi Kleen authored and Ingo Molnar committed Jan 30, 2008
1 parent aaa0e89 commit 6ba9b7d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/mm/pageattr-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static __init int exercise_pageattr(void)
continue;
}

err = change_page_attr(virt_to_page(addr[i]), len[i],
err = change_page_attr_addr(addr[i], len[i],
pte_pgprot(pte_clrhuge(pte_clrglobal(pte0))));
if (err < 0) {
printk(KERN_ERR "CPA %d failed %d\n", i, err);
Expand Down Expand Up @@ -212,7 +212,7 @@ static __init int exercise_pageattr(void)
failed++;
continue;
}
err = change_page_attr(virt_to_page(addr[i]), len[i],
err = change_page_attr_addr(addr[i], len[i],
pte_pgprot(pte_mkglobal(*pte)));
if (err < 0) {
printk(KERN_ERR "CPA reverting failed: %d\n", err);
Expand Down

0 comments on commit 6ba9b7d

Please sign in to comment.