|
@@ -1716,8 +1716,8 @@ static inline int pmu_filter_match(struct perf_event *event)
|
|
|
static inline int
|
|
|
event_filter_match(struct perf_event *event)
|
|
|
{
|
|
|
- return (event->cpu == -1 || event->cpu == smp_processor_id())
|
|
|
- && perf_cgroup_match(event) && pmu_filter_match(event);
|
|
|
+ return (event->cpu == -1 || event->cpu == smp_processor_id()) &&
|
|
|
+ perf_cgroup_match(event) && pmu_filter_match(event);
|
|
|
}
|
|
|
|
|
|
static void
|
|
@@ -1737,8 +1737,8 @@ event_sched_out(struct perf_event *event,
|
|
|
* maintained, otherwise bogus information is return
|
|
|
* via read() for time_enabled, time_running:
|
|
|
*/
|
|
|
- if (event->state == PERF_EVENT_STATE_INACTIVE
|
|
|
- && !event_filter_match(event)) {
|
|
|
+ if (event->state == PERF_EVENT_STATE_INACTIVE &&
|
|
|
+ !event_filter_match(event)) {
|
|
|
delta = tstamp - event->tstamp_stopped;
|
|
|
event->tstamp_running += delta;
|
|
|
event->tstamp_stopped = tstamp;
|
|
@@ -2236,10 +2236,15 @@ perf_install_in_context(struct perf_event_context *ctx,
|
|
|
|
|
|
lockdep_assert_held(&ctx->mutex);
|
|
|
|
|
|
- event->ctx = ctx;
|
|
|
if (event->cpu != -1)
|
|
|
event->cpu = cpu;
|
|
|
|
|
|
+ /*
|
|
|
+ * Ensures that if we can observe event->ctx, both the event and ctx
|
|
|
+ * will be 'complete'. See perf_iterate_sb_cpu().
|
|
|
+ */
|
|
|
+ smp_store_release(&event->ctx, ctx);
|
|
|
+
|
|
|
if (!task) {
|
|
|
cpu_function_call(cpu, __perf_install_in_context, event);
|
|
|
return;
|
|
@@ -5969,6 +5974,14 @@ static void perf_iterate_sb_cpu(perf_iterate_f output, void *data)
|
|
|
struct perf_event *event;
|
|
|
|
|
|
list_for_each_entry_rcu(event, &pel->list, sb_list) {
|
|
|
+ /*
|
|
|
+ * Skip events that are not fully formed yet; ensure that
|
|
|
+ * if we observe event->ctx, both event and ctx will be
|
|
|
+ * complete enough. See perf_install_in_context().
|
|
|
+ */
|
|
|
+ if (!smp_load_acquire(&event->ctx))
|
|
|
+ continue;
|
|
|
+
|
|
|
if (event->state < PERF_EVENT_STATE_INACTIVE)
|
|
|
continue;
|
|
|
if (!event_filter_match(event))
|