From nobody Mon Feb 9 00:42:31 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9BA91E9B06; Sat, 1 Mar 2025 20:07:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740859657; cv=none; b=LuvZ4h1A/ST2X2sHPRbDWlQQxVAtI5P5CkGH7k31s+4MylgPuT680t9Tt8fmX5owHLSDvK2BzP4pNghdmaUwYys62rHLvbLvRDSaShCDhbCycivNmXNFvUrfGT8IZfriTxyTYVFkHpqOJKNxHECEtCQxQFFJ10RCSYVVdz6lKt0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740859657; c=relaxed/simple; bh=s8eIo/4SwsbtJrV8C6yBN0TvnmjBYfFpPBd7ANnufi8=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=okcCx/jZmdwxoFZKkZIXG8Lwkl4ud2O2RpNIu7ibeX2hmCasHDKcU92SjjP+F8aVBNxjbW3Pk/RwNf1PnIDDF+e+d6HKvxnDrQIaOhLOLkK6sqfeq7t20E9hwf9i94r+zZE/4TVMWpVL+RbD8sQ0G8jXCQyq92vCHIfOlHJ5YTs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ff4T/FW8; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=K6WDjinu; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ff4T/FW8"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="K6WDjinu" Date: Sat, 01 Mar 2025 20:07:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1740859653; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=si8rhehKPygqBAoOUIxt3Y7Gfl/q4HDc8tup3lO9F2U=; b=ff4T/FW8gLGtrUwTjJtKixnRsKAkvoqbimCy8jHB/SaFdWgwa5CsSm14pgnxMea41PNReA klzn3MPXGKNh43n5OVe0Jvj4iYqbfXy37q8GQmg+d04KgwlQdbRF4a6aWAePsSJpt0lcbF Xv3OuleHPFQNqBE4y88gUPEeoRVEeTeU2XAMlwWkF/8OZjlvkd/V11P7ozbyMQJeTgdQm1 mVYXkxzRIoBLom2VaDdPRe3yep4C7aN2PdlLldQfcDWCj0gJUSY9tl3hOGBxFY9Mtc7LV3 9qeGyjkh6dIg6Nkmw/5eyzYy0Cc6zgyGlEqHzpqtDQtXi25fo0B0LLbCI8Pccg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1740859653; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=si8rhehKPygqBAoOUIxt3Y7Gfl/q4HDc8tup3lO9F2U=; b=K6WDjinurMiI6g56ncRQWmWAlP9ShrXatxv87f3it99KnXvMW716uPiQGDDkGUCRnFx3yn QghFaO0ex4sXsGBg== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf/core: Add this_cpc() helper Cc: "Peter Zijlstra (Intel)" , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20241104135518.650051565@infradead.org> References: <20241104135518.650051565@infradead.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174085965243.10177.4665996509088089666.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/core branch of tip: Commit-ID: a57411b14ea03d0d3acdf81f2df78df6307d3ad6 Gitweb: https://git.kernel.org/tip/a57411b14ea03d0d3acdf81f2df78df63= 07d3ad6 Author: Peter Zijlstra AuthorDate: Mon, 04 Nov 2024 14:39:19 +01:00 Committer: Ingo Molnar CommitterDate: Sat, 01 Mar 2025 20:02:24 +01:00 perf/core: Add this_cpc() helper As a preparation for adding yet another indirection. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20241104135518.650051565@infradead.org --- kernel/events/core.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 8321b71..0c7015f 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -1217,23 +1217,28 @@ static int perf_mux_hrtimer_restart_ipi(void *arg) return perf_mux_hrtimer_restart(arg); } =20 +static __always_inline struct perf_cpu_pmu_context *this_cpc(struct pmu *p= mu) +{ + return this_cpu_ptr(pmu->cpu_pmu_context); +} + void perf_pmu_disable(struct pmu *pmu) { - int *count =3D &this_cpu_ptr(pmu->cpu_pmu_context)->pmu_disable_count; + int *count =3D &this_cpc(pmu)->pmu_disable_count; if (!(*count)++) pmu->pmu_disable(pmu); } =20 void perf_pmu_enable(struct pmu *pmu) { - int *count =3D &this_cpu_ptr(pmu->cpu_pmu_context)->pmu_disable_count; + int *count =3D &this_cpc(pmu)->pmu_disable_count; if (!--(*count)) pmu->pmu_enable(pmu); } =20 static void perf_assert_pmu_disabled(struct pmu *pmu) { - int *count =3D &this_cpu_ptr(pmu->cpu_pmu_context)->pmu_disable_count; + int *count =3D &this_cpc(pmu)->pmu_disable_count; WARN_ON_ONCE(*count =3D=3D 0); } =20 @@ -2355,7 +2360,7 @@ static void event_sched_out(struct perf_event *event, struct perf_event_context *ctx) { struct perf_event_pmu_context *epc =3D event->pmu_ctx; - struct perf_cpu_pmu_context *cpc =3D this_cpu_ptr(epc->pmu->cpu_pmu_conte= xt); + struct perf_cpu_pmu_context *cpc =3D this_cpc(epc->pmu); enum perf_event_state state =3D PERF_EVENT_STATE_INACTIVE; =20 // XXX cpc serialization, probably per-cpu IRQ disabled @@ -2496,9 +2501,8 @@ __perf_remove_from_context(struct perf_event *event, pmu_ctx->rotate_necessary =3D 0; =20 if (ctx->task && ctx->is_active) { - struct perf_cpu_pmu_context *cpc; + struct perf_cpu_pmu_context *cpc =3D this_cpc(pmu_ctx->pmu); =20 - cpc =3D this_cpu_ptr(pmu_ctx->pmu->cpu_pmu_context); WARN_ON_ONCE(cpc->task_epc && cpc->task_epc !=3D pmu_ctx); cpc->task_epc =3D NULL; } @@ -2636,7 +2640,7 @@ static int event_sched_in(struct perf_event *event, struct perf_event_context *ctx) { struct perf_event_pmu_context *epc =3D event->pmu_ctx; - struct perf_cpu_pmu_context *cpc =3D this_cpu_ptr(epc->pmu->cpu_pmu_conte= xt); + struct perf_cpu_pmu_context *cpc =3D this_cpc(epc->pmu); int ret =3D 0; =20 WARN_ON_ONCE(event->ctx !=3D ctx); @@ -2743,7 +2747,7 @@ error: static int group_can_go_on(struct perf_event *event, int can_add_hw) { struct perf_event_pmu_context *epc =3D event->pmu_ctx; - struct perf_cpu_pmu_context *cpc =3D this_cpu_ptr(epc->pmu->cpu_pmu_conte= xt); + struct perf_cpu_pmu_context *cpc =3D this_cpc(epc->pmu); =20 /* * Groups consisting entirely of software events can always go on. @@ -3366,9 +3370,8 @@ static void __pmu_ctx_sched_out(struct perf_event_pmu= _context *pmu_ctx, struct pmu *pmu =3D pmu_ctx->pmu; =20 if (ctx->task && !(ctx->is_active & EVENT_ALL)) { - struct perf_cpu_pmu_context *cpc; + struct perf_cpu_pmu_context *cpc =3D this_cpc(pmu); =20 - cpc =3D this_cpu_ptr(pmu->cpu_pmu_context); WARN_ON_ONCE(cpc->task_epc && cpc->task_epc !=3D pmu_ctx); cpc->task_epc =3D NULL; } @@ -3615,7 +3618,7 @@ static void perf_ctx_sched_task_cb(struct perf_event_= context *ctx, bool sched_in struct perf_cpu_pmu_context *cpc; =20 list_for_each_entry(pmu_ctx, &ctx->pmu_ctx_list, pmu_ctx_entry) { - cpc =3D this_cpu_ptr(pmu_ctx->pmu->cpu_pmu_context); + cpc =3D this_cpc(pmu_ctx->pmu); =20 if (cpc->sched_cb_usage && pmu_ctx->pmu->sched_task) pmu_ctx->pmu->sched_task(pmu_ctx, sched_in); @@ -3724,7 +3727,7 @@ static DEFINE_PER_CPU(int, perf_sched_cb_usages); =20 void perf_sched_cb_dec(struct pmu *pmu) { - struct perf_cpu_pmu_context *cpc =3D this_cpu_ptr(pmu->cpu_pmu_context); + struct perf_cpu_pmu_context *cpc =3D this_cpc(pmu); =20 this_cpu_dec(perf_sched_cb_usages); barrier(); @@ -3736,7 +3739,7 @@ void perf_sched_cb_dec(struct pmu *pmu) =20 void perf_sched_cb_inc(struct pmu *pmu) { - struct perf_cpu_pmu_context *cpc =3D this_cpu_ptr(pmu->cpu_pmu_context); + struct perf_cpu_pmu_context *cpc =3D this_cpc(pmu); =20 if (!cpc->sched_cb_usage++) list_add(&cpc->sched_cb_entry, this_cpu_ptr(&sched_cb_list)); @@ -3853,7 +3856,7 @@ static void __link_epc(struct perf_event_pmu_context = *pmu_ctx) if (!pmu_ctx->ctx->task) return; =20 - cpc =3D this_cpu_ptr(pmu_ctx->pmu->cpu_pmu_context); + cpc =3D this_cpc(pmu_ctx->pmu); WARN_ON_ONCE(cpc->task_epc && cpc->task_epc !=3D pmu_ctx); cpc->task_epc =3D pmu_ctx; } @@ -3982,10 +3985,9 @@ static int merge_sched_in(struct perf_event *event, = void *data) perf_cgroup_event_disable(event, ctx); perf_event_set_state(event, PERF_EVENT_STATE_ERROR); } else { - struct perf_cpu_pmu_context *cpc; + struct perf_cpu_pmu_context *cpc =3D this_cpc(event->pmu_ctx->pmu); =20 event->pmu_ctx->rotate_necessary =3D 1; - cpc =3D this_cpu_ptr(event->pmu_ctx->pmu->cpu_pmu_context); perf_mux_hrtimer_restart(cpc); group_update_userpage(event); }