Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0634922a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Misc fixes:

   - AMD IBS data corruptor fix (uncovered by UBSAN)

   - an Intel PEBS entry unwind error fix

   - a HW-tracing crash fix

   - a MAINTAINERS update"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Fix crash when using HW tracing kernel filters
  perf/x86/intel: Fix unwind errors from PEBS entries (mk-II)
  MAINTAINERS: Add Naveen N. Rao as kprobes co-maintainer
  perf/x86/amd/ibs: Don't access non-started event
parents fb20c03d 7f635ff1

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7985,7 +7985,7 @@ F: lib/test_kmod.c 
F:	tools/testing/selftests/kmod/



KPROBES

M:	Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>

M:	Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>

M:	Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>

M:	"David S. Miller" <davem@davemloft.net>

M:	Masami Hiramatsu <mhiramat@kernel.org>

arch/x86/events/amd/ibs.c

+5 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) 
{

	struct cpu_perf_ibs *pcpu = this_cpu_ptr(perf_ibs->pcpu);

	struct perf_event *event = pcpu->event;

	struct hw_perf_event *hwc = &event->hw;

	struct hw_perf_event *hwc;

	struct perf_sample_data data;

	struct perf_raw_record raw;

	struct pt_regs regs;
@@ -602,6 +602,10 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) 
		return 0;

	}



	if (WARN_ON_ONCE(!event))

		goto fail;



	hwc = &event->hw;

	msr = hwc->config_base;

	buf = ibs_data.regs;

	rdmsrl(msr, *buf);

arch/x86/events/intel/core.c

+3 −0
Original line number Diff line number Diff line
@@ -2997,6 +2997,9 @@ static int intel_pmu_hw_config(struct perf_event *event) 
		}

		if (x86_pmu.pebs_aliases)

			x86_pmu.pebs_aliases(event);



		if (event->attr.sample_type & PERF_SAMPLE_CALLCHAIN)

			event->attr.sample_type |= __PERF_SAMPLE_CALLCHAIN_EARLY;

	}



	if (needs_branch_stack(event)) {

arch/x86/events/intel/ds.c

+11 −14
Original line number Diff line number Diff line
@@ -1185,17 +1185,21 @@ static void setup_pebs_sample_data(struct perf_event *event, 
		data->data_src.val = val;

	}



	/*

	 * We must however always use iregs for the unwinder to stay sane; the

	 * record BP,SP,IP can point into thin air when the record is from a

	 * previous PMI context or an (I)RET happend between the record and

	 * PMI.

	 */

	if (sample_type & PERF_SAMPLE_CALLCHAIN)

		data->callchain = perf_callchain(event, iregs);



	/*

	 * We use the interrupt regs as a base because the PEBS record does not

	 * contain a full regs set, specifically it seems to lack segment

	 * descriptors, which get used by things like user_mode().

	 *

	 * In the simple case fix up only the IP for PERF_SAMPLE_IP.

	 *

	 * We must however always use BP,SP from iregs for the unwinder to stay

	 * sane; the record BP,SP can point into thin air when the record is

	 * from a previous PMI context or an (I)RET happend between the record

	 * and PMI.

	 */

	*regs = *iregs;
@@ -1214,15 +1218,8 @@ static void setup_pebs_sample_data(struct perf_event *event, 
		regs->si = pebs->si;

		regs->di = pebs->di;



		/*

		 * Per the above; only set BP,SP if we don't need callchains.

		 *

		 * XXX: does this make sense?

		 */

		if (!(sample_type & PERF_SAMPLE_CALLCHAIN)) {

		regs->bp = pebs->bp;

		regs->sp = pebs->sp;

		}



#ifndef CONFIG_X86_32

		regs->r8 = pebs->r8;

include/linux/perf_event.h

+1 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,7 @@ extern void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct 
extern struct perf_callchain_entry *

get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user,

		   u32 max_stack, bool crosstask, bool add_mark);

extern struct perf_callchain_entry *perf_callchain(struct perf_event *event, struct pt_regs *regs);

extern int get_callchain_buffers(int max_stack);

extern void put_callchain_buffers(void);