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

Commit 07c7016d 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 Thomas Gleixner:
 "Two small fixes for perf:

   - the move to support cross arch annotation introduced per arch
     initialization requirements, fullfill them for s/390 (Christian
     Borntraeger)

   - add the missing initialization to the LBR entries to avoid exposing
     random or stale data"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32()
  perf annotate s390: Fix perf annotate error -95 (4.10 regression)
parents d295917a f2200ac3

arch/x86/events/intel/lbr.c

+3 −0
Original line number Diff line number Diff line
@@ -507,6 +507,9 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) 
		cpuc->lbr_entries[i].to		= msr_lastbranch.to;

		cpuc->lbr_entries[i].mispred	= 0;

		cpuc->lbr_entries[i].predicted	= 0;

		cpuc->lbr_entries[i].in_tx	= 0;

		cpuc->lbr_entries[i].abort	= 0;

		cpuc->lbr_entries[i].cycles	= 0;

		cpuc->lbr_entries[i].reserved	= 0;

	}

	cpuc->lbr_stack.nr = i;

tools/perf/util/annotate.c

+6 −0
Original line number Diff line number Diff line
@@ -130,6 +130,12 @@ static struct arch architectures[] = { 
		.name = "powerpc",

		.init = powerpc__annotate_init,

	},

	{

		.name = "s390",

		.objdump =  {

			.comment_char = '#',

		},

	},

};



static void ins__delete(struct ins_operands *ops)