* [PATCH V2 0/4] mm/vma: Use all available wrappers when possible @ 2020-02-24 5:03 Anshuman Khandual 2020-02-24 5:03 ` [PATCH V2 3/4] mm/vma: Replace all remaining open encodings with is_vm_hugetlb_page() Anshuman Khandual 0 siblings, 1 reply; 3+ messages in thread From: Anshuman Khandual @ 2020-02-24 5:03 UTC (permalink / raw) To: linux-mm, linux-kernel Cc: Anshuman Khandual, linux-m68k, linux-mips, linuxppc-dev, linux-sh, kvm-ppc, linux-fsdevel, linux-arch Apart from adding a VMA flag readable name for trace purpose, this series does some open encoding replacements with availabe VMA specific wrappers. This skips VM_HUGETLB check in vma_migratable() as its already being done with another patch (https://patchwork.kernel.org/patch/11347831/) which is yet to be merged. This series applies on 5.6-rc3. This has been build tested on multiple platforms, though boot and runtime testing was limited to arm64 and x86. Cc: linux-kernel@vger.kernel.org Cc: linux-m68k@lists.linux-m68k.org Cc: linux-mips@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-sh@vger.kernel.org Cc: kvm-ppc@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Changes in V2: - Dropped patch [PATCH 4/5] mm/vma: Replace....vma_set_anonymous() per Kirril - Dropped braces around is_vm_hugetlb_page() in kvmppc_e500_shadow_map() - Replaced two open encodings in mm/mmap.c with vma_is_accessible() - Added hugetlb headers to prevent build failures wrt is_vm_hugetlb_page() Changes in V1: (https://patchwork.kernel.org/cover/11385219/) Anshuman Khandual (4): mm/vma: Add missing VMA flag readable name for VM_SYNC mm/vma: Make vma_is_accessible() available for general use mm/vma: Replace all remaining open encodings with is_vm_hugetlb_page() mm/vma: Replace all remaining open encodings with vma_is_anonymous() arch/csky/mm/fault.c | 2 +- arch/m68k/mm/fault.c | 2 +- arch/mips/mm/fault.c | 2 +- arch/powerpc/kvm/e500_mmu_host.c | 2 +- arch/powerpc/mm/fault.c | 2 +- arch/sh/mm/fault.c | 2 +- arch/x86/mm/fault.c | 2 +- fs/binfmt_elf.c | 3 ++- include/asm-generic/tlb.h | 3 ++- include/linux/mm.h | 5 +++++ include/trace/events/mmflags.h | 1 + kernel/events/core.c | 3 ++- kernel/sched/fair.c | 2 +- mm/gup.c | 5 +++-- mm/memory.c | 5 ----- mm/mempolicy.c | 3 +-- mm/mmap.c | 5 ++--- 17 files changed, 26 insertions(+), 23 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH V2 3/4] mm/vma: Replace all remaining open encodings with is_vm_hugetlb_page() 2020-02-24 5:03 [PATCH V2 0/4] mm/vma: Use all available wrappers when possible Anshuman Khandual @ 2020-02-24 5:03 ` Anshuman Khandual 2020-02-26 17:40 ` Vlastimil Babka 0 siblings, 1 reply; 3+ messages in thread From: Anshuman Khandual @ 2020-02-24 5:03 UTC (permalink / raw) To: linux-mm, linux-kernel Cc: Anshuman Khandual, Paul Mackerras, Benjamin Herrenschmidt, Michael Ellerman, Alexander Viro, Will Deacon, Aneesh Kumar K.V, Andrew Morton, Nick Piggin, Peter Zijlstra, Arnd Bergmann, Ingo Molnar, Arnaldo Carvalho de Melo, kvm-ppc, linuxppc-dev, linux-fsdevel, linux-arch This replaces all remaining open encodings with is_vm_hugetlb_page(). Cc: Paul Mackerras <paulus@ozlabs.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Will Deacon <will@kernel.org> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Nick Piggin <npiggin@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: kvm-ppc@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- arch/powerpc/kvm/e500_mmu_host.c | 2 +- fs/binfmt_elf.c | 3 ++- include/asm-generic/tlb.h | 3 ++- kernel/events/core.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 425d13806645..df9989cf7ba3 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -422,7 +422,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, break; } } else if (vma && hva >= vma->vm_start && - (vma->vm_flags & VM_HUGETLB)) { + is_vm_hugetlb_page(vma)) { unsigned long psize = vma_kernel_pagesize(vma); tsize = (gtlbe->mas1 & MAS1_TSIZE_MASK) >> diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index f4713ea76e82..1eb63867e266 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -27,6 +27,7 @@ #include <linux/highuid.h> #include <linux/compiler.h> #include <linux/highmem.h> +#include <linux/hugetlb.h> #include <linux/pagemap.h> #include <linux/vmalloc.h> #include <linux/security.h> @@ -1317,7 +1318,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma, } /* Hugetlb memory check */ - if (vma->vm_flags & VM_HUGETLB) { + if (is_vm_hugetlb_page(vma)) { if ((vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_SHARED)) goto whole; if (!(vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_PRIVATE)) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index f391f6b500b4..3f1649a8cf55 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -13,6 +13,7 @@ #include <linux/mmu_notifier.h> #include <linux/swap.h> +#include <linux/hugetlb_inline.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h> @@ -398,7 +399,7 @@ tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) * We rely on tlb_end_vma() to issue a flush, such that when we reset * these values the batch is empty. */ - tlb->vma_huge = !!(vma->vm_flags & VM_HUGETLB); + tlb->vma_huge = is_vm_hugetlb_page(vma); tlb->vma_exec = !!(vma->vm_flags & VM_EXEC); } diff --git a/kernel/events/core.c b/kernel/events/core.c index e453589da97c..ef5be3ed0580 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -28,6 +28,7 @@ #include <linux/export.h> #include <linux/vmalloc.h> #include <linux/hardirq.h> +#include <linux/hugetlb.h> #include <linux/rculist.h> #include <linux/uaccess.h> #include <linux/syscalls.h> @@ -7693,7 +7694,7 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) flags |= MAP_EXECUTABLE; if (vma->vm_flags & VM_LOCKED) flags |= MAP_LOCKED; - if (vma->vm_flags & VM_HUGETLB) + if (is_vm_hugetlb_page(vma)) flags |= MAP_HUGETLB; if (file) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2 3/4] mm/vma: Replace all remaining open encodings with is_vm_hugetlb_page() 2020-02-24 5:03 ` [PATCH V2 3/4] mm/vma: Replace all remaining open encodings with is_vm_hugetlb_page() Anshuman Khandual @ 2020-02-26 17:40 ` Vlastimil Babka 0 siblings, 0 replies; 3+ messages in thread From: Vlastimil Babka @ 2020-02-26 17:40 UTC (permalink / raw) To: Anshuman Khandual, linux-mm, linux-kernel Cc: Paul Mackerras, Benjamin Herrenschmidt, Michael Ellerman, Alexander Viro, Will Deacon, Aneesh Kumar K.V, Andrew Morton, Nick Piggin, Peter Zijlstra, Arnd Bergmann, Ingo Molnar, Arnaldo Carvalho de Melo, kvm-ppc, linuxppc-dev, linux-fsdevel, linux-arch On 2/24/20 6:03 AM, Anshuman Khandual wrote: > This replaces all remaining open encodings with is_vm_hugetlb_page(). > > Cc: Paul Mackerras <paulus@ozlabs.org> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Alexander Viro <viro@zeniv.linux.org.uk> > Cc: Will Deacon <will@kernel.org> > Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Nick Piggin <npiggin@gmail.com> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Arnaldo Carvalho de Melo <acme@kernel.org> > Cc: kvm-ppc@vger.kernel.org > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-fsdevel@vger.kernel.org > Cc: linux-arch@vger.kernel.org > Cc: linux-mm@kvack.org > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> Meh, why is there _page in the function's name... but too many users to bother changing it now, I guess. Acked-by: Vlastimil Babka <vbabka@suse.cz ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-26 17:40 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-02-24 5:03 [PATCH V2 0/4] mm/vma: Use all available wrappers when possible Anshuman Khandual 2020-02-24 5:03 ` [PATCH V2 3/4] mm/vma: Replace all remaining open encodings with is_vm_hugetlb_page() Anshuman Khandual 2020-02-26 17:40 ` Vlastimil Babka
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).