Commit 5a654ba7 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar

x86/cpa: use an undefined PTE bit for testing CPA

Rather than using _PAGE_GLOBAL - which not all CPUs support - to test
CPA, use one of the reserved-for-software-use PTE flags instead.  This
allows CPA testing to work on CPUs which don't support PGD.
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ef5e94af
/* /*
* self test for change_page_attr. * self test for change_page_attr.
* *
* Clears the global bit on random pages in the direct mapping, then reverts * Clears the a test pte bit on random pages in the direct mapping,
* and compares page tables forwards and afterwards. * then reverts and compares page tables forwards and afterwards.
*/ */
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/kthread.h> #include <linux/kthread.h>
...@@ -32,6 +32,13 @@ enum { ...@@ -32,6 +32,13 @@ enum {
GPS = (1<<30) GPS = (1<<30)
}; };
#define PAGE_TESTBIT __pgprot(_PAGE_UNUSED1)
static int pte_testbit(pte_t pte)
{
return pte_flags(pte) & _PAGE_UNUSED1;
}
struct split_state { struct split_state {
long lpg, gpg, spg, exec; long lpg, gpg, spg, exec;
long min_exec, max_exec; long min_exec, max_exec;
...@@ -165,15 +172,14 @@ static int pageattr_test(void) ...@@ -165,15 +172,14 @@ static int pageattr_test(void)
continue; continue;
} }
err = change_page_attr_clear(addr[i], len[i], err = change_page_attr_set(addr[i], len[i], PAGE_TESTBIT);
__pgprot(_PAGE_GLOBAL));
if (err < 0) { if (err < 0) {
printk(KERN_ERR "CPA %d failed %d\n", i, err); printk(KERN_ERR "CPA %d failed %d\n", i, err);
failed++; failed++;
} }
pte = lookup_address(addr[i], &level); pte = lookup_address(addr[i], &level);
if (!pte || pte_global(*pte) || pte_huge(*pte)) { if (!pte || !pte_testbit(*pte) || pte_huge(*pte)) {
printk(KERN_ERR "CPA %lx: bad pte %Lx\n", addr[i], printk(KERN_ERR "CPA %lx: bad pte %Lx\n", addr[i],
pte ? (u64)pte_val(*pte) : 0ULL); pte ? (u64)pte_val(*pte) : 0ULL);
failed++; failed++;
...@@ -198,14 +204,13 @@ static int pageattr_test(void) ...@@ -198,14 +204,13 @@ static int pageattr_test(void)
failed++; failed++;
continue; continue;
} }
err = change_page_attr_set(addr[i], len[i], err = change_page_attr_clear(addr[i], len[i], PAGE_TESTBIT);
__pgprot(_PAGE_GLOBAL));
if (err < 0) { if (err < 0) {
printk(KERN_ERR "CPA reverting failed: %d\n", err); printk(KERN_ERR "CPA reverting failed: %d\n", err);
failed++; failed++;
} }
pte = lookup_address(addr[i], &level); pte = lookup_address(addr[i], &level);
if (!pte || !pte_global(*pte)) { if (!pte || pte_testbit(*pte)) {
printk(KERN_ERR "CPA %lx: bad pte after revert %Lx\n", printk(KERN_ERR "CPA %lx: bad pte after revert %Lx\n",
addr[i], pte ? (u64)pte_val(*pte) : 0ULL); addr[i], pte ? (u64)pte_val(*pte) : 0ULL);
failed++; failed++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment