Skip to content

Commit c6657b5

Browse files
toshikaniZhengShunQian
authored andcommitted
x86/mm: Disable ioremap free page handling on x86-PAE
commit f967db0 upstream. ioremap() supports pmd mappings on x86-PAE. However, kernel's pmd tables are not shared among processes on x86-PAE. Therefore, any update to sync'd pmd entries need re-syncing. Freeing a pte page also leads to a vmalloc fault and hits the BUG_ON in vmalloc_sync_one(). Disable free page handling on x86-PAE. pud_free_pmd_page() and pmd_free_pte_page() simply return 0 if a given pud/pmd entry is present. This assures that ioremap() does not update sync'd pmd entries at the cost of falling back to pte mappings. Fixes: 28ee90f ("x86/mm: implement free pmd/pte page interfaces") Reported-by: Joerg Roedel <joro@8bytes.org> Signed-off-by: Toshi Kani <toshi.kani@hpe.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: mhocko@suse.com Cc: akpm@linux-foundation.org Cc: hpa@zytor.com Cc: cpandya@codeaurora.org Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org Cc: stable@vger.kernel.org Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <stable@vger.kernel.org> Link: https://lkml.kernel.org/r/20180627141348.21777-2-toshi.kani@hpe.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent dd1447f commit c6657b5

1 file changed

Lines changed: 19 additions & 0 deletions

File tree

arch/x86/mm/pgtable.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,7 @@ int pmd_clear_huge(pmd_t *pmd)
676676
return 0;
677677
}
678678

679+
#ifdef CONFIG_X86_64
679680
/**
680681
* pud_free_pmd_page - Clear pud entry and free pmd page.
681682
* @pud: Pointer to a PUD.
@@ -723,4 +724,22 @@ int pmd_free_pte_page(pmd_t *pmd)
723724

724725
return 1;
725726
}
727+
728+
#else /* !CONFIG_X86_64 */
729+
730+
int pud_free_pmd_page(pud_t *pud)
731+
{
732+
return pud_none(*pud);
733+
}
734+
735+
/*
736+
* Disable free page handling on x86-PAE. This assures that ioremap()
737+
* does not update sync'd pmd entries. See vmalloc_sync_one().
738+
*/
739+
int pmd_free_pte_page(pmd_t *pmd)
740+
{
741+
return pmd_none(*pmd);
742+
}
743+
744+
#endif /* CONFIG_X86_64 */
726745
#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */

0 commit comments

Comments
 (0)