From f3fcee6d90a11d138372f13d703552f9c6ae6d8b Mon Sep 17 00:00:00 2001 From: Alexander Winkowski Date: Fri, 12 Jan 2024 05:00:10 +0000 Subject: [PATCH] Revert "ANDROID: mm: skip pte_alloc during speculative page fault" This reverts commit b12d6d9506435b10f588075a8bdf537004d1afbd. Change-Id: I0891749da9dc05c7f9a3ad909a9d054e74a45e2b Signed-off-by: Alexander Winkowski --- mm/memory.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 1df7a5f0fec8..2a059e328d0d 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3336,10 +3336,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) if (vmf->vma_flags & VM_SHARED) return VM_FAULT_SIGBUS; - /* Do not check unstable pmd, if it's changed will retry later */ - if (vmf->flags & FAULT_FLAG_SPECULATIVE) - goto skip_pmd_checks; - /* * Use pte_alloc() instead of pte_alloc_map(). We can't run * pte_offset_map() on pmds where a huge pmd might be created @@ -3357,7 +3353,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) if (unlikely(pmd_trans_unstable(vmf->pmd))) return 0; -skip_pmd_checks: /* Use the zero-page for reads */ if (!(vmf->flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(vma->vm_mm)) {