A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 12:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "mm: make pte_unmap_same compatible with SPF"

Browse source 
This reverts commit 7224f45453.

Bug: 128240262
Change-Id: Ifdf06b5394bcfb111468fd7f220434a343fb48e8
Signed-off-by: Minchan Kim <minchan@google.com>
[dereference23: Forward port to msm-5.4]
Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
This commit is contained in:
Minchan Kim 2019-03-11 11:42:36 +09:00 • committed by Alexander Winkowski
commit cf71c34ecb
No known key found for this signature in database
GPG key ID: 72762A66704CDE44
2 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/mm_types.h
View file

@ -705,7 +705,6 @@ enum vm_fault_reason {
VM_FAULT_FALLBACK = (__force vm_fault_t)0x000800,
VM_FAULT_DONE_COW = (__force vm_fault_t)0x001000,
VM_FAULT_NEEDDSYNC = (__force vm_fault_t)0x002000,
VM_FAULT_PTNOTSAME = (__force vm_fault_t)0x004000,
VM_FAULT_HINDEX_MASK = (__force vm_fault_t)0x0f0000,
};

39
mm/memory.c
View file

@ -2229,29 +2229,21 @@ static inline bool pte_map_lock(struct vm_fault *vmf)
* parts, do_swap_page must check under lock before unmapping the pte and
* proceeding (but do_wp_page is only called after already making such a check;
* and do_anonymous_page can safely check later on).
*
* pte_unmap_same() returns:
* 0 if the PTE are the same
* VM_FAULT_PTNOTSAME if the PTE are different
* VM_FAULT_RETRY if the VMA has changed in our back during
* a speculative page fault handling.
*/
static inline int pte_unmap_same(struct vm_fault *vmf)
static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd,
pte_t *page_table, pte_t orig_pte)
{
int ret = 0;
int same = 1;
#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
if (sizeof(pte_t) > sizeof(unsigned long)) {
if (pte_spinlock(vmf)) {
if (!pte_same(*vmf->pte, vmf->orig_pte))
ret = VM_FAULT_PTNOTSAME;
spin_unlock(vmf->ptl);
} else
ret = VM_FAULT_RETRY;
spinlock_t *ptl = pte_lockptr(mm, pmd);
spin_lock(ptl);
same = pte_same(*page_table, orig_pte);
spin_unlock(ptl);
}
#endif
pte_unmap(vmf->pte);
return ret;
pte_unmap(page_table);
return same;
}
static inline bool cow_user_page(struct page *dst, struct page *src,
@ -2967,19 +2959,10 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
pte_t pte;
int locked;
int exclusive = 0;
vm_fault_t ret;
vm_fault_t ret = 0;
ret = pte_unmap_same(vmf);
if (ret) {
/*
* If pte != orig_pte, this means another thread did the
* swap operation in our back.
* So nothing else to do.
*/
if (ret == VM_FAULT_PTNOTSAME)
ret = 0;
if (!pte_unmap_same(vma->vm_mm, vmf->pmd, vmf->pte, vmf->orig_pte))
goto out;
}
entry = pte_to_swp_entry(vmf->orig_pte);
if (unlikely(non_swap_entry(entry))) {