From 0f59e461985adf92a3cfb3ff73279533f288ad11 Mon Sep 17 00:00:00 2001 From: Jianxiong Pan Date: Mon, 10 Oct 2022 21:00:09 +0800 Subject: [PATCH] mm: disable FAULT_FLAG_SPECULATIVE. [1/2] PD#SWPL-94445 Problem: play video system crash. Solution: disable FAULT_FLAG_SPECULATIVE. Verify: sc2_ah212. Change-Id: Ib056ffe1f48e68ae8e7b848c23db8218710fbbb7 Signed-off-by: Jianxiong Pan --- arch/arm64/mm/fault.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index e9d7aefb49bd..2a92cc94799b 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -551,10 +551,12 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, unsigned long vm_flags; unsigned int mm_flags = FAULT_FLAG_DEFAULT; unsigned long addr = untagged_addr(far); +#ifndef CONFIG_AMLOGIC_CMA #ifdef CONFIG_SPECULATIVE_PAGE_FAULT struct vm_area_struct *vma; struct vm_area_struct pvma; unsigned long seq; +#endif #endif if (kprobe_page_fault(regs, esr)) @@ -613,6 +615,7 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); +#ifndef CONFIG_AMLOGIC_CMA #ifdef CONFIG_SPECULATIVE_PAGE_FAULT /* * No need to try speculative faults for kernel or @@ -665,6 +668,7 @@ spf_abort: no_spf: #endif /* CONFIG_SPECULATIVE_PAGE_FAULT */ +#endif /* * As per x86, we may deadlock here. However, since the kernel only @@ -706,8 +710,10 @@ retry: } } mmap_read_unlock(mm); +#ifndef CONFIG_AMLOGIC_CMA #ifdef CONFIG_SPECULATIVE_PAGE_FAULT done: +#endif #endif /*