Skip to contentSkip to conversation

ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses

PATCH Superseded R Sricharan 4 participants 6 messages Feb 8, 2013 – Feb 11, 2013 Arm (32-bit)

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses

With LPAE enabled, alloc_init_section() does not map the entire address space for unaligned addresses.

The issue also reproduced with CMA + LPAE. CMA tries to map 16MB with page granularity mappings during boot. alloc_init_pte() is called and out of 16MB, only 2MB gets mapped and rest remains unaccessible.

Because of this OMAP5 boot is broken with CMA + LPAE enabled. Fix the issue by ensuring that the entire addresses are mapped.

---
[V2] Moved the loop to alloc_init_pte as per Russell's
feedback and changed the subject accordingly. Using PMD_XXX instead of SECTION_XXX to avoid different loop increments with/without LPAE.

[v3] Removed the dummy variable phys and updated
the commit log for CMA case.

[v4] Resending with updated change log and
updating the tags.

[v5] Renamed alloc_init_section to alloc_init_pmd
and moved the loop back there. Also introduced map_init_section as per Catalin's comments.

 arch/arm/mm/mmu.c |   66 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 26 deletions(-)
arch/arm/mm/mmu.c +40 -26
index ce328c7..a89df2b 100644
@@ -576,39 +576,53 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
 	} while (pte++, addr += PAGE_SIZE, addr != end);
 }
 
-static void __init alloc_init_section(pud_t *pud, unsigned long addr,
+static void __init map_init_section(pmd_t *pmd, unsigned long addr,
+			unsigned long end, phys_addr_t phys,
+			const struct mem_type *type)
+{
+#ifndef CONFIG_ARM_LPAE
+	if (addr & SECTION_SIZE)
+		pmd++;
+#endif
+	do {
+		*pmd = __pmd(phys | type->prot_sect);
+		phys += SECTION_SIZE;
+	} while (pmd++, addr += SECTION_SIZE, addr != end);
+
+	flush_pmd_entry(pmd);
+}
+
+static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
 				      unsigned long end, phys_addr_t phys,
 				      const struct mem_type *type)
 {
 	pmd_t *pmd = pmd_offset(pud, addr);
+	unsigned long next;
 
-	/*
-	 * Try a section mapping - end, addr and phys must all be aligned
-	 * to a section boundary.  Note that PMDs refer to the individual
-	 * L1 entries, whereas PGDs refer to a group of L1 entries making
-	 * up one logical pointer to an L2 table.
-	 */
-	if (type->prot_sect && ((addr | end | phys) & ~SECTION_MASK) == 0) {
-		pmd_t *p = pmd;
-
-#ifndef CONFIG_ARM_LPAE
-		if (addr & SECTION_SIZE)
-			pmd++;
-#endif
-
-		do {
-			*pmd = __pmd(phys | type->prot_sect);
-			phys += SECTION_SIZE;
-		} while (pmd++, addr += SECTION_SIZE, addr != end);
+	do {
+		/*
+		 * With LPAE, we may be required to loop in, to map
+		 * all the pmds for the given range.
+		 */
+		next = pmd_addr_end(addr, end);
 
-		flush_pmd_entry(p);
-	} else {
 		/*
-		 * No need to loop; pte's aren't interested in the
-		 * individual L1 entries.
+		 * Try a section mapping - end, addr and phys must all be
+		 * aligned to a section boundary.  Note that PMDs refer to
+		 * the individual L1 entries, whereas PGDs refer to a group
+		 * of L1 entries making up one logical pointer to an L2 table.
 		 */
-		alloc_init_pte(pmd, addr, end, __phys_to_pfn(phys), type);
-	}
+		if (type->prot_sect &&
+				((addr | next | phys) & ~SECTION_MASK) == 0) {
+			map_init_section(pmd, addr, next, phys, type);
+		} else {
+			alloc_init_pte(pmd, addr, next,
+						__phys_to_pfn(phys), type);
+		}
+
+		phys += next - addr;
+
+	} while (pmd++, addr = next, addr != end);
 }
 
 static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
