Skip to content

Commit

Permalink
perf/x86: Fix caps/ for !Intel
Browse files Browse the repository at this point in the history
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: Borislav Petkov <bp@suse.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Andi 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: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Aug 29, 2017
1 parent fc7ce9c commit 5da382e
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 17 deletions.
33 changes: 28 additions & 5 deletions arch/x86/events/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
14 changes: 2 additions & 12 deletions arch/x86/events/intel/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3820,19 +3820,9 @@ 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
&dev_attr_pmu_name.attr,
NULL
};

static struct attribute *intel_pmu_attrs[] = {
Expand Down

0 comments on commit 5da382e

Please sign in to comment.