[PATCH RFC] perf, core: disable pmu while context rotation only ifneeded

[Gleb Natapov]

Currently pmu is disabled and re-enabled on each timer interrupt even
when no rotation or frequency adjustment is needed. On Intel CPU this
results in two writes into PERF_GLOBAL_CTRL MSR per tick. On bare metal
it does not cause significant slowdown, but when running perf in a virtual
machine it leads to 20% slowdown on my machine.

Signed-off-by: Gleb Natapov <gleb@xxxxxxxxxx>
diff --git a/kernel/events/core.c b/kernel/events/core.c
index bdcd413..83c87d8 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2317,7 +2317,7 @@ static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
 	}
 }
 
-static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
+static bool perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period, bool pmu_disabled)
 {
 	struct perf_event *event;
 	struct hw_perf_event *hwc;
@@ -2347,6 +2347,11 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
 		if (!event->attr.freq || !event->attr.sample_freq)
 			continue;
 
+		if (!pmu_disabled) {
+			perf_pmu_disable(ctx->pmu);
+			pmu_disabled = true;
+		}
+
 		event->pmu->read(event);
 		now = local64_read(&event->count);
 		delta = now - hwc->freq_count_stamp;
@@ -2355,6 +2360,8 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
 		if (delta > 0)
 			perf_adjust_period(event, period, delta);
 	}
+
+	return pmu_disabled;
 }
 
 /*
@@ -2380,6 +2387,7 @@ static void perf_rotate_context(struct perf_cpu_context *cpuctx)
 	u64 interval = (u64)cpuctx->jiffies_interval * TICK_NSEC;
 	struct perf_event_context *ctx = NULL;
 	int rotate = 0, remove = 1;
+	bool pmu_disabled = false;
 
 	if (cpuctx->ctx.nr_events) {
 		remove = 0;
@@ -2395,10 +2403,9 @@ static void perf_rotate_context(struct perf_cpu_context *cpuctx)
 	}
 
 	perf_ctx_lock(cpuctx, cpuctx->task_ctx);
-	perf_pmu_disable(cpuctx->ctx.pmu);
-	perf_ctx_adjust_freq(&cpuctx->ctx, interval);
+	pmu_disabled = perf_ctx_adjust_freq(&cpuctx->ctx, interval, pmu_disabled);
 	if (ctx)
-		perf_ctx_adjust_freq(ctx, interval);
+		pmu_disabled = perf_ctx_adjust_freq(ctx, interval, pmu_disabled);
 
 	if (!rotate)
 		goto done;
@@ -2417,7 +2424,8 @@ done:
 	if (remove)
 		list_del_init(&cpuctx->rotation_list);
 
-	perf_pmu_enable(cpuctx->ctx.pmu);
+	if (pmu_disabled)
+		perf_pmu_enable(cpuctx->ctx.pmu);
 	perf_ctx_unlock(cpuctx, cpuctx->task_ctx);
 }
 
--
			Gleb.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/