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

torvalds · torvalds · commit 69ebf9a16a74 · 2019-03-17T09:19:22.000-07:00
Pull perf fixes from Thomas Gleixner:
 "Three fixes for the fallout from the TSX errata workaround:

   - Prevent memory corruption caused by a unchecked out of bound array
     index.

   - Two trivial fixes to address compiler warnings"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Make dev_attr_allow_tsx_force_abort static
  perf/x86: Fixup typo in stub functions
  perf/x86/intel: Fix memory corruption
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
@@ -3410,7 +3410,7 @@ tfa_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
 	/*
 	 * Without TFA we must not use PMC3.
 	 */
-	if (!allow_tsx_force_abort && test_bit(3, c->idxmsk)) {
+	if (!allow_tsx_force_abort && test_bit(3, c->idxmsk) && idx >= 0) {
 		c = dyn_constraint(cpuc, c, idx);
 		c->idxmsk64 &= ~(1ULL << 3);
 		c->weight--;
@@ -4179,7 +4179,7 @@ static struct attribute *intel_pmu_caps_attrs[] = {
        NULL
 };
 
-DEVICE_BOOL_ATTR(allow_tsx_force_abort, 0644, allow_tsx_force_abort);
+static DEVICE_BOOL_ATTR(allow_tsx_force_abort, 0644, allow_tsx_force_abort);
 
 static struct attribute *intel_pmu_attrs[] = {
 	&dev_attr_freeze_on_smi.attr,
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
@@ -1033,12 +1033,12 @@ static inline int intel_pmu_init(void)
 	return 0;
 }
 
-static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu)
+static inline int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu)
 {
 	return 0;
 }
 
-static inline void intel_cpuc_finish(struct cpu_hw_event *cpuc)
+static inline void intel_cpuc_finish(struct cpu_hw_events *cpuc)
 {
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1033,12 +1033,12 @@ static inline int intel_pmu_init(void)`
`1033`	`1033`	`return 0;`
`1034`	`1034`	`}`
`1035`	`1035`
`1036`		`-static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu)`
	`1036`	`+static inline int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu)`
`1037`	`1037`	`{`
`1038`	`1038`	`return 0;`
`1039`	`1039`	`}`
`1040`	`1040`
`1041`		`-static inline void intel_cpuc_finish(struct cpu_hw_event *cpuc)`
	`1041`	`+static inline void intel_cpuc_finish(struct cpu_hw_events *cpuc)`
`1042`	`1042`	`{`
`1043`	`1043`	`}`
`1044`	`1044`