Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
+4
-4
+2
-2
arch/x86/events/intel/core.c
+2
-2
arch/x86/events/intel/core.c
···
3410
3410
/*
3411
3411
* Without TFA we must not use PMC3.
3412
3412
*/
3413
-
if (!allow_tsx_force_abort && test_bit(3, c->idxmsk)) {
3413
+
if (!allow_tsx_force_abort && test_bit(3, c->idxmsk) && idx >= 0) {
3414
3414
c = dyn_constraint(cpuc, c, idx);
3415
3415
c->idxmsk64 &= ~(1ULL << 3);
3416
3416
c->weight--;
···
4179
4179
NULL
4180
4180
};
4181
4181
4182
-
DEVICE_BOOL_ATTR(allow_tsx_force_abort, 0644, allow_tsx_force_abort);
4182
+
static DEVICE_BOOL_ATTR(allow_tsx_force_abort, 0644, allow_tsx_force_abort);
4183
4183
4184
4184
static struct attribute *intel_pmu_attrs[] = {
4185
4185
&dev_attr_freeze_on_smi.attr,
+2
-2
arch/x86/events/perf_event.h
+2
-2
arch/x86/events/perf_event.h
···
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