Commit aec44e0f authored May 04, 2021 by Peter Xu Committed by Linus Torvalds May 05, 2021

hugetlb: pass vma into huge_pte_alloc() and huge_pmd_share()

Patch series "hugetlb: Disable huge pmd unshare for uffd-wp", v4.

This series tries to disable huge pmd unshare of hugetlbfs backed memory
for uffd-wp.  Although uffd-wp of hugetlbfs is still during rfc stage,
the idea of this series may be needed for multiple tasks (Axel's uffd
minor fault series, and Mike's soft dirty series), so I picked it out
from the larger series.

This patch (of 4):

It is a preparation work to be able to behave differently in the per
architecture huge_pte_alloc() according to different VMA attributes.

Pass it deeper into huge_pmd_share() so that we can avoid the find_vma() call.

[peterx@redhat.com: build fix]
  Link: https://lkml.kernel.org/r/20210304164653.GB397383@xz-x1Link: https://lkml.kernel.org/r/20210218230633.15028-1-peterx@redhat.com

Link: https://lkml.kernel.org/r/20210218230633.15028-2-peterx@redhat.com


Signed-off-by: Peter Xu <peterx@redhat.com>
Suggested-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Adam Ruprecht <ruprecht@google.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Cannon Matthews <cannonmatthews@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chinwen Chang <chinwen.chang@mediatek.com>
Cc: David Rientjes <rientjes@google.com>
Cc: "Dr . David Alan Gilbert" <dgilbert@redhat.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jann Horn <jannh@google.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Lokesh Gidra <lokeshgidra@google.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: "Michal Koutn" <mkoutny@suse.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Mina Almasry <almasrymina@google.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oliver Upton <oupton@google.com>
Cc: Shaohua Li <shli@fb.com>
Cc: Shawn Anastasio <shawn@anastas.io>
Cc: Steven Price <steven.price@arm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 786b3112

arch/arm64/mm/hugetlbpage.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr,
		set_pte(ptep, pte);
		}

		pte_t huge_pte_alloc(struct mm_struct mm,
		pte_t huge_pte_alloc(struct mm_struct mm, struct vm_area_struct *vma,
		unsigned long addr, unsigned long sz)
		{
		pgd_t *pgdp;
		@@ -286,7 +286,7 @@ pte_t huge_pte_alloc(struct mm_struct mm,
		} else if (sz == PMD_SIZE) {
		if (IS_ENABLED(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) &&
		pud_none(READ_ONCE(*pudp)))
		ptep = huge_pmd_share(mm, addr, pudp);
		ptep = huge_pmd_share(mm, vma, addr, pudp);
		else
		ptep = (pte_t *)pmd_alloc(mm, pudp, addr);
		} else if (sz == (CONT_PMD_SIZE)) {

arch/ia64/mm/hugetlbpage.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,8 @@ unsigned int hpage_shift = HPAGE_SHIFT_DEFAULT;
		EXPORT_SYMBOL(hpage_shift);

		pte_t *
		huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)
		huge_pte_alloc(struct mm_struct mm, struct vm_area_struct vma,
		unsigned long addr, unsigned long sz)
		{
		unsigned long taddr = htlbpage_to_page(addr);
		pgd_t *pgd;

arch/mips/mm/hugetlbpage.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@
		#include <asm/tlb.h>
		#include <asm/tlbflush.h>

		pte_t huge_pte_alloc(struct mm_struct mm, unsigned long addr,
		unsigned long sz)
		pte_t huge_pte_alloc(struct mm_struct mm, struct vm_area_struct *vma,
		unsigned long addr, unsigned long sz)
		{
		pgd_t *pgd;
		p4d_t *p4d;

arch/parisc/mm/hugetlbpage.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
		}


		pte_t huge_pte_alloc(struct mm_struct mm,
		pte_t huge_pte_alloc(struct mm_struct mm, struct vm_area_struct *vma,
		unsigned long addr, unsigned long sz)
		{
		pgd_t *pgd;

arch/powerpc/mm/hugetlbpage.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,8 @@ static int __hugepte_alloc(struct mm_struct mm, hugepd_t hpdp,
		* At this point we do the placement change only for BOOK3S 64. This would
		* possibly work on other subarchs.
		*/
		pte_t huge_pte_alloc(struct mm_struct mm, unsigned long addr, unsigned long sz)
		pte_t huge_pte_alloc(struct mm_struct mm, struct vm_area_struct *vma,
		unsigned long addr, unsigned long sz)
		{
		pgd_t *pg;
		p4d_t *p4;