niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

x86/mm: Implement native set_memory_rox()

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

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
This commit is contained in:
Peter Zijlstra 2022-10-29 13:19:31 +02:00 • committed by Dave Hansen
parent d48567c9a0
commit 60463628c9
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/include/asm/set_memory.h
View file

@ -6,6 +6,9 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/set_memory.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 * The set_memory_* API can be used to change various attributes of a virtual
* address range. The attributes include: * address range. The attributes include:

10
arch/x86/mm/pat/set_memory.c
View file

@ -2025,6 +2025,16 @@ int set_memory_ro(unsigned long addr, int numpages)
return change_page_attr_clear(&addr, numpages, __pgprot(_PAGE_RW), 0); 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) int set_memory_rw(unsigned long addr, int numpages)
{ {
return change_page_attr_set(&addr, numpages, __pgprot(_PAGE_RW), 0); return change_page_attr_set(&addr, numpages, __pgprot(_PAGE_RW), 0);

2
include/linux/set_memory.h
View file

@ -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; } static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
#endif #endif
#ifndef set_memory_rox
static inline int set_memory_rox(unsigned long addr, int numpages) static inline int set_memory_rox(unsigned long addr, int numpages)
{ {
int ret = set_memory_ro(addr, 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 ret;
return set_memory_x(addr, numpages); return set_memory_x(addr, numpages);
} }
#endif
#ifndef CONFIG_ARCH_HAS_SET_DIRECT_MAP #ifndef CONFIG_ARCH_HAS_SET_DIRECT_MAP
static inline int set_direct_map_invalid_noflush(struct page *page) static inline int set_direct_map_invalid_noflush(struct page *page)