From: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
We might want to do different things depending on where we are coming
from.
Cc: Will Deacon <will@xxxxxxxxxx>
Cc: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
Signed-off-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
[borntraeger@xxxxxxxxxx: patch description]
Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
---
include/linux/gfp.h | 8 +++++++-
mm/gup.c | 4 ++--
mm/page-writeback.c | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index be2754841369..a15fcb361e7c 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -485,8 +485,14 @@ static inline void arch_free_page(struct page *page, int order) { }
#ifndef HAVE_ARCH_ALLOC_PAGE
static inline void arch_alloc_page(struct page *page, int order) { }
#endif
+enum access_type {
+ MAKE_ACCESSIBLE_GENERIC,
+ MAKE_ACCESSIBLE_GET,
+ MAKE_ACCESSIBLE_GET_FAST,
+ MAKE_ACCESSIBLE_WRITEBACK
+};
#ifndef HAVE_ARCH_MAKE_PAGE_ACCESSIBLE
-static inline int arch_make_page_accessible(struct page *page)
+static inline int arch_make_page_accessible(struct page *page, int where)
{
return 0;
}
diff --git a/mm/gup.c b/mm/gup.c
index 354bcfbd844b..ce962c155724 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -274,7 +274,7 @@ static struct page *follow_page_pte(struct vm_area_struct *vma,
page = ERR_PTR(-ENOMEM);
goto out;
}
- ret = arch_make_page_accessible(page);
+ ret = arch_make_page_accessible(page, MAKE_ACCESSIBLE_GET);
if (ret) {
put_page(page);
page = ERR_PTR(ret);
@@ -1923,7 +1923,7 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
VM_BUG_ON_PAGE(compound_head(page) != head, page);
- ret = arch_make_page_accessible(page);
+ ret = arch_make_page_accessible(page, MAKE_ACCESSIBLE_GET_FAST);
if (ret) {
put_page(head);
goto pte_unmap;
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 558d7063c117..f85148e59800 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2811,7 +2811,7 @@ int __test_set_page_writeback(struct page *page, bool keep_write)
* If writeback has been triggered on a page that cannot be made
* accessible, it is too late.
*/
- WARN_ON(arch_make_page_accessible(page));
+ WARN_ON(arch_make_page_accessible(page, MAKE_ACCESSIBLE_WRITEBACK));
return ret;
}
--
2.25.0
