Re: [RFC PATCH v2 2/3] mm: make pXd_addr_end() functions page-table entry aware

[Alexander Gordeev]

On Tue, Sep 08, 2020 at 07:14:38AM +0200, Christophe Leroy wrote:
[...]
> You forgot arch/powerpc/mm/book3s64/subpage_prot.c it seems.

If this one would be okay?

diff --git a/arch/powerpc/mm/book3s64/subpage_prot.c 
b/arch/powerpc/mm/book3s64/subpage_prot.c
index 60c6ea16..3690d22 100644
--- a/arch/powerpc/mm/book3s64/subpage_prot.c
+++ b/arch/powerpc/mm/book3s64/subpage_prot.c
@@ -88,6 +88,7 @@ static void hpte_flush_range(struct mm_struct *mm, unsigned 
long addr,
 static void subpage_prot_clear(unsigned long addr, unsigned long len)
 {
        struct mm_struct *mm = current->mm;
+       pmd_t *pmd = pmd_off(mm, addr);
        struct subpage_prot_table *spt;
        u32 **spm, *spp;
        unsigned long i;
@@ -103,8 +104,8 @@ static void subpage_prot_clear(unsigned long addr, unsigned 
long len)
        limit = addr + len;
        if (limit > spt->maxaddr)
                limit = spt->maxaddr;
-       for (; addr < limit; addr = next) {
-               next = pmd_addr_end(addr, limit);
+       for (; addr < limit; addr = next, pmd++) {
+               next = pmd_addr_end(*pmd, addr, limit);
                if (addr < 0x100000000UL) {
                        spm = spt->low_prot;
                } else {
@@ -191,6 +192,7 @@ static void subpage_mark_vma_nohuge(struct mm_struct *mm, 
unsigned long addr,
                unsigned long, len, u32 __user *, map)
 {
        struct mm_struct *mm = current->mm;
+       pmd_t *pmd = pmd_off(mm, addr);
        struct subpage_prot_table *spt;
        u32 **spm, *spp;
        unsigned long i;
@@ -236,8 +238,8 @@ static void subpage_mark_vma_nohuge(struct mm_struct *mm, 
unsigned long addr,
        }
 
        subpage_mark_vma_nohuge(mm, addr, len);
-       for (limit = addr + len; addr < limit; addr = next) {
-               next = pmd_addr_end(addr, limit);
+       for (limit = addr + len; addr < limit; addr = next, pmd++) {
+               next = pmd_addr_end(*pmd, addr, limit);
                err = -ENOMEM;
                if (addr < 0x100000000UL) {
                        spm = spt->low_prot;

Thanks!

> Christophe