forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: mm: spf: fix task fault accounting

Browse source 
SPF has missed per-process fault account logic.
Fix it.

Bug: 187072626
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: Ibd854bf350721917ef0be1af65055691d16b52f0
This commit is contained in:
Minchan Kim 2021-05-03 10:52:58 -07:00
commit 458e81ecf7
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/mm/fault.c
View file

@ -576,7 +576,7 @@ static int __kprobes do_page_fault(unsigned long far, unsigned int esr,
* let's try a speculative page fault without grabbing the
* mmap_sem.
*/
fault = handle_speculative_fault(mm, addr, mm_flags, &vma);
fault = handle_speculative_fault(mm, addr, mm_flags, &vma, regs);
if (fault != VM_FAULT_RETRY)
goto done;

2
arch/x86/mm/fault.c
View file

@ -1316,7 +1316,7 @@ void do_user_addr_fault(struct pt_regs *regs,
* protection keys since it can't be resolved.
*/
if (!(hw_error_code & X86_PF_PK)) {
fault = handle_speculative_fault(mm, address, flags, &vma);
fault = handle_speculative_fault(mm, address, flags, &vma, regs);
if (fault != VM_FAULT_RETRY)
goto done;
}

11
include/linux/mm.h
View file

@ -1792,11 +1792,13 @@ extern int fixup_user_fault(struct mm_struct *mm,
extern vm_fault_t __handle_speculative_fault(struct mm_struct *mm,
unsigned long address,
unsigned int flags,
struct vm_area_struct **vma);
struct vm_area_struct **vma,
struct pt_regs *regs);
static inline vm_fault_t handle_speculative_fault(struct mm_struct *mm,
unsigned long address,
unsigned int flags,
struct vm_area_struct **vma)
struct vm_area_struct **vma,
struct pt_regs *regs)
{
/*
* Try speculative page fault for multithreaded user space task only.
@ -1805,7 +1807,7 @@ static inline vm_fault_t handle_speculative_fault(struct mm_struct *mm,
*vma = NULL;
return VM_FAULT_RETRY;
}
return __handle_speculative_fault(mm, address, flags, vma);
return __handle_speculative_fault(mm, address, flags, vma, regs);
}
extern bool can_reuse_spf_vma(struct vm_area_struct *vma,
unsigned long address);
@ -1813,7 +1815,8 @@ extern bool can_reuse_spf_vma(struct vm_area_struct *vma,
static inline vm_fault_t handle_speculative_fault(struct mm_struct *mm,
unsigned long address,
unsigned int flags,
struct vm_area_struct **vma)
struct vm_area_struct **vma,
struct pt_regs *regs)
{
return VM_FAULT_RETRY;
}

4
mm/memory.c
View file

@ -5063,7 +5063,8 @@ out_segv:
vm_fault_t __handle_speculative_fault(struct mm_struct *mm,
unsigned long address, unsigned int flags,
struct vm_area_struct **vma)
struct vm_area_struct **vma,
struct pt_regs *regs)
{
vm_fault_t ret;
@ -5081,6 +5082,7 @@ vm_fault_t __handle_speculative_fault(struct mm_struct *mm,
if (ret != VM_FAULT_RETRY) {
put_vma(*vma);
*vma = NULL;
mm_account_fault(regs, address, flags, ret);
}
return ret;