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

Commit 6155bc14 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:
 "Mostly tooling fixes, but also an event groups fix, two PMU driver
  fixes and a CPU model variant addition"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Tighten (and fix) the grouping condition
  perf/x86/intel: Add model number for Airmont
  perf/rapl: Fix crash in rapl_scale()
  perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization
  perf probe: Fix probing kretprobes
  perf symbols: Introduce 'for' method to iterate over the symbols with a given name
  perf probe: Do not rely on map__load() filter to find symbols
  perf symbols: Introduce method to iterate symbols ordered by name
  perf symbols: Return the first entry with a given name in find_by_name method
  perf annotate: Fix memory leaks in LOCK handling
  perf annotate: Handle ins parsing failures
  perf scripting perl: Force to use stdbool
  perf evlist: Remove extraneous 'was' on error message
parents bc208e0e e742f3dc

arch/x86/kernel/cpu/perf_event_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2431,6 +2431,7 @@ __init int intel_pmu_init(void) 
		break;



	case 55: /* 22nm Atom "Silvermont"                */

	case 76: /* 14nm Atom "Airmont"                   */

	case 77: /* 22nm Atom "Silvermont Avoton/Rangely" */

		memcpy(hw_cache_event_ids, slm_hw_cache_event_ids,

			sizeof(hw_cache_event_ids));

arch/x86/kernel/cpu/perf_event_intel_rapl.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static inline u64 rapl_scale(u64 v) 
	 * or use ldexp(count, -32).

	 * Watts = Joules/Time delta

	 */

	return v << (32 - __this_cpu_read(rapl_pmu->hw_unit));

	return v << (32 - __this_cpu_read(rapl_pmu)->hw_unit);

}



static u64 rapl_event_update(struct perf_event *event)

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+2 −7
Original line number Diff line number Diff line
@@ -840,7 +840,6 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id 
	box->phys_id = phys_id;

	box->pci_dev = pdev;

	box->pmu = pmu;

	uncore_box_init(box);

	pci_set_drvdata(pdev, box);



	raw_spin_lock(&uncore_box_lock);
@@ -1004,10 +1003,8 @@ static int uncore_cpu_starting(int cpu) 
			pmu = &type->pmus[j];

			box = *per_cpu_ptr(pmu->box, cpu);

			/* called by uncore_cpu_init? */

			if (box && box->phys_id >= 0) {

				uncore_box_init(box);

			if (box && box->phys_id >= 0)

				continue;

			}



			for_each_online_cpu(k) {

				exist = *per_cpu_ptr(pmu->box, k);
@@ -1023,10 +1020,8 @@ static int uncore_cpu_starting(int cpu) 
				}

			}



			if (box) {

			if (box)

				box->phys_id = phys_id;

				uncore_box_init(box);

			}

		}

	}

	return 0;

arch/x86/kernel/cpu/perf_event_intel_uncore.h

+10 −8
Original line number Diff line number Diff line
@@ -257,6 +257,14 @@ static inline int uncore_num_counters(struct intel_uncore_box *box) 
	return box->pmu->type->num_counters;

}



static inline void uncore_box_init(struct intel_uncore_box *box)

{

	if (!test_and_set_bit(UNCORE_BOX_FLAG_INITIATED, &box->flags)) {

		if (box->pmu->type->ops->init_box)

			box->pmu->type->ops->init_box(box);

	}

}



static inline void uncore_disable_box(struct intel_uncore_box *box)

{

	if (box->pmu->type->ops->disable_box)
@@ -265,6 +273,8 @@ static inline void uncore_disable_box(struct intel_uncore_box *box) 


static inline void uncore_enable_box(struct intel_uncore_box *box)

{

	uncore_box_init(box);



	if (box->pmu->type->ops->enable_box)

		box->pmu->type->ops->enable_box(box);

}
@@ -287,14 +297,6 @@ static inline u64 uncore_read_counter(struct intel_uncore_box *box, 
	return box->pmu->type->ops->read_counter(box, event);

}



static inline void uncore_box_init(struct intel_uncore_box *box)

{

	if (!test_and_set_bit(UNCORE_BOX_FLAG_INITIATED, &box->flags)) {

		if (box->pmu->type->ops->init_box)

			box->pmu->type->ops->init_box(box);

	}

}



static inline bool uncore_box_is_fake(struct intel_uncore_box *box)

{

	return (box->phys_id < 0);

include/linux/perf_event.h

+0 −6
Original line number Diff line number Diff line
@@ -450,11 +450,6 @@ struct perf_event { 
#endif /* CONFIG_PERF_EVENTS */

};



enum perf_event_context_type {

	task_context,

	cpu_context,

};



/**

 * struct perf_event_context - event context structure

 *
@@ -462,7 +457,6 @@ enum perf_event_context_type { 
 */

struct perf_event_context {

	struct pmu			*pmu;

	enum perf_event_context_type	type;

	/*

	 * Protect the states of the events in the list,

	 * nr_active, and the list: