Patch "ioremap: Update pgtable free interfaces with addr" has been added to the 4.14-stable tree
Subsystems (6)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
ioremap: Update pgtable free interfaces with addr
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ioremap-update-pgtable-free-interfaces-with-addr.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
785a19f9d1dd8a4ab2d0633be4656653bd3de1fcMon Sep 17 00:00:00 2001
From: Chintan Pandya <[email protected]>
Date: Wed, 27 Jun 2018 08:13:47 -0600
Subject: ioremap: Update pgtable free interfaces with addr
From: Chintan Pandya <[email protected]>
commit 785a19f9d1dd8a4ab2d0633be4656653bd3de1fc upstream.
The following kernel panic was observed on ARM64 platform due to a stale TLB entry.
1. ioremap with 4K size, a valid pte page table is set.
2. iounmap it, its pte entry is set to 0.
3. ioremap the same address with 2M size, update its pmd entry with a new value.
4. CPU may hit an exception because the old pmd entry is still in TLB, which leads to a kernel panic.
Commit b6bdb7517c3d ("mm/vmalloc: add interfaces to free unmapped page table") has addressed this panic by falling to pte mappings in the above case on ARM64.
To support pmd mappings in all cases, TLB purge needs to be performed in this case on ARM64.
Add a new arg, 'addr', to pud_free_pmd_page() and pmd_free_pte_page() so that TLB purge can be added later in seprate patches.
--- arch/arm64/mm/mmu.c | 4 ++-- arch/x86/mm/pgtable.c | 12 +++++++----- include/asm-generic/pgtable.h | 8 ++++---- lib/ioremap.c | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-)
arch/arm64/mm/mmu.c +2 -2
@@ -938,12 +938,12 @@ int pmd_clear_huge(pmd_t *pmd)return 1 ; } -int pud_free_pmd_page (pud_t *pud) +int pud_free_pmd_page (pud_t *pud,unsigned long addr) {return pud_none (*pud); } -int pmd_free_pte_page (pmd_t *pmd) +int pmd_free_pte_page (pmd_t *pmd,unsigned long addr) {return pmd_none (*pmd); }
arch/x86/mm/pgtable.c +7 -5
@@ -716,11 +716,12 @@ int pmd_clear_huge(pmd_t *pmd)/** * pud_free_pmd_page - Clear pud entry and free pmd page. * @pud: Pointer to a PUD. +* @addr: Virtual address associated with pud. * * Context: The pud range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pud_free_pmd_page (pud_t *pud) +int pud_free_pmd_page (pud_t *pud,unsigned long addr) {pmd_t *pmd;int i;
@@ -731,7 +732,7 @@ int pud_free_pmd_page(pud_t *pud) pmd = (pmd_t *)pud_page_vaddr (*pud);for (i =0 ; i <PTRS_PER_PMD ; i++) -if (!pmd_free_pte_page (&pmd[i])) +if (!pmd_free_pte_page (&pmd[i], addr + (i *PMD_SIZE )))return 0 ;pud_clear (pud);
@@ -743,11 +744,12 @@ int pud_free_pmd_page(pud_t *pud)/** * pmd_free_pte_page - Clear pmd entry and free pte page. * @pmd: Pointer to a PMD. +* @addr: Virtual address associated with pmd. * * Context: The pmd range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pmd_free_pte_page (pmd_t *pmd) +int pmd_free_pte_page (pmd_t *pmd,unsigned long addr) {pte_t *pte;
@@ -763,7 +765,7 @@ int pmd_free_pte_page(pmd_t *pmd)#else /* !CONFIG_X86_64 */ -int pud_free_pmd_page (pud_t *pud) +int pud_free_pmd_page (pud_t *pud,unsigned long addr) {return pud_none (*pud); }
@@ -772,7 +774,7 @@ int pud_free_pmd_page(pud_t *pud)* Disable free page handling on x86-PAE. This assures that ioremap() * does not update sync'd pmd entries. See vmalloc_sync_one(). */ -int pmd_free_pte_page (pmd_t *pmd) +int pmd_free_pte_page (pmd_t *pmd,unsigned long addr) {return pmd_none (*pmd); }
include/asm-generic/pgtable.h +4 -4
@@ -991,8 +991,8 @@ int pud_set_huge(pud_t *pud, phys_addr_tint pmd_set_huge (pmd_t *pmd,phys_addr_t addr,pgprot_t prot);int pud_clear_huge (pud_t *pud);int pmd_clear_huge (pmd_t *pmd); -int pud_free_pmd_page (pud_t *pud); -int pmd_free_pte_page (pmd_t *pmd); +int pud_free_pmd_page (pud_t *pud,unsigned long addr); +int pmd_free_pte_page (pmd_t *pmd,unsigned long addr);#else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ static inline int p4d_set_huge (p4d_t *p4d,phys_addr_t addr,pgprot_t prot) {
@@ -1018,11 +1018,11 @@ static inline int pmd_clear_huge(pmd_t * {return 0 ; } -static inline int pud_free_pmd_page (pud_t *pud) +static inline int pud_free_pmd_page (pud_t *pud,unsigned long addr) {return 0 ; } -static inline int pmd_free_pte_page (pmd_t *pmd) +static inline int pmd_free_pte_page (pmd_t *pmd,unsigned long addr) {return 0 ; }
lib/ioremap.c +2 -2
@@ -92,7 +92,7 @@ static inline int ioremap_pmd_range(pud_if (ioremap_pmd_enabled () && ((next - addr) ==PMD_SIZE ) &&IS_ALIGNED (phys_addr + addr,PMD_SIZE ) && -pmd_free_pte_page (pmd)) { +pmd_free_pte_page (pmd, addr)) {if (pmd_set_huge (pmd, phys_addr + addr, prot))continue ; }
@@ -119,7 +119,7 @@ static inline int ioremap_pud_range(p4d_if (ioremap_pud_enabled () && ((next - addr) ==PUD_SIZE ) &&IS_ALIGNED (phys_addr + addr,PUD_SIZE ) && -pud_free_pmd_page (pud)) { +pud_free_pmd_page (pud, addr)) {if (pud_set_huge (pud, phys_addr + addr, prot))continue ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/x86-mm-disable-ioremap-free-page-handling-on-x86-pae.patch queue-4.14/ioremap-update-pgtable-free-interfaces-with-addr.patch queue-4.14/x86-mm-add-tlb-purge-to-free-pmd-pte-page-interfaces.patch