Merge branch 'perf-core-for-linus' of... (4d4abdcb) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/trace/kprobetrace.txt

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,14 +22,15 @@ current_tracer. Instead of that, add probe points via

	Synopsis of kprobe_events		Synopsis of kprobe_events
	-------------------------		-------------------------
	p[:[GRP/]EVENT] SYMBOL[+offs]\|MEMADDR [FETCHARGS] : Set a probe		p[:[GRP/]EVENT] [MOD:]SYM[+offs]\|MEMADDR [FETCHARGS] : Set a probe
	r[:[GRP/]EVENT] SYMBOL[+0] [FETCHARGS] : Set a return probe		r[:[GRP/]EVENT] [MOD:]SYM[+0] [FETCHARGS] : Set a return probe
	-:[GRP/]EVENT : Clear a probe		-:[GRP/]EVENT : Clear a probe

	GRP : Group name. If omitted, use "kprobes" for it.		GRP : Group name. If omitted, use "kprobes" for it.
	EVENT : Event name. If omitted, the event name is generated		EVENT : Event name. If omitted, the event name is generated
	based on SYMBOL+offs or MEMADDR.		based on SYM+offs or MEMADDR.
	SYMBOL[+offs] : Symbol+offset where the probe is inserted.		MOD : Module name which has given SYM.
			SYM[+offs] : Symbol+offset where the probe is inserted.
	MEMADDR : Address where the probe is inserted.		MEMADDR : Address where the probe is inserted.

	FETCHARGS : Arguments. Each probe can have up to 128 args.		FETCHARGS : Arguments. Each probe can have up to 128 args.

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1290,6 +1290,7 @@ help:
	@echo ' make O=dir [targets] Locate all output files in "dir", including .config'		@echo ' make O=dir [targets] Locate all output files in "dir", including .config'
	@echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'		@echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'
	@echo ' make C=2 [targets] Force check of all c source with $$CHECK'		@echo ' make C=2 [targets] Force check of all c source with $$CHECK'
			@echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
	@echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where'		@echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where'
	@echo ' 1: warnings which may be relevant and do not occur too often'		@echo ' 1: warnings which may be relevant and do not occur too often'
	@echo ' 2: warnings which occur quite often but may still be relevant'		@echo ' 2: warnings which occur quite often but may still be relevant'

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -847,7 +847,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
	data.period = event->hw.last_period;		data.period = event->hw.last_period;

	if (alpha_perf_event_set_period(event, hwc, idx)) {		if (alpha_perf_event_set_period(event, hwc, idx)) {
	if (perf_event_overflow(event, 1, &data, regs)) {		if (perf_event_overflow(event, &data, regs)) {
	/* Interrupts coming too quickly; "throttle" the		/* Interrupts coming too quickly; "throttle" the
	* counter, i.e., disable it for a little while.		* counter, i.e., disable it for a little while.
	*/		*/

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -91,7 +91,7 @@ DEFINE_PER_CPU(u8, irq_work_pending);
	#define test_irq_work_pending() __get_cpu_var(irq_work_pending)		#define test_irq_work_pending() __get_cpu_var(irq_work_pending)
	#define clear_irq_work_pending() __get_cpu_var(irq_work_pending) = 0		#define clear_irq_work_pending() __get_cpu_var(irq_work_pending) = 0

	void set_irq_work_pending(void)		void arch_irq_work_raise(void)
	{		{
	set_irq_work_pending_flag();		set_irq_work_pending_flag();
	}		}

+29 −1

Original line number	Original line	Diff line number	Diff line
	@@ -173,6 +173,20 @@ static const unsigned armv6_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
	[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,		[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,
	},		},
	},		},
			[C(NODE)] = {
			[C(OP_READ)] = {
			[C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED,
			[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,
			},
			[C(OP_WRITE)] = {
			[C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED,
			[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,
			},
			[C(OP_PREFETCH)] = {
			[C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED,
			[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,
			},
			},
	};		};

	enum armv6mpcore_perf_types {		enum armv6mpcore_perf_types {
	@@ -310,6 +324,20 @@ static const unsigned armv6mpcore_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
	[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,		[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,
	},		},
	},		},
			[C(NODE)] = {
			[C(OP_READ)] = {
			[C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED,
			[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,
			},
			[C(OP_WRITE)] = {
			[C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED,
			[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,
			},
			[C(OP_PREFETCH)] = {
			[C(RESULT_ACCESS)] = CACHE_OP_UNSUPPORTED,
			[C(RESULT_MISS)] = CACHE_OP_UNSUPPORTED,
			},
			},
	};		};

	static inline unsigned long		static inline unsigned long
	@@ -479,7 +507,7 @@ armv6pmu_handle_irq(int irq_num,
	if (!armpmu_event_set_period(event, hwc, idx))		if (!armpmu_event_set_period(event, hwc, idx))
	continue;		continue;

	if (perf_event_overflow(event, 0, &data, regs))		if (perf_event_overflow(event, &data, regs))
	armpmu->disable(hwc, idx);		armpmu->disable(hwc, idx);
	}		}