Commit 2e38eb04 authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Peter Zijlstra
Browse files

kprobes: Do not increment probe miss count in the fault handler 



Kprobes has a counter 'nmissed', that is used to count the number of
times a probe handler was not called. This generally happens when we hit
a kprobe while handling another kprobe.

However, if one of the probe handlers causes a fault, we are currently
incrementing 'nmissed'. The comment in fault handler indicates that this
can be used to account faults taken by the probe handlers. But, this has
never been the intention as is evident from the comment above 'nmissed'
in 'struct kprobe':

	/*count the number of times this probe was temporarily disarmed */
	unsigned long nmissed;

Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Link: https://lkml.kernel.org/r/20210601120150.672652-1-naveen.n.rao@linux.vnet.ibm.com
parent 00afe830

arch/arc/kernel/kprobes.c

+0 −6
Original line number Diff line number Diff line
@@ -317,12 +317,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned long trapnr) 
		 * caused the fault.

		 */



		/* We increment the nmissed count for accounting,

		 * we can also use npre/npostfault count for accounting

		 * these specific fault cases.

		 */

		kprobes_inc_nmissed_count(cur);



		/*

		 * In case the user-specified fault handler returned zero,

		 * try to fix up.

arch/arm/probes/kprobes/core.c

+0 −14
Original line number Diff line number Diff line
@@ -348,20 +348,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr) 
			reset_current_kprobe();

		}

		break;



	case KPROBE_HIT_ACTIVE:

	case KPROBE_HIT_SSDONE:

		/*

		 * We increment the nmissed count for accounting,

		 * we can also use npre/npostfault count for accounting

		 * these specific fault cases.

		 */

		kprobes_inc_nmissed_count(cur);



		break;



	default:

		break;

	}



	return 0;

arch/arm64/kernel/probes/kprobes.c

+0 −7
Original line number Diff line number Diff line
@@ -276,13 +276,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr) 
		break;

	case KPROBE_HIT_ACTIVE:

	case KPROBE_HIT_SSDONE:

		/*

		 * We increment the nmissed count for accounting,

		 * we can also use npre/npostfault count for accounting

		 * these specific fault cases.

		 */

		kprobes_inc_nmissed_count(cur);



		/*

		 * In case the user-specified fault handler returned

		 * zero, try to fix up.

arch/csky/kernel/probes/kprobes.c

+0 −7
Original line number Diff line number Diff line
@@ -294,13 +294,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int trapnr) 
		break;

	case KPROBE_HIT_ACTIVE:

	case KPROBE_HIT_SSDONE:

		/*

		 * We increment the nmissed count for accounting,

		 * we can also use npre/npostfault count for accounting

		 * these specific fault cases.

		 */

		kprobes_inc_nmissed_count(cur);



		/*

		 * In case the user-specified fault handler returned

		 * zero, try to fix up.

arch/ia64/kernel/kprobes.c

+0 −7
Original line number Diff line number Diff line
@@ -843,13 +843,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) 
		break;

	case KPROBE_HIT_ACTIVE:

	case KPROBE_HIT_SSDONE:

		/*

		 * We increment the nmissed count for accounting,

		 * we can also use npre/npostfault count for accounting

		 * these specific fault cases.

		 */

		kprobes_inc_nmissed_count(cur);



		/*

		 * In case the user-specified fault handler returned

		 * zero, try to fix up.