Re: [PATCH v6 05/18] x86/mm: Convert pte_next_pfn() to pte_advance_pfn()

[David Hildenbrand]

On 15.02.24 11:31, Ryan Roberts wrote:

Core-mm needs to be able to advance the pfn by an arbitrary amount, so
override the new pte_advance_pfn() API to do so.

Signed-off-by: Ryan Roberts 
---
  arch/x86/include/asm/pgtable.h | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index b50b2ef63672..69ed0ea0641b 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -955,13 +955,13 @@ static inline int pte_same(pte_t a, pte_t b)
return a.pte == b.pte;
  }
  
-static inline pte_t pte_next_pfn(pte_t pte)

+static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr)
  {
if (__pte_needs_invert(pte_val(pte)))
-   return __pte(pte_val(pte) - (1UL << PFN_PTE_SHIFT));
-   return __pte(pte_val(pte) + (1UL << PFN_PTE_SHIFT));
+   return __pte(pte_val(pte) - (nr << PFN_PTE_SHIFT));
+   return __pte(pte_val(pte) + (nr << PFN_PTE_SHIFT));
  }
-#define pte_next_pfn   pte_next_pfn
+#define pte_advance_pfnpte_advance_pfn
  
  static inline int pte_present(pte_t a)

  {


Reviewed-by: David Hildenbrand 

--
Cheers,

David / dhildenb

[PATCH v6 05/18] x86/mm: Convert pte_next_pfn() to pte_advance_pfn()

[Ryan Roberts]

Core-mm needs to be able to advance the pfn by an arbitrary amount, so
override the new pte_advance_pfn() API to do so.

Signed-off-by: Ryan Roberts 
---
 arch/x86/include/asm/pgtable.h | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index b50b2ef63672..69ed0ea0641b 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -955,13 +955,13 @@ static inline int pte_same(pte_t a, pte_t b)
return a.pte == b.pte;
 }
 
-static inline pte_t pte_next_pfn(pte_t pte)
+static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr)
 {
if (__pte_needs_invert(pte_val(pte)))
-   return __pte(pte_val(pte) - (1UL << PFN_PTE_SHIFT));
-   return __pte(pte_val(pte) + (1UL << PFN_PTE_SHIFT));
+   return __pte(pte_val(pte) - (nr << PFN_PTE_SHIFT));
+   return __pte(pte_val(pte) + (nr << PFN_PTE_SHIFT));
 }
-#define pte_next_pfn   pte_next_pfn
+#define pte_advance_pfnpte_advance_pfn
 
 static inline int pte_present(pte_t a)
 {
-- 
2.25.1