Commit-ID: 4c38cd7b6641f3f2cdf9c4f450c2628e2e400c1e Gitweb: http://git.kernel.org/tip/4c38cd7b6641f3f2cdf9c4f450c2628e2e400c1e Author: Andi Kleen <a...@linux.intel.com> AuthorDate: Thu, 24 Jan 2013 16:10:25 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Fri, 25 Jan 2013 10:19:00 +0100
perf/x86: Support CPU specific sysfs events Add a way for the CPU initialization code to register additional events, and merge them into the events attribute directory. Used in the next patch. Signed-off-by: Andi Kleen <a...@linux.intel.com> Signed-off-by: Stephane Eranian <eran...@google.com> Cc: pet...@infradead.org Cc: a...@redhat.com Cc: jo...@redhat.com Cc: namhyung....@lge.com Link: http://lkml.kernel.org/r/1359040242-8269-2-git-send-email-eran...@google.com [ small cleanups ] Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/kernel/cpu/perf_event.c | 34 ++++++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/perf_event.h | 1 + 2 files changed, 35 insertions(+) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 6774c17..f133091 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1335,6 +1335,32 @@ static void __init filter_events(struct attribute **attrs) } } +/* Merge two pointer arrays */ +static __init struct attribute **merge_attr(struct attribute **a, struct attribute **b) +{ + struct attribute **new; + int j, i; + + for (j = 0; a[j]; j++) + ; + for (i = 0; b[i]; i++) + j++; + j++; + + new = kmalloc(sizeof(struct attribute *) * j, GFP_KERNEL); + if (!new) + return NULL; + + j = 0; + for (i = 0; a[i]; i++) + new[j++] = a[i]; + for (i = 0; b[i]; i++) + new[j++] = b[i]; + new[j] = NULL; + + return new; +} + static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr, char *page) { @@ -1476,6 +1502,14 @@ static int __init init_hw_perf_events(void) else filter_events(x86_pmu_events_group.attrs); + if (x86_pmu.cpu_events) { + struct attribute *tmp; + + tmp = merge_attr(x86_pmu_events_group.attrs, x86_pmu.cpu_events); + if (!WARN_ON(!tmp)) + x86_pmu_events_group.attrs = tmp; + } + pr_info("... version: %d\n", x86_pmu.version); pr_info("... bit width: %d\n", x86_pmu.cntval_bits); pr_info("... generic registers: %d\n", x86_pmu.num_counters); diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h index 115c1ea..4170043 100644 --- a/arch/x86/kernel/cpu/perf_event.h +++ b/arch/x86/kernel/cpu/perf_event.h @@ -355,6 +355,7 @@ struct x86_pmu { struct attribute **format_attrs; ssize_t (*events_sysfs_show)(char *page, u64 config); + struct attribute **cpu_events; /* * CPU Hotplug hooks -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
