Merge "UPSTREAM: mm: remove gup_flags FOLL_WRITE games from __get_user_pages()" (7c08f7fa) · Commits · e / devices / android_kernel_xiaomi_markw

include/linux/mm.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -2055,6 +2055,7 @@ static inline struct page follow_page(struct vm_area_struct vma,
		#define FOLL_NUMA 0x200 /* force NUMA hinting page fault */
		#define FOLL_MIGRATION 0x400 /* wait for page to replace migration entry */
		#define FOLL_TRIED 0x800 /* a retry, previous pass started an IO */
		#define FOLL_COW 0x4000 /* internal GUP flag */

		typedef int (pte_fn_t)(pte_t pte, pgtable_t token, unsigned long addr,
		void *data);

+12 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,16 @@ static struct page no_page_table(struct vm_area_struct vma,
		return NULL;
		}

		/*
		* FOLL_FORCE can write to even unwritable pte's, but only
		* after we've gone through a COW cycle and they are dirty.
		*/
		static inline bool can_follow_write_pte(pte_t pte, unsigned int flags)
		{
		return pte_write(pte) \|\|
		((flags & FOLL_FORCE) && (flags & FOLL_COW) && pte_dirty(pte));
		}

		static struct page follow_page_pte(struct vm_area_struct vma,
		unsigned long address, pmd_t *pmd, unsigned int flags)
		{
		@@ -66,7 +76,7 @@ retry:
		}
		if ((flags & FOLL_NUMA) && pte_numa(pte))
		goto no_page;
		if ((flags & FOLL_WRITE) && !pte_write(pte)) {
		if ((flags & FOLL_WRITE) && !can_follow_write_pte(pte, flags)) {
		pte_unmap_unlock(ptep, ptl);
		return NULL;
		}
		@@ -315,7 +325,7 @@ static int faultin_page(struct task_struct tsk, struct vm_area_struct vma,
		* reCOWed by userspace write).
		*/
		if ((ret & VM_FAULT_WRITE) && !(vma->vm_flags & VM_WRITE))
		*flags &= ~FOLL_WRITE;
		*flags \|= FOLL_COW;
		return 0;
		}