perf/core: Split perf_event_read() and perf_event_count()

jira LE-1907
Rebuild_History Non-Buildable kernel-3.10.0-514.el7
commit-author Sukadev Bhattiprolu <[email protected]>
commit 01add3e

perf_event_read() does two things:

	- call the PMU to read/update the counter value, and
	- compute the total count of the event and its children

Not all callers need both. perf_event_reset() for instance needs the
first piece but doesn't need the second.  Similarly, when we implement
the ability to read a group of events using the transaction interface,
we would need the two pieces done independently.

Break up perf_event_read() and have it just read/update the counter
and have the callers compute the total count if necessary.

	Signed-off-by: Sukadev Bhattiprolu <[email protected]>
	Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
	Cc: Arnaldo Carvalho de Melo <[email protected]>
	Cc: Arnaldo Carvalho de Melo <[email protected]>
	Cc: Jiri Olsa <[email protected]>
	Cc: Linus Torvalds <[email protected]>
	Cc: Michael Ellerman <[email protected]>
	Cc: Peter Zijlstra <[email protected]>
	Cc: Stephane Eranian <[email protected]>
	Cc: Thomas Gleixner <[email protected]>
	Cc: Vince Weaver <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
	Signed-off-by: Ingo Molnar <[email protected]>
(cherry picked from commit 01add3e)
	Signed-off-by: Jonathan Maple <[email protected]>

Author: PlaidCat

kernel/events/core.c

@@ -3278,7 +3278,7 @@ u64 perf_event_read_local(struct perf_event *event)
 	return val;
 }
 
-static u64 perf_event_read(struct perf_event *event)
+static void perf_event_read(struct perf_event *event)
 {
 	/*
 	 * If event is enabled and currently active on a CPU, update the
@@ -3304,8 +3304,6 @@ static u64 perf_event_read(struct perf_event *event)
 		update_event_times(event);
 		raw_spin_unlock_irqrestore(&ctx->lock, flags);
 	}
-
-	return perf_event_count(event);
 }
 
 /*
@@ -3734,14 +3732,18 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
 	*running = 0;
 
 	mutex_lock(&event->child_mutex);
-	total += perf_event_read(event);
+
+	perf_event_read(event);
+	total += perf_event_count(event);
+
 	*enabled += event->total_time_enabled +
 			atomic64_read(&event->child_total_time_enabled);
 	*running += event->total_time_running +
 			atomic64_read(&event->child_total_time_running);
 
 	list_for_each_entry(child, &event->child_list, child_list) {
-		total += perf_event_read(child);
+		perf_event_read(child);
+		total += perf_event_count(child);
 		*enabled += child->total_time_enabled;
 		*running += child->total_time_running;
 	}
@@ -3901,7 +3903,7 @@ static unsigned int perf_poll(struct file *file, poll_table *wait)
 
 static void _perf_event_reset(struct perf_event *event)
 {
-	(void)perf_event_read(event);
+	perf_event_read(event);
 	local64_set(&event->count, 0);
 	perf_event_update_userpage(event);
 }