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

Commit 0ac343a5 authored by Peter Zijlstra (Intel)'s avatar Peter Zijlstra (Intel) Committed by Greg Kroah-Hartman
Browse files

perf/x86/intel: Make cpuc allocations consistent 



commit d01b1f96a82e5dd7841a1d39db3abfdaf95f70ab upstream

The cpuc data structure allocation is different between fake and real
cpuc's; use the same code to init/free both.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd25a761

arch/x86/events/core.c

+5 −8
Original line number Diff line number Diff line
@@ -1942,7 +1942,7 @@ static int x86_pmu_commit_txn(struct pmu *pmu) 
 */

static void free_fake_cpuc(struct cpu_hw_events *cpuc)

{

	kfree(cpuc->shared_regs);

	intel_cpuc_finish(cpuc);

	kfree(cpuc);

}
@@ -1954,14 +1954,11 @@ static struct cpu_hw_events *allocate_fake_cpuc(void) 
	cpuc = kzalloc(sizeof(*cpuc), GFP_KERNEL);

	if (!cpuc)

		return ERR_PTR(-ENOMEM);

	cpuc->is_fake = 1;



	/* only needed, if we have extra_regs */

	if (x86_pmu.extra_regs) {

		cpuc->shared_regs = allocate_shared_regs(cpu);

		if (!cpuc->shared_regs)

	if (intel_cpuc_prepare(cpuc, cpu))

		goto error;

	}

	cpuc->is_fake = 1;



	return cpuc;

error:

	free_fake_cpuc(cpuc);

arch/x86/events/intel/core.c

+18 −11
Original line number Diff line number Diff line
@@ -3093,7 +3093,7 @@ ssize_t intel_event_sysfs_show(char *page, u64 config) 
	return x86_event_sysfs_show(page, config, event);

}



struct intel_shared_regs *allocate_shared_regs(int cpu)

static struct intel_shared_regs *allocate_shared_regs(int cpu)

{

	struct intel_shared_regs *regs;

	int i;
@@ -3125,10 +3125,9 @@ static struct intel_excl_cntrs *allocate_excl_cntrs(int cpu) 
	return c;

}



static int intel_pmu_cpu_prepare(int cpu)

{

	struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu);



int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu)

{

	if (x86_pmu.extra_regs || x86_pmu.lbr_sel_map) {

		cpuc->shared_regs = allocate_shared_regs(cpu);

		if (!cpuc->shared_regs)
@@ -3138,7 +3137,7 @@ static int intel_pmu_cpu_prepare(int cpu) 
	if (x86_pmu.flags & PMU_FL_EXCL_CNTRS) {

		size_t sz = X86_PMC_IDX_MAX * sizeof(struct event_constraint);



		cpuc->constraint_list = kzalloc(sz, GFP_KERNEL);

		cpuc->constraint_list = kzalloc_node(sz, GFP_KERNEL, cpu_to_node(cpu));

		if (!cpuc->constraint_list)

			goto err_shared_regs;
@@ -3163,6 +3162,11 @@ static int intel_pmu_cpu_prepare(int cpu) 
	return -ENOMEM;

}



static int intel_pmu_cpu_prepare(int cpu)

{

	return intel_cpuc_prepare(&per_cpu(cpu_hw_events, cpu), cpu);

}



static void intel_pmu_cpu_starting(int cpu)

{

	struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu);
@@ -3218,9 +3222,8 @@ static void intel_pmu_cpu_starting(int cpu) 
	}

}



static void free_excl_cntrs(int cpu)

static void free_excl_cntrs(struct cpu_hw_events *cpuc)

{

	struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu);

	struct intel_excl_cntrs *c;



	c = cpuc->excl_cntrs;
@@ -3238,9 +3241,8 @@ static void intel_pmu_cpu_dying(int cpu) 
	fini_debug_store_on_cpu(cpu);

}



static void intel_pmu_cpu_dead(int cpu)

void intel_cpuc_finish(struct cpu_hw_events *cpuc)

{

	struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu);

	struct intel_shared_regs *pc;



	pc = cpuc->shared_regs;
@@ -3250,7 +3252,12 @@ static void intel_pmu_cpu_dead(int cpu) 
		cpuc->shared_regs = NULL;

	}



	free_excl_cntrs(cpu);

	free_excl_cntrs(cpuc);

}



static void intel_pmu_cpu_dead(int cpu)

{

	intel_cpuc_finish(&per_cpu(cpu_hw_events, cpu));

}



static void intel_pmu_sched_task(struct perf_event_context *ctx,
@@ -4132,7 +4139,7 @@ static __init int fixup_ht_bug(void) 
	get_online_cpus();



	for_each_online_cpu(c) {

		free_excl_cntrs(c);

		free_excl_cntrs(&per_cpu(cpu_hw_events, c));

	}



	put_online_cpus();

arch/x86/events/perf_event.h

+8 −3
Original line number Diff line number Diff line
@@ -865,7 +865,8 @@ struct event_constraint * 
x86_get_event_constraints(struct cpu_hw_events *cpuc, int idx,

			  struct perf_event *event);



struct intel_shared_regs *allocate_shared_regs(int cpu);

extern int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu);

extern void intel_cpuc_finish(struct cpu_hw_events *cpuc);



int intel_pmu_init(void);
@@ -995,9 +996,13 @@ static inline int intel_pmu_init(void) 
	return 0;

}



static inline struct intel_shared_regs *allocate_shared_regs(int cpu)

static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu)

{

	return 0;

}



static inline void intel_cpuc_finish(struct cpu_hw_event *cpuc)

{

	return NULL;

}



static inline int is_ht_workaround_enabled(void)