perf: Add active_entry list head to struct perf_event

This patch adds a new field to the struct perf_event.
It is intended to be used to chain events which are
active (enabled). It helps in the hardware layer
for PMUs which do not have actual counter restrictions, i.e.,
free running read-only counters. Active events are chained
as opposed to being tracked via the counter they use.

To save space we use a union with hlist_entry as both
are mutually exclusive (suggested by Jiri Olsa).

Signed-off-by: Stephane Eranian <[email protected]>
Reviewed-by: Andi Kleen <[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 2e069d1288df5f04e6982243d7cac0f7455cd31d..8f4a70f2eca8bd0a3f55c572ad967ca516a2d8e1 100644 (file)
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -319,7 +319,10 @@ struct perf_event {
         */
        struct list_head                migrate_entry;
 
-       struct hlist_node               hlist_entry;
+       union {
+               struct hlist_node       hlist_entry;
+               struct list_head        active_entry;
+       };
        int                             nr_siblings;
        int                             group_flags;
        struct perf_event               *group_leader;

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 72348dc192c11e7a85560b67bc792415d969e22f..403b781daafb694ef9baa94e5a176212a23678e1 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6655,6 +6655,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
        INIT_LIST_HEAD(&event->event_entry);
        INIT_LIST_HEAD(&event->sibling_list);
        INIT_LIST_HEAD(&event->rb_entry);
+       INIT_LIST_HEAD(&event->active_entry);
 
        init_waitqueue_head(&event->waitq);
        init_irq_work(&event->pending, perf_pending_event);