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

Commit 5da382eb authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf/x86: Fix caps/ for !Intel 



Move the 'max_precise' capability into generic x86 code where it
belongs. This fixes a sysfs splat on !Intel systems where we fail to set
x86_pmu_caps_group.atts.

Reported-and-tested-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: hpa@zytor.com
Fixes: 22688d1c20f5 ("x86/perf: Export some PMU attributes in caps/ directory")
Link: http://lkml.kernel.org/r/20170828104650.2u3rsim4jafyjzv2@hirez.programming.kicks-ass.net


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

arch/x86/events/core.c

+28 −5
Original line number Diff line number Diff line
@@ -1757,10 +1757,7 @@ ssize_t x86_event_sysfs_show(char *page, u64 config, u64 event) 
}



static struct attribute_group x86_pmu_attr_group;



static struct attribute_group x86_pmu_caps_group = {

	.name = "caps",

};

static struct attribute_group x86_pmu_caps_group;



static int __init init_hw_perf_events(void)

{
@@ -1808,7 +1805,14 @@ static int __init init_hw_perf_events(void) 
				   0, x86_pmu.num_counters, 0, 0);



	x86_pmu_format_group.attrs = x86_pmu.format_attrs;

	x86_pmu_caps_group.attrs = x86_pmu.caps_attrs;



	if (x86_pmu.caps_attrs) {

		struct attribute **tmp;



		tmp = merge_attr(x86_pmu_caps_group.attrs, x86_pmu.caps_attrs);

		if (!WARN_ON(!tmp))

			x86_pmu_caps_group.attrs = tmp;

	}



	if (x86_pmu.event_attrs)

		x86_pmu_events_group.attrs = x86_pmu.event_attrs;
@@ -2224,6 +2228,25 @@ static struct attribute_group x86_pmu_attr_group = { 
	.attrs = x86_pmu_attrs,

};



static ssize_t max_precise_show(struct device *cdev,

				  struct device_attribute *attr,

				  char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", x86_pmu_max_precise());

}



static DEVICE_ATTR_RO(max_precise);



static struct attribute *x86_pmu_caps_attrs[] = {

	&dev_attr_max_precise.attr,

	NULL

};



static struct attribute_group x86_pmu_caps_group = {

	.name = "caps",

	.attrs = x86_pmu_caps_attrs,

};



static const struct attribute_group *x86_pmu_attr_groups[] = {

	&x86_pmu_attr_group,

	&x86_pmu_format_group,

arch/x86/events/intel/core.c

+2 −12
Original line number Diff line number Diff line
@@ -3820,18 +3820,8 @@ static ssize_t pmu_name_show(struct device *cdev, 


static DEVICE_ATTR_RO(pmu_name);



static ssize_t max_precise_show(struct device *cdev,

				  struct device_attribute *attr,

				  char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", x86_pmu_max_precise());

}



static DEVICE_ATTR_RO(max_precise);



static struct attribute *intel_pmu_caps_attrs[] = {

       &dev_attr_pmu_name.attr,

	&dev_attr_max_precise.attr,

       NULL

};