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

Commit f25748e3 authored by Dan Williams's avatar Dan Williams Committed by Linus Torvalds
Browse files

mm, dax: convert vmf_insert_pfn_pmd() to pfn_t 



Similar to the conversion of vm_insert_mixed() use pfn_t in the
vmf_insert_pfn_pmd() to tag the resulting pte with _PAGE_DEVICE when the
pfn is backed by a devm_memremap_pages() mapping.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 01c8f1c4

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -286,6 +286,11 @@ static inline pmd_t pmd_mkdirty(pmd_t pmd) 
	return pmd_set_flags(pmd, _PAGE_DIRTY | _PAGE_SOFT_DIRTY);

}



static inline pmd_t pmd_mkdevmap(pmd_t pmd)

{

	return pmd_set_flags(pmd, _PAGE_DEVMAP);

}



static inline pmd_t pmd_mkhuge(pmd_t pmd)

{

	return pmd_set_flags(pmd, _PAGE_PSE);

arch/x86/mm/pat.c

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/debugfs.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pfn_t.h>

#include <linux/slab.h>

#include <linux/mm.h>

#include <linux/fs.h>
@@ -949,7 +950,7 @@ int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, 
}



int track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,

		     unsigned long pfn)

		     pfn_t pfn)

{

	enum page_cache_mode pcm;
@@ -957,7 +958,7 @@ int track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, 
		return 0;



	/* Set prot based on lookup */

	pcm = lookup_memtype((resource_size_t)pfn << PAGE_SHIFT);

	pcm = lookup_memtype(pfn_t_to_phys(pfn));

	*prot = __pgprot((pgprot_val(vma->vm_page_prot) & (~_PAGE_CACHE_MASK)) |

			 cachemode2protval(pcm));

fs/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, 
		dax_unmap_atomic(bdev, &dax);



		result |= vmf_insert_pfn_pmd(vma, address, pmd,

				pfn_t_to_pfn(dax.pfn), write);

				dax.pfn, write);

	}



 out:

include/asm-generic/pgtable.h

+4 −2
Original line number Diff line number Diff line 
#ifndef _ASM_GENERIC_PGTABLE_H

#define _ASM_GENERIC_PGTABLE_H



#include <linux/pfn.h>



#ifndef __ASSEMBLY__

#ifdef CONFIG_MMU
@@ -549,7 +551,7 @@ static inline int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, 
 * by vm_insert_pfn().

 */

static inline int track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,

				   unsigned long pfn)

				   pfn_t pfn)

{

	return 0;

}
@@ -584,7 +586,7 @@ extern int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, 
			   unsigned long pfn, unsigned long addr,

			   unsigned long size);

extern int track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,

			    unsigned long pfn);

			    pfn_t pfn);

extern int track_pfn_copy(struct vm_area_struct *vma);

extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,

			unsigned long size);

include/linux/huge_mm.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, 
			unsigned long addr, pgprot_t newprot,

			int prot_numa);

int vmf_insert_pfn_pmd(struct vm_area_struct *, unsigned long addr, pmd_t *,

			unsigned long pfn, bool write);

			pfn_t pfn, bool write);



enum transparent_hugepage_flag {

	TRANSPARENT_HUGEPAGE_FLAG,