Revert "ANDROID: Make MGLRU aware of speculative faults"

This reverts commit 88e4dbaf59.

Will be re-added after MGLRU upstream merge.

Bug: 249601646
Change-Id: I049e95f316097f2db63bd6fadb3cedca3b6f4af9
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
This commit is contained in:
Kalesh Singh
2022-11-08 09:03:55 -08:00
parent baa23246e9
commit 40dd81e34c

View File

@@ -4914,10 +4914,6 @@ static inline void mm_account_fault(struct pt_regs *regs,
else
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address);
}
static void lru_gen_enter_fault(struct vm_area_struct *vma);
static void lru_gen_exit_fault(void);
#ifdef CONFIG_SPECULATIVE_PAGE_FAULT
#ifndef CONFIG_ARCH_HAS_PTE_SPECIAL
@@ -5110,9 +5106,7 @@ static vm_fault_t ___handle_speculative_fault(struct mm_struct *mm,
}
mem_cgroup_enter_user_fault();
lru_gen_enter_fault(vmf.vma);
ret = handle_pte_fault(&vmf);
lru_gen_exit_fault();
mem_cgroup_exit_user_fault();
if (ret != VM_FAULT_RETRY) {