leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64/mm: Drop task_struct argument from __do_page_fault()

Browse Source 
The task_struct argument is not getting used in __do_page_fault(). Hence
just drop it and use current or cuurent->mm instead where ever required.
This does not change any functionality.

Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Anshuman Khandual 2019-06-03 12:11:23 +05:30 committed by Catalin Marinas
parent a0509313d5
commit 6168103600
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm64/mm/fault.c
View File

@ -395,8 +395,7 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re
#define VM_FAULT_BADACCESS 0x020000 #define VM_FAULT_BADACCESS 0x020000
static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr,
unsigned int mm_flags, unsigned long vm_flags, unsigned int mm_flags, unsigned long vm_flags)
struct task_struct *tsk)
{ {
struct vm_area_struct *vma; struct vm_area_struct *vma;
vm_fault_t fault; vm_fault_t fault;
@ -440,8 +439,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
struct pt_regs *regs) struct pt_regs *regs)
{ {
const struct fault_info *inf; const struct fault_info *inf;
struct task_struct *tsk; struct mm_struct *mm = current->mm;
struct mm_struct *mm;
vm_fault_t fault, major = 0; vm_fault_t fault, major = 0;
unsigned long vm_flags = VM_READ | VM_WRITE; unsigned long vm_flags = VM_READ | VM_WRITE;
unsigned int mm_flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; unsigned int mm_flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
@ -449,9 +447,6 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
if (notify_page_fault(regs, esr)) if (notify_page_fault(regs, esr))
return 0; return 0;
tsk = current;
mm = tsk->mm;
/* /*
* If we're in an interrupt or have no user context, we must not take * If we're in an interrupt or have no user context, we must not take
* the fault. * the fault.
@ -511,7 +506,7 @@ retry:
#endif #endif
} }
fault = __do_page_fault(mm, addr, mm_flags, vm_flags, tsk); fault = __do_page_fault(mm, addr, mm_flags, vm_flags);
major |= fault & VM_FAULT_MAJOR; major |= fault & VM_FAULT_MAJOR;
if (fault & VM_FAULT_RETRY) { if (fault & VM_FAULT_RETRY) {
@ -551,11 +546,11 @@ retry:
* that point. * that point.
*/ */
if (major) { if (major) {
tsk->maj_flt++; current->maj_flt++;
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs,
addr); addr);
} else { } else {
tsk->min_flt++; current->min_flt++;
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs,
addr); addr);
} }