Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9820d8f authored by Toshi Kani's avatar Toshi Kani Committed by Linus Torvalds
Browse files

mm: change vunmap to tear down huge KVA mappings 



Change vunmap_pmd_range() and vunmap_pud_range() to tear down huge KVA
mappings when they are set.  pud_clear_huge() and pmd_clear_huge() return
zero when no-operation is performed, i.e.  huge page mapping was not used.

These changes are only enabled when CONFIG_HAVE_ARCH_HUGE_VMAP is defined
on the architecture.

[akpm@linux-foundation.org: use consistent code layout]
Signed-off-by: default avatarToshi Kani <toshi.kani@hp.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Robert Elliott <Elliott@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e61ce6ad

include/asm-generic/pgtable.h

+10 −0
Original line number Diff line number Diff line
@@ -700,6 +700,8 @@ static inline int pmd_protnone(pmd_t pmd) 
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP

int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot);

int 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);

#else	/* !CONFIG_HAVE_ARCH_HUGE_VMAP */

static inline int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot)

{
@@ -709,6 +711,14 @@ static inline int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot) 
{

	return 0;

}

static inline int pud_clear_huge(pud_t *pud)

{

	return 0;

}

static inline int pmd_clear_huge(pmd_t *pmd)

{

	return 0;

}

#endif	/* CONFIG_HAVE_ARCH_HUGE_VMAP */



#endif /* !__ASSEMBLY__ */

mm/vmalloc.c

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ static void vunmap_pmd_range(pud_t *pud, unsigned long addr, unsigned long end) 
	pmd = pmd_offset(pud, addr);

	do {

		next = pmd_addr_end(addr, end);

		if (pmd_clear_huge(pmd))

			continue;

		if (pmd_none_or_clear_bad(pmd))

			continue;

		vunmap_pte_range(pmd, addr, next);
@@ -89,6 +91,8 @@ static void vunmap_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end) 
	pud = pud_offset(pgd, addr);

	do {

		next = pud_addr_end(addr, end);

		if (pud_clear_huge(pud))

			continue;

		if (pud_none_or_clear_bad(pud))

			continue;

		vunmap_pmd_range(pud, addr, next);