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

Commit d3061f2e authored by Laurent Dufour's avatar Laurent Dufour Committed by Gerrit - the friendly Code Review server
Browse files

mm: introduce __vm_normal_page() 



When dealing with the speculative fault path we should use the VMA's field
cached value stored in the vm_fault structure.

Currently vm_normal_page() is using the pointer to the VMA to fetch the
vm_flags value. This patch provides a new __vm_normal_page() which is
receiving the vm_flags flags value as parameter.

Note: The speculative path is turned on for architecture providing support
for special PTE flag. So only the first block of vm_normal_page is used
during the speculative path.

Change-Id: I0f2c4ab1212fbca449bdf6e7993dafa0d41044bc
Signed-off-by: default avatarLaurent Dufour <ldufour@linux.vnet.ibm.com>
Patch-mainline: linux-mm @ Tue, 17 Apr 2018 16:33:21
Signed-off-by: default avatarVinayak Menon <vinmenon@codeaurora.org>
[charante@codeaurora.org: trivial merge conflict fixes]
Signed-off-by: default avatarCharan Teja Reddy <charante@codeaurora.org>
parent 808c47e1

include/linux/mm.h

+15 −3
Original line number Diff line number Diff line
@@ -1336,9 +1336,21 @@ struct zap_details { 
	pgoff_t last_index;			/* Highest page->index to unmap */

};



struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,

			     pte_t pte, bool with_public_device);

#define vm_normal_page(vma, addr, pte) _vm_normal_page(vma, addr, pte, false)

struct page *__vm_normal_page(struct vm_area_struct *vma, unsigned long addr,

			      pte_t pte, bool with_public_device,

			      unsigned long vma_flags);

static inline struct page *_vm_normal_page(struct vm_area_struct *vma,

					    unsigned long addr, pte_t pte,

					    bool with_public_device)

{

	return __vm_normal_page(vma, addr, pte, with_public_device,

				vma->vm_flags);

}

static inline struct page *vm_normal_page(struct vm_area_struct *vma,

					  unsigned long addr, pte_t pte)

{

	return _vm_normal_page(vma, addr, pte, false);

}



struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr,

				pmd_t pmd);

mm/memory.c

+16 −9
Original line number Diff line number Diff line
@@ -779,7 +779,8 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, 
}



/*

 * vm_normal_page -- This function gets the "struct page" associated with a pte.

 * __vm_normal_page -- This function gets the "struct page" associated with

 * a pte.

 *

 * "Special" mappings do not wish to be associated with a "struct page" (either

 * it doesn't exist, or it exists but they don't want to touch it). In this
@@ -820,8 +821,9 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, 
 * PFNMAP mappings in order to support COWable mappings.

 *

 */

struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,

			     pte_t pte, bool with_public_device)

struct page *__vm_normal_page(struct vm_area_struct *vma, unsigned long addr,

			      pte_t pte, bool with_public_device,

			      unsigned long vma_flags)

{

	unsigned long pfn = pte_pfn(pte);
@@ -830,7 +832,7 @@ struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr, 
			goto check_pfn;

		if (vma->vm_ops && vma->vm_ops->find_special_page)

			return vma->vm_ops->find_special_page(vma, addr);

		if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))

		if (vma_flags & (VM_PFNMAP | VM_MIXEDMAP))

			return NULL;

		if (is_zero_pfn(pfn))

			return NULL;
@@ -865,9 +867,13 @@ struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr, 
	}



	/* !CONFIG_ARCH_HAS_PTE_SPECIAL case follows: */

	/*

	 * This part should never get called when CONFIG_SPECULATIVE_PAGE_FAULT

	 * is set. This is mainly because we can't rely on vm_start.

	 */



	if (unlikely(vma->vm_flags & (VM_PFNMAP|VM_MIXEDMAP))) {

		if (vma->vm_flags & VM_MIXEDMAP) {

	if (unlikely(vma_flags & (VM_PFNMAP|VM_MIXEDMAP))) {

		if (vma_flags & VM_MIXEDMAP) {

			if (!pfn_valid(pfn))

				return NULL;

			goto out;
@@ -876,7 +882,7 @@ struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr, 
			off = (addr - vma->vm_start) >> PAGE_SHIFT;

			if (pfn == vma->vm_pgoff + off)

				return NULL;

			if (!is_cow_mapping(vma->vm_flags))

			if (!is_cow_mapping(vma_flags))

				return NULL;

		}

	}
@@ -2760,7 +2766,8 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) 
{

	struct vm_area_struct *vma = vmf->vma;



	vmf->page = vm_normal_page(vma, vmf->address, vmf->orig_pte);

	vmf->page = __vm_normal_page(vma, vmf->address, vmf->orig_pte, false,

				     vmf->vma_flags);

	if (!vmf->page) {

		/*

		 * VM_MIXEDMAP !pfn_valid() case, or VM_SOFTDIRTY clear on a
@@ -3927,7 +3934,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) 
	ptep_modify_prot_commit(vma->vm_mm, vmf->address, vmf->pte, pte);

	update_mmu_cache(vma, vmf->address, vmf->pte);



	page = vm_normal_page(vma, vmf->address, pte);

	page = __vm_normal_page(vma, vmf->address, pte, false, vmf->vma_flags);

	if (!page) {

		pte_unmap_unlock(vmf->pte, vmf->ptl);

		return 0;