@@ -619,7 +633,7 @@ static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
 
 	do {
 		next = pud_addr_end(addr, end);
-		alloc_init_section(pud, addr, next, phys, type);
+		alloc_init_pmd(pud, addr, next, phys, type);
 		phys += next - addr;
 	} while (pud++, addr = next, addr != end);
 }
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v5 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses

Quoted 12 lines · R Sricharan

With LPAE enabled, alloc_init_section() does not map the entire address space for unaligned addresses.

The issue also reproduced with CMA + LPAE. CMA tries to map 16MB with page granularity mappings during boot. alloc_init_pte() is called and out of 16MB, only 2MB gets mapped and rest remains unaccessible.

Because of this OMAP5 boot is broken with CMA + LPAE enabled. Fix the issue by ensuring that the entire addresses are mapped.

Quoted 6 lines

I don't think that I've tested this version of the patch, but ok.

Quoted 26 lines

---
[V2] Moved the loop to alloc_init_pte as per Russell's
feedback and changed the subject accordingly. Using PMD_XXX instead of SECTION_XXX to avoid different loop increments with/without LPAE.

[v3] Removed the dummy variable phys and updated
the commit log for CMA case.

[v4] Resending with updated change log and
updating the tags.

[v5] Renamed alloc_init_section to alloc_init_pmd
and moved the loop back there. Also introduced map_init_section as per Catalin's comments.

 arch/arm/mm/mmu.c |   66 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 26 deletions(-)
arch/arm/mm/mmu.c +0 -0
index ce328c7..a89df2b 100644
@@ -576,39 +576,53 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
        } while (pte++, addr += PAGE_SIZE, addr != end);
 }

arch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 586

Quoted 10 lines
arch/arm/mm/mmu.c +8 -1
 
-static void __init alloc_init_section(pud_t *pud, unsigned long addr,
+static void __init map_init_section(pmd_t *pmd, unsigned long addr,
+                       unsigned long end, phys_addr_t phys,
+                       const struct mem_type *type)
+{
+#ifndef CONFIG_ARM_LPAE
+       if (addr & SECTION_SIZE)
+               pmd++;
+#endif

I still think this one deserves a comment.

Quoted 26 lines
arch/arm/mm/mmu.c +10 -11
+       do {
+               *pmd = __pmd(phys | type->prot_sect);
+               phys += SECTION_SIZE;
+       } while (pmd++, addr += SECTION_SIZE, addr != end);
+
+       flush_pmd_entry(pmd);
+}
+
+static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
                                      unsigned long end, phys_addr_t phys,
                                      const struct mem_type *type)
 {
        pmd_t *pmd = pmd_offset(pud, addr);
+       unsigned long next;
 
-       /*
-        * Try a section mapping - end, addr and phys must all be aligned
-        * to a section boundary.  Note that PMDs refer to the individual
-        * L1 entries, whereas PGDs refer to a group of L1 entries making
-        * up one logical pointer to an L2 table.
-        */
-       if (type->prot_sect && ((addr | end | phys) & ~SECTION_MASK) == 0) {
-               pmd_t *p = pmd;
-
-#ifndef CONFIG_ARM_LPAE
-               if (addr & SECTION_SIZE)

arch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 604

Quoted 10 lines
arch/arm/mm/mmu.c +3 -7
-                       pmd++;
-#endif
-
-               do {
-                       *pmd = __pmd(phys | type->prot_sect);
-                       phys += SECTION_SIZE;
-               } while (pmd++, addr += SECTION_SIZE, addr != end);
+       do {
+               /*
+                * With LPAE, we may be required to loop in, to map

nit: "loop in" should just be loop. Also, I would not say that we may be required to loop in the LPAE case, but that for LPAE we must loop over all the PMDs for the given range.

arch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 613

Quoted 13 lines
arch/arm/mm/mmu.c +7 -4
+                * all the pmds for the given range.
+                */
+               next = pmd_addr_end(addr, end);
 
-               flush_pmd_entry(p);
-       } else {
                /*
-                * No need to loop; pte's aren't interested in the
-                * individual L1 entries.
+                * Try a section mapping - end, addr and phys must all be
+                * aligned to a section boundary.  Note that PMDs refer to
+                * the individual L1 entries, whereas PGDs refer to a group
+                * of L1 entries making up one logical pointer to an L2 table.

This is not true for LPAE, so now when we're changing the comment, we should be more specific.

Quoted 27 lines
arch/arm/mm/mmu.c +12 -4
                 */
-               alloc_init_pte(pmd, addr, end, __phys_to_pfn(phys), type);
-       }
+               if (type->prot_sect &&
+                               ((addr | next | phys) & ~SECTION_MASK) == 0) {
+                       map_init_section(pmd, addr, next, phys, type);
+               } else {
+                       alloc_init_pte(pmd, addr, next,
+                                               __phys_to_pfn(phys), type);
+               }
+
+               phys += next - addr;
+
+       } while (pmd++, addr = next, addr != end);
 }
 
 static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
