Commit c77ee64f 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:
 "An x86 PMU constraint fix, an interface fix, and a Sparse fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Allow PEBS multi-entry in watermark mode
  perf/x86/intel: Fix INTEL_FLAGS_EVENT_CONSTRAINT* masking
  perf/x86/amd/iommu: Make the 'amd_iommu_attr_groups' symbol static
parents f57d7715 c7a28657

arch/x86/events/amd/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static __init int _init_events_attrs(void) 
	return 0;

}



const struct attribute_group *amd_iommu_attr_groups[] = {

static const struct attribute_group *amd_iommu_attr_groups[] = {

	&amd_iommu_format_group,

	&amd_iommu_cpumask_group,

	&amd_iommu_events_group,

arch/x86/events/intel/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3265,7 +3265,7 @@ static int intel_pmu_hw_config(struct perf_event *event) 
		return ret;



	if (event->attr.precise_ip) {

		if (!(event->attr.freq || event->attr.wakeup_events)) {

		if (!(event->attr.freq || (event->attr.wakeup_events && !event->attr.watermark))) {

			event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD;

			if (!(event->attr.sample_type &

			      ~intel_pmu_large_pebs_flags(event)))

arch/x86/events/perf_event.h

+2 −2
Original line number Diff line number Diff line
@@ -394,10 +394,10 @@ struct cpu_hw_events { 


/* Event constraint, but match on all event flags too. */

#define INTEL_FLAGS_EVENT_CONSTRAINT(c, n) \

	EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK|X86_ALL_EVENT_FLAGS)

	EVENT_CONSTRAINT(c, n, ARCH_PERFMON_EVENTSEL_EVENT|X86_ALL_EVENT_FLAGS)



#define INTEL_FLAGS_EVENT_CONSTRAINT_RANGE(c, e, n)			\

	EVENT_CONSTRAINT_RANGE(c, e, n, INTEL_ARCH_EVENT_MASK|X86_ALL_EVENT_FLAGS)

	EVENT_CONSTRAINT_RANGE(c, e, n, ARCH_PERFMON_EVENTSEL_EVENT|X86_ALL_EVENT_FLAGS)



/* Check only flags, but allow all event/umask */

#define INTEL_ALL_EVENT_CONSTRAINT(code, n)	\

CRA Git | Maintained and supported by SUSTech CRA and CCSE