ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
PATCH v6 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.
[v6] Corrected tags and updated the comments for code.
arch/arm/mm/mmu.c | 73 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 26 deletions(-)
arch/arm/mm/mmu.c +47 -26
@@ -576,39 +576,60 @@ 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, -unsigned long end,phys_addr_t phys, -const struct mem_type *type) +static void __init map_init_section (pmd_t *pmd,unsigned long addr, +unsigned long end,phys_addr_t phys, +const struct mem_type *type) { -pmd_t *pmd =pmd_offset (pud, addr); - +#ifndef CONFIG_ARM_LPAE /* -* 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. +* In classic MMU format, puds and pmds are folded in to +* the pgds. pmd_offset gives the PGD entry. PGDs refer to a +* group of L1 entries making up one logical pointer to +* an L2 table (2MB), where as PMDs refer to the individual +* L1 entries (1MB). Hence increment to get the correct +* offset for odd 1MB sections. +* (See arch/arm/include/asm/pgtable-2level.h) */ -if (type->prot_sect && ((addr | end | phys) & ~SECTION_MASK ) ==0 ) { -pmd_t *p = pmd; - -#ifndef CONFIG_ARM_LPAE -if (addr &SECTION_SIZE ) - pmd++; +if (addr &SECTION_SIZE ) + pmd++;#endif +do { + *pmd =__pmd (phys | type->prot_sect); + phys +=SECTION_SIZE ; + }while (pmd++, addr +=SECTION_SIZE , addr != end); -do { - *pmd =__pmd (phys | type->prot_sect); - phys +=SECTION_SIZE ; - }while (pmd++, addr +=SECTION_SIZE , addr != end); +flush_pmd_entry (pmd); +} -flush_pmd_entry (p); - }else { +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; + +do {/* -* No need to loop; pte's aren't interested in the -* individual L1 entries. +* With LPAE, we must loop over to map +* all the pmds for the given range. */ -alloc_init_pte (pmd, addr, end,__phys_to_pfn (phys), type); - } + next =pmd_addr_end (addr, end); + +/* +* Try a section mapping - end, addr and phys must all be +* aligned to a section boundary. +*/ +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 +640,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
PATCH v6 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
Quoted 12 lines · R Sricharan
arch/arm/mm/mmu.c +9
-2+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; + + do { /* -* No need to loop; pte's aren't interested in the -* individual L1 entries. + * With LPAE, we must loop over to map
arch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 621
Quoted 10 lines
arch/arm/mm/mmu.c +7
-2+* all the pmds for the given range. */ -alloc_init_pte (pmd, addr, end,__phys_to_pfn (phys), type); - } + next =pmd_addr_end (addr, end); + +/* +* Try a section mapping - end, addr and phys must all be +* aligned to a section boundary. +*/
Should this read "next, addr and phys" instead of "end..."?
Otherwise:
PATCH v6 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
Quoted 17 lines · Catalin Marinas
Quoted 16 lines · R Sricharan
arch/arm/mm/mmu.c +10
-4+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; + + do { /* -* No need to loop; pte's aren't interested in the -* individual L1 entries. + * With LPAE, we must loop over to map + * all the pmds for the given range. */ -alloc_init_pte (pmd, addr, end,__phys_to_pfn (phys), type); - }
Quoted 9 lines
arch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 621
Quoted 6 lines
arch/arm/mm/mmu.c +6
-0+ next =pmd_addr_end (addr, end); + +/* +* Try a section mapping - end, addr and phys must all be +* aligned to a section boundary. +*/ Should this read "next, addr and phys" instead of "end..."?
hmm, correct. will change it now
Quoted 4 lines
Otherwise:
Reviewed-by Catalin Marinas <[email protected]>
Regards,
Sricharan
PATCH v6 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
In reply to Catalin MarinasHi Russell,
Quoted 26 lines · Catalin Marinas
Quoted 12 lines · R Sricharan
arch/arm/mm/mmu.c +9
-2+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; + + do { /* -* No need to loop; pte's aren't interested in the -* individual L1 entries. + * With LPAE, we must loop over to maparch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 621
Quoted 10 lines
arch/arm/mm/mmu.c +7
-2+* all the pmds for the given range. */ -alloc_init_pte (pmd, addr, end,__phys_to_pfn (phys), type); - } + next =pmd_addr_end (addr, end); + +/* +* Try a section mapping - end, addr and phys must all be +* aligned to a section boundary. +*/ Should this read "next, addr and phys" instead of "end..."?
Quoted 4 lines
Otherwise:
Reviewed-by Catalin Marinas <[email protected]>
Can I put this in to patch system ?
Regards,
Sricharan
PATCH v6 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
Hi,
Quoted 29 lines · R Sricharan
Hi Russell,
Quoted 26 lines · Catalin Marinas
Quoted 12 lines · R Sricharan
arch/arm/mm/mmu.c +9
-2+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; + + do { /* -* No need to loop; pte's aren't interested in the -* individual L1 entries. + * With LPAE, we must loop over to maparch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 621
Quoted 10 lines
arch/arm/mm/mmu.c +7
-2+* all the pmds for the given range. */ -alloc_init_pte (pmd, addr, end,__phys_to_pfn (phys), type); - } + next =pmd_addr_end (addr, end); + +/* +* Try a section mapping - end, addr and phys must all be +* aligned to a section boundary. +*/ Should this read "next, addr and phys" instead of "end..."?
Quoted 5 lines
Quoted 4 lines
Otherwise:
Reviewed-by Catalin Marinas <[email protected]>Can I put this in to patch system ?
Ping..
Regards,
Sricharan
PATCH v6 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
Quoted 33 lines · R Sricharan
Hi,
Quoted 31 lines · R Sricharan
Hi Russell,
Quoted 28 lines · Catalin Marinas
Quoted 12 lines · R Sricharan
arch/arm/mm/mmu.c +9
-2+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; + + do { /* -* No need to loop; pte's aren't interested in the -* individual L1 entries. + * With LPAE, we must loop over to maparch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 621
Quoted 10 lines
arch/arm/mm/mmu.c +7
-2+* all the pmds for the given range. */ -alloc_init_pte (pmd, addr, end,__phys_to_pfn (phys), type); - } + next =pmd_addr_end (addr, end); + +/* +* Try a section mapping - end, addr and phys must all be +* aligned to a section boundary. +*/ Should this read "next, addr and phys" instead of "end..."?
Otherwise:
Quoted 8 lines
Quoted 3 lines
Quoted 2 lines
Reviewed-by Catalin Marinas <[email protected]>Can I put this in to patch system ?
Ping..Regards,
Sricharan
Ping again..
Regards,
Sricharan
PATCH v6 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
Quoted 36 lines · Sricharan R
Quoted 35 lines · R Sricharan
Hi,
Quoted 33 lines · R Sricharan
Hi Russell,
Quoted 30 lines · Catalin Marinas
Quoted 12 lines · R Sricharan
arch/arm/mm/mmu.c +9
-2+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; + + do { /* -* No need to loop; pte's aren't interested in the -* individual L1 entries. + * With LPAE, we must loop over to maparch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 621
Quoted 10 lines
arch/arm/mm/mmu.c +7
-2+* all the pmds for the given range. */ -alloc_init_pte (pmd, addr, end,__phys_to_pfn (phys), type); - } + next =pmd_addr_end (addr, end); + +/* +* Try a section mapping - end, addr and phys must all be +* aligned to a section boundary. +*/ Should this read "next, addr and phys" instead of "end..."?
Otherwise:
Reviewed-by Catalin Marinas <[email protected]>
Quoted 7 lines
Quoted 6 lines
Quoted 1 line
Can I put this in to patch system ?
Ping..Regards,
SricharanPing again..
Do we have a winner out of all the patches which have been posted yet?
PATCH v6 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
Quoted 39 lines · Russell King - ARM Linux
Quoted 38 lines · Sricharan R
Quoted 37 lines · R Sricharan
Hi,
Quoted 34 lines · R Sricharan
Hi Russell,
Quoted 26 lines · Catalin Marinas
Quoted 12 lines · R Sricharan
arch/arm/mm/mmu.c +9
-2+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; + + do { /* -* No need to loop; pte's aren't interested in the -* individual L1 entries. + * With LPAE, we must loop over to maparch/arm/mm/mmu.c static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, · line 621
Quoted 10 lines
arch/arm/mm/mmu.c +7
-2+* all the pmds for the given range. */ -alloc_init_pte (pmd, addr, end,__phys_to_pfn (phys), type); - } + next =pmd_addr_end (addr, end); + +/* +* Try a section mapping - end, addr and phys must all be +* aligned to a section boundary. +*/ Should this read "next, addr and phys" instead of "end..."?
Quoted 4 lines
Otherwise:
Reviewed-by Catalin Marinas <[email protected]>Can I put this in to patch system ?
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines
Ping..Regards,
SricharanPing again..
Do we have a winner out of all the patches which have been posted yet?
I was fine with the latest version if my comments were addressed, but I don't remember seeing this version posted.
Sricharan, can you please post a new complete patch that we can ack, and please remember cc'ing me directly so I don't miss it.
-Christoffer
PATCH v6 1/1 ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
Hi Christoffer,
Quoted 47 lines · Christoffer Dall
Quoted 45 lines · Russell King - ARM Linux
Quoted 43 lines · Sricharan R
Quoted 33 lines · R Sricharan
Hi,
Quoted 31 lines · R Sricharan
Hi Russell,
Quoted 28 lines · Catalin Marinas
Quoted 12 lines · R Sricharan
(quoted diff) +9
-2+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; + + do { /* - * No need to loop; pte's aren't interested in the - * individual L1 entries. + * With LPAE, we must loop over to mapReview
Quoted 10 lines
(quoted diff) +7
-2+ * all the pmds for the given range. */ - alloc_init_pte(pmd, addr, end, __phys_to_pfn(phys), type); - } + next = pmd_addr_end(addr, end); + + /* + * Try a section mapping - end, addr and phys must all be + * aligned to a section boundary.posted + */Should this read "next, addr and phys" instead of "end..."?
Otherwise:
Quoted 8 lines
Quoted 3 lines
Quoted 2 lines
Reviewed-by Catalin Marinas <[email protected]>Can I put this in to patch system ?
Ping..Regards,
SricharanPing again..
Quoted 7 lines
Quoted 1 line
Do we have a winner out of all the patches which have been posted yet?
I was fine with the latest version if my comments were addressed, but I don't remember seeing this version posted.
Sricharan, can you please post a new complete patch that we can ack, and please remember cc'ing me directly so I don't miss it.
I posted a version after addressing your comments and Catalin acked that as well. I will repost again now.
Regards,
Sricharan