@@ -619,7 +633,7 @@ static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
 
        do {
                next = pud_addr_end(addr, end);
-               alloc_init_section(pud, addr, next, phys, type);
+               alloc_init_pmd(pud, addr, next, phys, type);
                phys += next - addr;
        } while (pud++, addr = next, addr != end);
 }
--
#2 lore raw

PATCH v5 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses

Quoted 13 lines · Christoffer Dall
Quoted 12 lines · R Sricharan

With LPAE enabled, alloc_init_section() does not map the entire address space for unaligned addresses.

The issue also reproduced with CMA + LPAE. CMA tries to map 16MB with page granularity mappings during boot. alloc_init_pte() is called and out of 16MB, only 2MB gets mapped and rest remains unaccessible.

Because of this OMAP5 boot is broken with CMA + LPAE enabled. Fix the issue by ensuring that the entire addresses are mapped.

Quoted 9 lines
Quoted 6 lines

I don't think that I've tested this version of the patch, but ok.

Indeed. Neither I have acke'd the updated version ;) Tags from old patch doesn't apply anymore when patch is completely revamped.

Regards,
Santosh

#3 lore raw

PATCH v5 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses

Quoted 21 lines · Santosh Shilimkar
Quoted 20 lines · Christoffer Dall
Quoted 18 lines · R Sricharan

With LPAE enabled, alloc_init_section() does not map the entire address space for unaligned addresses.

The issue also reproduced with CMA + LPAE. CMA tries to map 16MB with page granularity mappings during boot. alloc_init_pte() is called and out of 16MB, only 2MB gets mapped and rest remains unaccessible.

Because of this OMAP5 boot is broken with CMA + LPAE enabled. Fix the issue by ensuring that the entire addresses are mapped.

Quoted 6 lines
Quoted 2 lines

I don't think that I've tested this version of the patch, but ok.

Indeed. Neither I have acke'd the updated version ;) Tags from old patch doesn't apply anymore when patch is completely revamped.

Ok, corrected this in the updated version.

Regards,
Sricharan

#4 lore raw

PATCH v5 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses

In reply to Christoffer Dall
Quoted 49 lines · Christoffer Dall
Quoted 12 lines · R Sricharan

With LPAE enabled, alloc_init_section() does not map the entire address space for unaligned addresses.

The issue also reproduced with CMA + LPAE. CMA tries to map 16MB with page granularity mappings during boot. alloc_init_pte() is called and out of 16MB, only 2MB gets mapped and rest remains unaccessible.

Because of this OMAP5 boot is broken with CMA + LPAE enabled. Fix the issue by ensuring that the entire addresses are mapped.

Quoted 6 lines

I don't think that I've tested this version of the patch, but ok.

Quoted 27 lines

---
[V2] Moved the loop to alloc_init_pte as per Russell's
feedback and changed the subject accordingly. Using PMD_XXX instead of SECTION_XXX to avoid different loop increments with/without LPAE.

[v3] Removed the dummy variable phys and updated
the commit log for CMA case.

[v4] Resending with updated change log and
updating the tags.

[v5] Renamed alloc_init_section to alloc_init_pmd
and moved the loop back there. Also introduced map_init_section as per Catalin's comments.

  arch/arm/mm/mmu.c |   66 ++++++++++++++++++++++++++++++++---------------------
  1 file changed, 40 insertions(+), 26 deletions(-)
