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

Commit 6a9f4efe authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar
Browse files

perf/x86: Use update attribute groups for default attributes 



Using the new pmu::update_attrs attribute group for default
attributes - freeze_on_smi, allow_tsx_force_abort.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190512155518.21468-10-jolsa@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b6576880

arch/x86/events/core.c

+0 −34
Original line number Diff line number Diff line
@@ -1618,32 +1618,6 @@ static struct attribute_group x86_pmu_format_group __ro_after_init = { 
	.attrs = NULL,

};



/* Merge two pointer arrays */

__init struct attribute **merge_attr(struct attribute **a, struct attribute **b)

{

	struct attribute **new;

	int j, i;



	for (j = 0; a && a[j]; j++)

		;

	for (i = 0; b && b[i]; i++)

		j++;

	j++;



	new = kmalloc_array(j, sizeof(struct attribute *), GFP_KERNEL);

	if (!new)

		return NULL;



	j = 0;

	for (i = 0; a && a[i]; i++)

		new[j++] = a[i];

	for (i = 0; b && b[i]; i++)

		new[j++] = b[i];

	new[j] = NULL;



	return new;

}



ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr, char *page)

{

	struct perf_pmu_events_attr *pmu_attr = \
@@ -1824,14 +1798,6 @@ static int __init init_hw_perf_events(void) 
	if (!x86_pmu.events_sysfs_show)

		x86_pmu_events_group.attrs = &empty_attrs;



	if (x86_pmu.attrs) {

		struct attribute **tmp;



		tmp = merge_attr(x86_pmu_attr_group.attrs, x86_pmu.attrs);

		if (!WARN_ON(!tmp))

			x86_pmu_attr_group.attrs = tmp;

	}



	pmu.attr_update = x86_pmu.attr_update;



	pr_info("... version:                %d\n",     x86_pmu.version);

arch/x86/events/intel/core.c

+5 −4
Original line number Diff line number Diff line
@@ -3897,8 +3897,6 @@ static __initconst const struct x86_pmu core_pmu = { 
	.check_period		= intel_pmu_check_period,

};



static struct attribute *intel_pmu_attrs[];



static __initconst const struct x86_pmu intel_pmu = {

	.name			= "Intel",

	.handle_irq		= intel_pmu_handle_irq,
@@ -3930,8 +3928,6 @@ static __initconst const struct x86_pmu intel_pmu = { 
	.format_attrs		= intel_arch3_formats_attr,

	.events_sysfs_show	= intel_event_sysfs_show,



	.attrs			= intel_pmu_attrs,



	.cpu_prepare		= intel_pmu_cpu_prepare,

	.cpu_starting		= intel_pmu_cpu_starting,

	.cpu_dying		= intel_pmu_cpu_dying,
@@ -4458,6 +4454,10 @@ static struct attribute_group group_format_extra_skl = { 
	.is_visible = exra_is_visible,

};



static struct attribute_group group_default = {

	.attrs = intel_pmu_attrs,

};



static const struct attribute_group *attr_update[] = {

	&group_events_td,

	&group_events_mem,
@@ -4466,6 +4466,7 @@ static const struct attribute_group *attr_update[] = { 
	&group_caps_lbr,

	&group_format_extra,

	&group_format_extra_skl,

	&group_default,

	NULL,

};

arch/x86/events/perf_event.h

+0 −3
Original line number Diff line number Diff line
@@ -636,7 +636,6 @@ struct x86_pmu { 
	const struct attribute_group **attr_update;



	unsigned long	attr_freeze_on_smi;

	struct attribute **attrs;



	/*

	 * CPU Hotplug hooks
@@ -903,8 +902,6 @@ static inline void set_linear_ip(struct pt_regs *regs, unsigned long ip) 
ssize_t x86_event_sysfs_show(char *page, u64 config, u64 event);

ssize_t intel_event_sysfs_show(char *page, u64 config);



struct attribute **merge_attr(struct attribute **a, struct attribute **b);



ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr,

			  char *page);

ssize_t events_ht_sysfs_show(struct device *dev, struct device_attribute *attr,