From: Rohan McLure <redacted>

To provide support for powerpc platforms, provide an addr parameter to
the __page_table_check_ptes_set() and page_table_check_ptes_set() routines.
This parameter is needed on some powerpc platforms which do not encode whether
a mapping is for user or kernel in the pte. On such platforms, this can be
inferred from the addr parameter.

[ajd@linux.ibm.com: rebase on arm64 + riscv changes, update commit message]
Signed-off-by: Rohan McLure <redacted>
Reviewed-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Signed-off-by: Andrew Donnellan <redacted>
---
v15: rebase, amend commit message
---
  arch/arm64/include/asm/pgtable.h |  2 +-
  arch/riscv/include/asm/pgtable.h |  2 +-
  include/linux/page_table_check.h | 12 +++++++-----
  include/linux/pgtable.h          |  2 +-
  mm/page_table_check.c            |  4 ++--
  5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index 9fe3af8b4cad..06ea6a4f300b 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h

@@ -706,7 +706,7 @@ static inline void __set_ptes_anysz(struct mm_struct *mm, unsigned long addr,
  
  	switch (pgsize) {
  	case PAGE_SIZE:
-		page_table_check_ptes_set(mm, ptep, pte, nr);
+		page_table_check_ptes_set(mm, addr, ptep, pte, nr);
  		break;
  	case PMD_SIZE:
  		page_table_check_pmds_set(mm, addr, (pmd_t *)ptep,

diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 6e8c3d19f96a..2484c0788012 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h

@@ -560,7 +560,7 @@ static inline void __set_pte_at(struct mm_struct *mm, pte_t *ptep, pte_t pteval)
  static inline void set_ptes(struct mm_struct *mm, unsigned long addr,
  		pte_t *ptep, pte_t pteval, unsigned int nr)
  {
-	page_table_check_ptes_set(mm, ptep, pteval, nr);
+	page_table_check_ptes_set(mm, addr, ptep, pteval, nr);
  
  	for (;;) {
  		__set_pte_at(mm, ptep, pteval);

diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h
index cf7c28d8d468..66e109238416 100644
--- a/include/linux/page_table_check.h
+++ b/include/linux/page_table_check.h

@@ -17,8 +17,8 @@ void __page_table_check_zero(struct page *page, unsigned int order);
  void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte);
  void __page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd);
  void __page_table_check_pud_clear(struct mm_struct *mm, pud_t pud);
-void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte,
-		unsigned int nr);
+void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr,
+		pte_t *ptep, pte_t pte, unsigned int nr);
  void __page_table_check_pmds_set(struct mm_struct *mm, unsigned long addr,
  		pmd_t *pmdp, pmd_t pmd, unsigned int nr);
  void __page_table_check_puds_set(struct mm_struct *mm, unsigned long addr,

@@ -68,12 +68,13 @@ static inline void page_table_check_pud_clear(struct mm_struct *mm, pud_t pud)
  }
  
  static inline void page_table_check_ptes_set(struct mm_struct *mm,
-		pte_t *ptep, pte_t pte, unsigned int nr)
+					     unsigned long addr, pte_t *ptep,
+					     pte_t pte, unsigned int nr)
  {
  	if (static_branch_likely(&page_table_check_disabled))
  		return;
  
-	__page_table_check_ptes_set(mm, ptep, pte, nr);
+	__page_table_check_ptes_set(mm, addr, ptep, pte, nr);
  }
  
  static inline void page_table_check_pmds_set(struct mm_struct *mm,

@@ -127,7 +128,8 @@ static inline void page_table_check_pud_clear(struct mm_struct *mm, pud_t pud)
  }
  
  static inline void page_table_check_ptes_set(struct mm_struct *mm,
-		pte_t *ptep, pte_t pte, unsigned int nr)
+					     unsigned long addr, pte_t *ptep,
+					     pte_t pte, unsigned int nr)
  {
  }
  

diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index 4c035637eeb7..8aab3fa19c85 100644
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h

@@ -289,7 +289,7 @@ static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr)
  static inline void set_ptes(struct mm_struct *mm, unsigned long addr,
  		pte_t *ptep, pte_t pte, unsigned int nr)
  {
-	page_table_check_ptes_set(mm, ptep, pte, nr);
+	page_table_check_ptes_set(mm, addr, ptep, pte, nr);
  
  	for (;;) {
  		set_pte(ptep, pte);

diff --git a/mm/page_table_check.c b/mm/page_table_check.c
index 09258f2ad93f..0957767a2940 100644
--- a/mm/page_table_check.c
+++ b/mm/page_table_check.c

@@ -193,8 +193,8 @@ static inline void page_table_check_pte_flags(pte_t pte)
  		WARN_ON_ONCE(swap_cached_writable(pte_to_swp_entry(pte)));
  }
  
-void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte,
-		unsigned int nr)
+void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr,
+				 pte_t *ptep, pte_t pte, unsigned int nr)
  {
  	unsigned int i;