From: Toshi Kani <toshi.kani@hp.com> To: akpm@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, arnd@arndb.de, linux-mm@kvack.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Toshi Kani <toshi.kani@hp.com> Subject: [RFC PATCH 4/7] mm: Change vunmap to tear down huge KVA mappings Date: Mon, 26 Jan 2015 16:13:26 -0700 [thread overview] Message-ID: <1422314009-31667-5-git-send-email-toshi.kani@hp.com> (raw) In-Reply-To: <1422314009-31667-1-git-send-email-toshi.kani@hp.com> Change vunmap_pmd_range() and vunmap_pud_range() to tear down huge KVA mappings when they are set. These changes are only enabled when CONFIG_HAVE_ARCH_HUGE_VMAP is defined. Signed-off-by: Toshi Kani <toshi.kani@hp.com> --- include/asm-generic/pgtable.h | 4 ++++ mm/vmalloc.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 7dc3838..1204ea6 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -850,9 +850,13 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr, #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP void pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot); void 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 void pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) { } static inline void pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot) { } +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 /* _ASM_GENERIC_PGTABLE_H */ diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 830a4be..c9490fe 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -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);
WARNING: multiple messages have this Message-ID (diff)
From: Toshi Kani <toshi.kani@hp.com> To: akpm@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, arnd@arndb.de, linux-mm@kvack.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Toshi Kani <toshi.kani@hp.com> Subject: [RFC PATCH 4/7] mm: Change vunmap to tear down huge KVA mappings Date: Mon, 26 Jan 2015 16:13:26 -0700 [thread overview] Message-ID: <1422314009-31667-5-git-send-email-toshi.kani@hp.com> (raw) In-Reply-To: <1422314009-31667-1-git-send-email-toshi.kani@hp.com> Change vunmap_pmd_range() and vunmap_pud_range() to tear down huge KVA mappings when they are set. These changes are only enabled when CONFIG_HAVE_ARCH_HUGE_VMAP is defined. Signed-off-by: Toshi Kani <toshi.kani@hp.com> --- include/asm-generic/pgtable.h | 4 ++++ mm/vmalloc.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 7dc3838..1204ea6 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -850,9 +850,13 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr, #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP void pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot); void 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 void pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) { } static inline void pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot) { } +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 /* _ASM_GENERIC_PGTABLE_H */ diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 830a4be..c9490fe 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -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); -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-01-26 23:30 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-26 23:13 [RFC PATCH 0/7] Kernel huge I/O mapping support Toshi Kani 2015-01-26 23:13 ` Toshi Kani 2015-01-26 23:13 ` [RFC PATCH 1/7] mm: Change __get_vm_area_node() to use fls_long() Toshi Kani 2015-01-26 23:13 ` Toshi Kani 2015-01-26 23:13 ` [RFC PATCH 2/7] lib: Add huge I/O map capability interfaces Toshi Kani 2015-01-26 23:13 ` Toshi Kani 2015-01-26 23:54 ` Andrew Morton 2015-01-26 23:54 ` Andrew Morton 2015-01-27 1:01 ` Toshi Kani 2015-01-27 1:01 ` Toshi Kani 2015-01-27 21:37 ` Andrew Morton 2015-01-27 21:37 ` Andrew Morton 2015-01-27 22:01 ` Toshi Kani 2015-01-27 22:01 ` Toshi Kani 2015-02-05 20:56 ` Toshi Kani 2015-02-05 20:56 ` Toshi Kani 2015-01-26 23:13 ` [RFC PATCH 3/7] mm: Change ioremap to set up huge I/O mappings Toshi Kani 2015-01-26 23:13 ` Toshi Kani 2015-01-26 23:58 ` Andrew Morton 2015-01-26 23:58 ` Andrew Morton 2015-01-27 0:01 ` Toshi Kani 2015-01-27 0:01 ` Toshi Kani 2015-01-26 23:13 ` Toshi Kani [this message] 2015-01-26 23:13 ` [RFC PATCH 4/7] mm: Change vunmap to tear down huge KVA mappings Toshi Kani 2015-01-26 23:13 ` [RFC PATCH 5/7] x86, mm: Support huge KVA mappings on x86 Toshi Kani 2015-01-26 23:13 ` Toshi Kani 2015-01-26 23:13 ` [RFC PATCH 6/7] x86, mm: Support huge I/O " Toshi Kani 2015-01-26 23:13 ` Toshi Kani 2015-01-26 23:13 ` [RFC PATCH 7/7] mm: Add config HUGE_IOMAP to enable huge I/O mappings Toshi Kani 2015-01-26 23:13 ` Toshi Kani
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1422314009-31667-5-git-send-email-toshi.kani@hp.com \ --to=toshi.kani@hp.com \ --cc=akpm@linux-foundation.org \ --cc=arnd@arndb.de \ --cc=hpa@zytor.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.