Commit 60463628 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Dave Hansen
Browse files

x86/mm: Implement native set_memory_rox() 



Provide a native implementation of set_memory_rox(), avoiding the
double set_memory_ro();set_memory_x(); calls.

Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parent d48567c9

arch/x86/include/asm/set_memory.h

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
#include <asm/page.h>

#include <asm-generic/set_memory.h>



#define set_memory_rox set_memory_rox

int set_memory_rox(unsigned long addr, int numpages);



/*

 * The set_memory_* API can be used to change various attributes of a virtual

 * address range. The attributes include:

arch/x86/mm/pat/set_memory.c

+10 −0
Original line number Diff line number Diff line
@@ -2025,6 +2025,16 @@ int set_memory_ro(unsigned long addr, int numpages) 
	return change_page_attr_clear(&addr, numpages, __pgprot(_PAGE_RW), 0);

}



int set_memory_rox(unsigned long addr, int numpages)

{

	pgprot_t clr = __pgprot(_PAGE_RW);



	if (__supported_pte_mask & _PAGE_NX)

		clr.pgprot |= _PAGE_NX;



	return change_page_attr_clear(&addr, numpages, clr, 0);

}



int set_memory_rw(unsigned long addr, int numpages)

{

	return change_page_attr_set(&addr, numpages, __pgprot(_PAGE_RW), 0);

include/linux/set_memory.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; } 
static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }

#endif



#ifndef set_memory_rox

static inline int set_memory_rox(unsigned long addr, int numpages)

{

	int ret = set_memory_ro(addr, numpages);
@@ -21,6 +22,7 @@ static inline int set_memory_rox(unsigned long addr, int numpages) 
		return ret;

	return set_memory_x(addr, numpages);

}

#endif



#ifndef CONFIG_ARCH_HAS_SET_DIRECT_MAP

static inline int set_direct_map_invalid_noflush(struct page *page)