arch/arm/mm/mmu.c +0 -0
index ce328c7..a89df2b 100644
@@ -576,39 +576,53 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
         } while (pte++, addr += PAGE_SIZE, addr != end);
  }
 
Quoted 11 lines

arch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 586

Quoted 9 lines
arch/arm/mm/mmu.c +8 -1
-static void __init alloc_init_section(pud_t *pud, unsigned long addr,
+static void __init map_init_section(pmd_t *pmd, unsigned long addr,
+                       unsigned long end, phys_addr_t phys,
+                       const struct mem_type *type)
+{
+#ifndef CONFIG_ARM_LPAE
+       if (addr & SECTION_SIZE)
+               pmd++;
+#endif

I still think this one deserves a comment.

Ok, added it in updated version. In fact i was getting little verbose in describing this, but not sure if there is much simpler way.

Quoted 33 lines
Quoted 33 lines
arch/arm/mm/mmu.c +10 -17
+       do {
+               *pmd = __pmd(phys | type->prot_sect);
+               phys += SECTION_SIZE;
+       } while (pmd++, addr += SECTION_SIZE, addr != end);
+
+       flush_pmd_entry(pmd);
+}
+
+static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
                                       unsigned long end, phys_addr_t phys,
                                       const struct mem_type *type)
  {
         pmd_t *pmd = pmd_offset(pud, addr);
+       unsigned long next;
 
-       /*
-        * Try a section mapping - end, addr and phys must all be aligned
-        * to a section boundary.  Note that PMDs refer to the individual
-        * L1 entries, whereas PGDs refer to a group of L1 entries making
-        * up one logical pointer to an L2 table.
-        */
-       if (type->prot_sect && ((addr | end | phys) & ~SECTION_MASK) == 0) {
-               pmd_t *p = pmd;
-
-#ifndef CONFIG_ARM_LPAE
-               if (addr & SECTION_SIZE)
-                       pmd++;
-#endif
-
-               do {
-                       *pmd = __pmd(phys | type->prot_sect);
-                       phys += SECTION_SIZE;
Quoted 8 lines

arch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 604

Quoted 4 lines
arch/arm/mm/mmu.c +3 -1
-               } while (pmd++, addr += SECTION_SIZE, addr != end);
+       do {
+               /*
+                * With LPAE, we may be required to loop in, to map

nit: "loop in" should just be loop. Also, I would not say that we may be required to loop in the LPAE case, but that for LPAE we must loop over all the PMDs for the given range.

ok. correct.

Quoted 15 lines
Quoted 4 lines
arch/arm/mm/mmu.c +3 -0
+                * all the pmds for the given range.
+                */
+               next = pmd_addr_end(addr, end);

arch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 613

Quoted 10 lines
arch/arm/mm/mmu.c +4 -4
 
-               flush_pmd_entry(p);
-       } else {
                 /*
-                * No need to loop; pte's aren't interested in the
-                * individual L1 entries.
+                * Try a section mapping - end, addr and phys must all be
+                * aligned to a section boundary.  Note that PMDs refer to
+                * the individual L1 entries, whereas PGDs refer to a group
+                * of L1 entries making up one logical pointer to an L2 table.
Quoted 2 lines

This is not true for LPAE, so now when we're changing the comment, we should be more specific.

yes, probably the second line of the comment is not common. i am using it to describe this block now.

#ifndef CONFIG_ARM_LPAE
if (addr & SECTION_SIZE)
pmd++;
#endif

Regards,
Sricharan

#5 lore raw

PATCH v5 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses

In reply to R Sricharan
Quoted 12 lines · R Sricharan

With LPAE enabled, alloc_init_section() does not map the entire address space for unaligned addresses.

The issue also reproduced with CMA + LPAE. CMA tries to map 16MB with page granularity mappings during boot. alloc_init_pte() is called and out of 16MB, only 2MB gets mapped and rest remains unaccessible.

Because of this OMAP5 boot is broken with CMA + LPAE enabled. Fix the issue by ensuring that the entire addresses are mapped.

Quoted 6 lines

The code looks fine but you need to fix the comments as per Christoffer's suggestion. Otherwise: