Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acb25d76 authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar
Browse files

x86/pkeys/selftests: Save off 'prot' for allocations 



This makes it possible to to tell what 'prot' a given allocation
is supposed to have.  That way, if we want to change just the
pkey, we know what 'prot' to pass to mprotect_pkey().

Also, keep a record of the most recent allocation so the tests
can easily find it.

Signed-off-by: default avatarDave 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/20180509171354.AA23E228@viggo.jf.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3d64f4ed

tools/testing/selftests/x86/protection_keys.c

+9 −5
Original line number Diff line number Diff line
@@ -677,10 +677,12 @@ int mprotect_pkey(void *ptr, size_t size, unsigned long orig_prot, 
struct pkey_malloc_record {

	void *ptr;

	long size;

	int prot;

};

struct pkey_malloc_record *pkey_malloc_records;

struct pkey_malloc_record *pkey_last_malloc_record;

long nr_pkey_malloc_records;

void record_pkey_malloc(void *ptr, long size)

void record_pkey_malloc(void *ptr, long size, int prot)

{

	long i;

	struct pkey_malloc_record *rec = NULL;
@@ -712,6 +714,8 @@ void record_pkey_malloc(void *ptr, long size) 
		(int)(rec - pkey_malloc_records), rec, ptr, size);

	rec->ptr = ptr;

	rec->size = size;

	rec->prot = prot;

	pkey_last_malloc_record = rec;

	nr_pkey_malloc_records++;

}
@@ -756,7 +760,7 @@ void *malloc_pkey_with_mprotect(long size, int prot, u16 pkey) 
	pkey_assert(ptr != (void *)-1);

	ret = mprotect_pkey((void *)ptr, PAGE_SIZE, prot, pkey);

	pkey_assert(!ret);

	record_pkey_malloc(ptr, size);

	record_pkey_malloc(ptr, size, prot);

	rdpkru();



	dprintf1("%s() for pkey %d @ %p\n", __func__, pkey, ptr);
@@ -777,7 +781,7 @@ void *malloc_pkey_anon_huge(long size, int prot, u16 pkey) 
	size = ALIGN_UP(size, HPAGE_SIZE * 2);

	ptr = mmap(NULL, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);

	pkey_assert(ptr != (void *)-1);

	record_pkey_malloc(ptr, size);

	record_pkey_malloc(ptr, size, prot);

	mprotect_pkey(ptr, size, prot, pkey);



	dprintf1("unaligned ptr: %p\n", ptr);
@@ -850,7 +854,7 @@ void *malloc_pkey_hugetlb(long size, int prot, u16 pkey) 
	pkey_assert(ptr != (void *)-1);

	mprotect_pkey(ptr, size, prot, pkey);



	record_pkey_malloc(ptr, size);

	record_pkey_malloc(ptr, size, prot);



	dprintf1("mmap()'d hugetlbfs for pkey %d @ %p\n", pkey, ptr);

	return ptr;
@@ -872,7 +876,7 @@ void *malloc_pkey_mmap_dax(long size, int prot, u16 pkey) 


	mprotect_pkey(ptr, size, prot, pkey);



	record_pkey_malloc(ptr, size);

	record_pkey_malloc(ptr, size, prot);



	dprintf1("mmap()'d for pkey %d @ %p\n", pkey, ptr);

	close(fd);