x86/pkeys/selftests: Factor out "instruction page"
We currently have an execute-only test, but it is for the explicit mprotect_pkey() interface. We will soon add a test for the implicit mprotect(PROT_EXEC) enterface. We need this code in both tests. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Michael Ellermen <mpe@ellerman.id.au> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ram Pai <linuxram@us.ibm.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20180509171347.C64AB733@viggo.jf.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
7e7fd67ca3
commit
3fcd2b2d92
|
@ -1253,12 +1253,9 @@ void test_ptrace_of_child(int *ptr, u16 pkey)
|
|||
free(plain_ptr_unaligned);
|
||||
}
|
||||
|
||||
void test_executing_on_unreadable_memory(int *ptr, u16 pkey)
|
||||
void *get_pointer_to_instructions(void)
|
||||
{
|
||||
void *p1;
|
||||
int scratch;
|
||||
int ptr_contents;
|
||||
int ret;
|
||||
|
||||
p1 = ALIGN_PTR_UP(&lots_o_noops_around_write, PAGE_SIZE);
|
||||
dprintf3("&lots_o_noops: %p\n", &lots_o_noops_around_write);
|
||||
|
@ -1268,7 +1265,23 @@ void test_executing_on_unreadable_memory(int *ptr, u16 pkey)
|
|||
/* Point 'p1' at the *second* page of the function: */
|
||||
p1 += PAGE_SIZE;
|
||||
|
||||
/*
|
||||
* Try to ensure we fault this in on next touch to ensure
|
||||
* we get an instruction fault as opposed to a data one
|
||||
*/
|
||||
madvise(p1, PAGE_SIZE, MADV_DONTNEED);
|
||||
|
||||
return p1;
|
||||
}
|
||||
|
||||
void test_executing_on_unreadable_memory(int *ptr, u16 pkey)
|
||||
{
|
||||
void *p1;
|
||||
int scratch;
|
||||
int ptr_contents;
|
||||
int ret;
|
||||
|
||||
p1 = get_pointer_to_instructions();
|
||||
lots_o_noops_around_write(&scratch);
|
||||
ptr_contents = read_ptr(p1);
|
||||
dprintf2("ptr (%p) contents@%d: %x\n", p1, __LINE__, ptr_contents);
|
||||
|
|
Loading…
Reference in a new issue