From: Ira Weiny <[email protected]>
When a devmap caller requests protections, the dev_pagemap PTE's need to
have a PKEY set.
When PGMAP_PROTECTIONS is requested add the pkey to the page
protections.
Signed-off-by: Ira Weiny <[email protected]>
---
Changes for V9
From Dave Hansen
use pkey
---
mm/memremap.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/mm/memremap.c b/mm/memremap.c
index 4dfb3025cee3..215ab9c51917 100644
--- a/mm/memremap.c
+++ b/mm/memremap.c
@@ -81,6 +81,14 @@ static void devmap_protection_enable(void)
static_branch_inc(&dev_pgmap_protection_static_key);
}
+static pgprot_t devmap_protection_adjust_pgprot(pgprot_t prot)
+{
+ pgprotval_t val;
+
+ val = pgprot_val(prot);
+ return __pgprot(val | _PAGE_PKEY(PKS_KEY_PGMAP_PROTECTION));
+}
+
static void devmap_protection_disable(void)
{
static_branch_dec(&dev_pgmap_protection_static_key);
@@ -91,6 +99,10 @@ static void devmap_protection_disable(void)
static void devmap_protection_enable(void) { }
static void devmap_protection_disable(void) { }
+static pgprot_t devmap_protection_adjust_pgprot(pgprot_t prot)
+{
+ return prot;
+}
#endif /* CONFIG_DEVMAP_ACCESS_PROTECTION */
static void pgmap_array_delete(struct range *range)
@@ -333,6 +345,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid)
if (!pgmap_protection_available())
return ERR_PTR(-EINVAL);
devmap_protection_enable();
+ params.pgprot = devmap_protection_adjust_pgprot(params.pgprot);
}
switch (pgmap->type) {
--
2.35.1