Unverified Commit 34a4a473 authored Jan 29, 2024 by openeuler-ci-bot Committed by Gitee Jan 29, 2024

!4164 arch/mm/fault: fix major fault accounting when retrying under per-VMA lock

Merge Pull Request from: @ci-robot 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DY2LJCLOF6A5MX2LEA3LQZBOMYNHUC7S/ 
 
https://gitee.com/openeuler/kernel/issues/I8YKL3 
 
Link:https://gitee.com/openeuler/kernel/pulls/4164

 

Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>
Acked-by: Xie XiuQi <xiexiuqi@huawei.com>

parents 245c31af 3f723161

arch/arm64/mm/fault.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -633,6 +633,8 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr,
		goto done;
		}
		count_vm_vma_lock_event(VMA_LOCK_RETRY);
		if (fault & VM_FAULT_MAJOR)
		mm_flags \|= FAULT_FLAG_TRIED;

		/* Quick path to respond to signals */
		if (fault_signal_pending(fault, regs)) {

arch/powerpc/mm/fault.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -496,6 +496,8 @@ static int ___do_page_fault(struct pt_regs *regs, unsigned long address,
		goto done;
		}
		count_vm_vma_lock_event(VMA_LOCK_RETRY);
		if (fault & VM_FAULT_MAJOR)
		flags \|= FAULT_FLAG_TRIED;

		if (fault_signal_pending(fault, regs))
		return user_mode(regs) ? 0 : SIGBUS;

arch/riscv/mm/fault.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -304,6 +304,8 @@ void handle_page_fault(struct pt_regs *regs)
		goto done;
		}
		count_vm_vma_lock_event(VMA_LOCK_RETRY);
		if (fault & VM_FAULT_MAJOR)
		flags \|= FAULT_FLAG_TRIED;

		if (fault_signal_pending(fault, regs)) {
		if (!user_mode(regs))

arch/s390/mm/fault.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -424,6 +424,9 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access)
		goto out;
		}
		count_vm_vma_lock_event(VMA_LOCK_RETRY);
		if (fault & VM_FAULT_MAJOR)
		flags \|= FAULT_FLAG_TRIED;

		/* Quick path to respond to signals */
		if (fault_signal_pending(fault, regs)) {
		fault = VM_FAULT_SIGNAL;

arch/x86/mm/fault.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1370,6 +1370,8 @@ void do_user_addr_fault(struct pt_regs *regs,
		goto done;
		}
		count_vm_vma_lock_event(VMA_LOCK_RETRY);
		if (fault & VM_FAULT_MAJOR)
		flags \|= FAULT_FLAG_TRIED;

		/* Quick path to respond to signals */
		if (fault_signal_pending(fault, regs)) {