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

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

perf/x86/intel: Generalize dynamic constraint creation 



commit 11f8b2d65ca9029591c8df26bb6bd063c312b7fe upstream

Such that we can re-use it.

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 f99f7dae

arch/x86/events/intel/core.c

+30 −21
Original line number Diff line number Diff line
@@ -2652,6 +2652,35 @@ intel_stop_scheduling(struct cpu_hw_events *cpuc) 
	raw_spin_unlock(&excl_cntrs->lock);

}



static struct event_constraint *

dyn_constraint(struct cpu_hw_events *cpuc, struct event_constraint *c, int idx)

{

	WARN_ON_ONCE(!cpuc->constraint_list);



	if (!(c->flags & PERF_X86_EVENT_DYNAMIC)) {

		struct event_constraint *cx;



		/*

		 * grab pre-allocated constraint entry

		 */

		cx = &cpuc->constraint_list[idx];



		/*

		 * initialize dynamic constraint

		 * with static constraint

		 */

		*cx = *c;



		/*

		 * mark constraint as dynamic

		 */

		cx->flags |= PERF_X86_EVENT_DYNAMIC;

		c = cx;

	}



	return c;

}



static struct event_constraint *

intel_get_excl_constraints(struct cpu_hw_events *cpuc, struct perf_event *event,

			   int idx, struct event_constraint *c)
@@ -2682,27 +2711,7 @@ intel_get_excl_constraints(struct cpu_hw_events *cpuc, struct perf_event *event, 
	 * only needed when constraint has not yet

	 * been cloned (marked dynamic)

	 */

	if (!(c->flags & PERF_X86_EVENT_DYNAMIC)) {

		struct event_constraint *cx;



		/*

		 * grab pre-allocated constraint entry

		 */

		cx = &cpuc->constraint_list[idx];



		/*

		 * initialize dynamic constraint

		 * with static constraint

		 */

		*cx = *c;



		/*

		 * mark constraint as dynamic, so we

		 * can free it later on

		 */

		cx->flags |= PERF_X86_EVENT_DYNAMIC;

		c = cx;

	}

	c = dyn_constraint(cpuc, c, idx);



	/*

	 * From here on, the constraint is dynamic.