[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 4 May 2021 17:30:29 -0700
From: Rick Edgecombe <rick.p.edgecombe@...el.com>
To: dave.hansen@...el.com,
luto@...nel.org,
peterz@...radead.org,
linux-mm@...ck.org,
x86@...nel.org,
akpm@...ux-foundation.org,
linux-hardening@...r.kernel.org,
kernel-hardening@...ts.openwall.com
Cc: ira.weiny@...el.com,
rppt@...nel.org,
dan.j.williams@...el.com,
linux-kernel@...r.kernel.org,
Rick Edgecombe <rick.p.edgecombe@...el.com>
Subject: [PATCH RFC 6/9] x86/mm/cpa: Add set_memory_pks()
Add function for setting PKS key on kernel memory.
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@...el.com>
---
arch/x86/include/asm/set_memory.h | 1 +
arch/x86/mm/pat/set_memory.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
index b63f09cc282a..a2bab1626fdd 100644
--- a/arch/x86/include/asm/set_memory.h
+++ b/arch/x86/include/asm/set_memory.h
@@ -52,6 +52,7 @@ int set_memory_decrypted(unsigned long addr, int numpages);
int set_memory_np_noalias(unsigned long addr, int numpages);
int set_memory_nonglobal(unsigned long addr, int numpages);
int set_memory_global(unsigned long addr, int numpages);
+int set_memory_pks(unsigned long addr, int numpages, int key);
int set_pages_array_uc(struct page **pages, int addrinarray);
int set_pages_array_wc(struct page **pages, int addrinarray);
diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
index 6877ef66793b..29e61afb4a94 100644
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -1914,6 +1914,13 @@ int set_memory_wb(unsigned long addr, int numpages)
}
EXPORT_SYMBOL(set_memory_wb);
+int set_memory_pks(unsigned long addr, int numpages, int key)
+{
+ return change_page_attr_set_clr(&addr, numpages, __pgprot(_PAGE_PKEY(key)),
+ __pgprot(_PAGE_PKEY(0xF & ~(unsigned int)key)),
+ 0, 0, NULL);
+}
+
int set_memory_x(unsigned long addr, int numpages)
{
if (!(__supported_pte_mask & _PAGE_NX))
--
2.30.2
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
