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

Commit d295e341 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

dax: don't use set_huge_zero_page() 



This is another place where DAX assumed that pgtable_t was a pointer.
Open code the important parts of set_huge_zero_page() in DAX and make
set_huge_zero_page() static again.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent da146769

fs/dax.c

+12 −6
Original line number Diff line number Diff line
@@ -572,18 +572,24 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, 
		unmap_mapping_range(mapping, pgoff << PAGE_SHIFT, PMD_SIZE, 0);



	if (!write && !buffer_mapped(&bh) && buffer_uptodate(&bh)) {

		bool set;

		spinlock_t *ptl;

		struct mm_struct *mm = vma->vm_mm;

		pmd_t entry;

		struct page *zero_page = get_huge_zero_page();



		if (unlikely(!zero_page))

			goto fallback;



		ptl = pmd_lock(mm, pmd);

		set = set_huge_zero_page(NULL, mm, vma, pmd_addr, pmd,

								zero_page);

		ptl = pmd_lock(vma->vm_mm, pmd);

		if (!pmd_none(*pmd)) {

			spin_unlock(ptl);

			goto fallback;

		}



		entry = mk_pmd(zero_page, vma->vm_page_prot);

		entry = pmd_mkhuge(entry);

		set_pmd_at(vma->vm_mm, pmd_addr, pmd, entry);

		result = VM_FAULT_NOPAGE;

		spin_unlock(ptl);

	} else {

		sector = bh.b_blocknr << (blkbits - 9);

		length = bdev_direct_access(bh.b_bdev, sector, &kaddr, &pfn,

include/linux/huge_mm.h

+0 −3
Original line number Diff line number Diff line
@@ -163,9 +163,6 @@ static inline bool is_huge_zero_pmd(pmd_t pmd) 
}



struct page *get_huge_zero_page(void);

bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,

		struct vm_area_struct *vma, unsigned long haddr,

		pmd_t *pmd, struct page *zero_page);



#else /* CONFIG_TRANSPARENT_HUGEPAGE */

#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })

mm/huge_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ static inline gfp_t alloc_hugepage_gfpmask(int defrag, gfp_t extra_gfp) 
}



/* Caller must hold page table lock. */

bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,

static bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,

		struct vm_area_struct *vma, unsigned long haddr, pmd_t *pmd,

		struct page *zero_page)

{