Commit ecc729f1 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

x86/mm/cpa: Add ARRAY and PAGES_ARRAY selftests

The current pageattr-test code only uses the regular range interface,
add code that also tests the array and pages interface.
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom.StDenis@amd.com
Cc: dave.hansen@intel.com
Link: http://lkml.kernel.org/r/20181203171043.162771364@infradead.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 02117e42
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
static __read_mostly int print = 1; static __read_mostly int print = 1;
enum { enum {
NTEST = 400, NTEST = 3 * 100,
NPAGES = 100,
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
LPS = (1 << PMD_SHIFT), LPS = (1 << PMD_SHIFT),
#elif defined(CONFIG_X86_PAE) #elif defined(CONFIG_X86_PAE)
...@@ -110,6 +111,9 @@ static int print_split(struct split_state *s) ...@@ -110,6 +111,9 @@ static int print_split(struct split_state *s)
static unsigned long addr[NTEST]; static unsigned long addr[NTEST];
static unsigned int len[NTEST]; static unsigned int len[NTEST];
static struct page *pages[NPAGES];
static unsigned long addrs[NPAGES];
/* Change the global bit on random pages in the direct mapping */ /* Change the global bit on random pages in the direct mapping */
static int pageattr_test(void) static int pageattr_test(void)
{ {
...@@ -137,7 +141,7 @@ static int pageattr_test(void) ...@@ -137,7 +141,7 @@ static int pageattr_test(void)
unsigned long pfn = prandom_u32() % max_pfn_mapped; unsigned long pfn = prandom_u32() % max_pfn_mapped;
addr[i] = (unsigned long)__va(pfn << PAGE_SHIFT); addr[i] = (unsigned long)__va(pfn << PAGE_SHIFT);
len[i] = prandom_u32() % 100; len[i] = prandom_u32() % NPAGES;
len[i] = min_t(unsigned long, len[i], max_pfn_mapped - pfn - 1); len[i] = min_t(unsigned long, len[i], max_pfn_mapped - pfn - 1);
if (len[i] == 0) if (len[i] == 0)
...@@ -167,14 +171,30 @@ static int pageattr_test(void) ...@@ -167,14 +171,30 @@ static int pageattr_test(void)
break; break;
} }
__set_bit(pfn + k, bm); __set_bit(pfn + k, bm);
addrs[k] = addr[i] + k*PAGE_SIZE;
pages[k] = pfn_to_page(pfn + k);
} }
if (!addr[i] || !pte || !k) { if (!addr[i] || !pte || !k) {
addr[i] = 0; addr[i] = 0;
continue; continue;
} }
test_addr = addr[i]; switch (i % 3) {
err = change_page_attr_set(&test_addr, len[i], PAGE_CPA_TEST, 0); case 0:
test_addr = addr[i];
err = change_page_attr_set(&test_addr, len[i], PAGE_CPA_TEST, 0);
break;
case 1:
err = change_page_attr_set(addrs, len[1], PAGE_CPA_TEST, 1);
break;
case 2:
err = cpa_set_pages_array(pages, len[i], PAGE_CPA_TEST);
break;
}
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++;
......
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