From nobody Wed Sep 10 02:03:20 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6B14C7EE2F for ; Wed, 1 Mar 2023 14:19:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229706AbjCAOTa (ORCPT ); Wed, 1 Mar 2023 09:19:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230052AbjCAOSN (ORCPT ); Wed, 1 Mar 2023 09:18:13 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B56F1233FF for ; Wed, 1 Mar 2023 06:18:11 -0800 (PST) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1677680290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2MBIeOLlrHqRhX6QL4OE3pPIfaDDO8TjpNEVJjFfspc=; b=h7Lvvp03+RugOIGosqnBV98qAj+HcLzNQTqm9+o6HZ1lISBDOeGmPB/Ecm1yP5bNn1XFMI A60PEuXNon0i0Q5LQcDCAYgVAHnmE2AdZ8td3QUt9I4g/mQWjYedNSd588ZJUUx+uWJnzF P1smgh/N18IYFKSP96o/wkIwUNrOCSuj0CnjJGSR5Op8gmTBERzVgl8g3rMpHvjmv0cM33 hYPj1xgm2CHLuLFfFvEbKRxcwHHO0w67nREzs0m81OnfLkjqGGCfHUC7bzW3i3I7T3vk0d i1Uor+G5huRXWcm2/nl84DQ95oE0KjBlnhIx54qFdi8PggMimR4qV5TTHqb5Qg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1677680290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2MBIeOLlrHqRhX6QL4OE3pPIfaDDO8TjpNEVJjFfspc=; b=iWOek0rkR5+g5UYio1TKLdxrwr+KT6aNCz5E0yId2wsyU/6Yhc9iwIe1a+mXeY+tkeQwcb 3slQN7mWQuW0FeAg== To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , John Stultz , Thomas Gleixner , Eric Dumazet , "Rafael J . Wysocki" , Arjan van de Ven , "Paul E . McKenney" , Frederic Weisbecker , Rik van Riel , Anna-Maria Behnsen Subject: [PATCH v5 17/18] timer_migration: Add tracepoints Date: Wed, 1 Mar 2023 15:17:43 +0100 Message-Id: <20230301141744.16063-18-anna-maria@linutronix.de> In-Reply-To: <20230301141744.16063-1-anna-maria@linutronix.de> References: <20230301141744.16063-1-anna-maria@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The timer pull logic needs proper debugging aids. Add tracepoints so the hierarchical idle machinery can be diagnosed. Signed-off-by: Anna-Maria Behnsen --- include/trace/events/timer_migration.h | 277 +++++++++++++++++++++++++ kernel/time/timer_migration.c | 24 +++ 2 files changed, 301 insertions(+) create mode 100644 include/trace/events/timer_migration.h diff --git a/include/trace/events/timer_migration.h b/include/trace/events/= timer_migration.h new file mode 100644 index 000000000000..0c4824056930 --- /dev/null +++ b/include/trace/events/timer_migration.h @@ -0,0 +1,277 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM timer_migration + +#if !defined(_TRACE_TIMER_MIGRATION_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_TIMER_MIGRATION_H + +#include + +/* Group events */ +TRACE_EVENT(tmigr_group_set, + + TP_PROTO(struct tmigr_group *group), + + TP_ARGS(group), + + TP_STRUCT__entry( + __field( void *, group ) + __field( unsigned int, lvl ) + __field( unsigned int, numa_node ) + ), + + TP_fast_assign( + __entry->group =3D group; + __entry->lvl =3D group->level; + __entry->numa_node =3D group->numa_node; + ), + + TP_printk("group=3D%p lvl=3D%d numa=3D%d", + __entry->group, __entry->lvl, __entry->numa_node) +); + +TRACE_EVENT(tmigr_connect_child_parent, + + TP_PROTO(struct tmigr_group *child), + + TP_ARGS(child), + + TP_STRUCT__entry( + __field( void *, child ) + __field( void *, parent ) + __field( unsigned int, lvl ) + __field( unsigned int, numa_node ) + __field( unsigned int, num_childs ) + __field( u32, childmask ) + ), + + TP_fast_assign( + __entry->child =3D child; + __entry->parent =3D child->parent; + __entry->lvl =3D child->parent->level; + __entry->numa_node =3D child->parent->numa_node; + __entry->numa_node =3D child->parent->num_childs; + __entry->childmask =3D child->childmask; + ), + + TP_printk("group=3D%p childmask=3D%0x parent=3D%p lvl=3D%d numa=3D%d num_= childs=3D%d", + __entry->child, __entry->childmask, __entry->parent, + __entry->lvl, __entry->numa_node, __entry->num_childs) +); + +TRACE_EVENT(tmigr_connect_cpu_parent, + + TP_PROTO(struct tmigr_cpu *tmc), + + TP_ARGS(tmc), + + TP_STRUCT__entry( + __field( void *, parent ) + __field( unsigned int, cpu ) + __field( unsigned int, lvl ) + __field( unsigned int, numa_node ) + __field( unsigned int, num_childs ) + __field( u32, childmask ) + ), + + TP_fast_assign( + __entry->parent =3D tmc->tmgroup; + __entry->cpu =3D tmc->cpuevt.cpu; + __entry->lvl =3D tmc->tmgroup->level; + __entry->numa_node =3D tmc->tmgroup->numa_node; + __entry->numa_node =3D tmc->tmgroup->num_childs; + __entry->childmask =3D tmc->childmask; + ), + + TP_printk("cpu=3D%d childmask=3D%0x parent=3D%p lvl=3D%d numa=3D%d num_ch= ilds=3D%d", + __entry->cpu, __entry->childmask, __entry->parent, + __entry->lvl, __entry->numa_node, __entry->num_childs) +); + +DECLARE_EVENT_CLASS(tmigr_group_and_cpu, + + TP_PROTO(struct tmigr_group *group, union tmigr_state state, u32 childmas= k), + + TP_ARGS(group, state, childmask), + + TP_STRUCT__entry( + __field( void *, group ) + __field( void *, parent ) + __field( unsigned int, lvl ) + __field( unsigned int, numa_node ) + __field( u8, active ) + __field( u8, migrator ) + __field( u32, childmask ) + ), + + TP_fast_assign( + __entry->group =3D group; + __entry->parent =3D group->parent; + __entry->lvl =3D group->level; + __entry->numa_node =3D group->numa_node; + __entry->active =3D state.active; + __entry->migrator =3D state.migrator; + __entry->childmask =3D childmask; + ), + + TP_printk("group=3D%p lvl=3D%d numa=3D%d active=3D%0x migrator=3D%0x " + "parent=3D%p childmask=3D%0x", + __entry->group, __entry->lvl, __entry->numa_node, + __entry->active, __entry->migrator, + __entry->parent, __entry->childmask) +); + +DEFINE_EVENT(tmigr_group_and_cpu, tmigr_group_set_cpu_inactive, + + TP_PROTO(struct tmigr_group *group, union tmigr_state state, u32 childmas= k), + + TP_ARGS(group, state, childmask) +); + +DEFINE_EVENT(tmigr_group_and_cpu, tmigr_group_set_cpu_active, + + TP_PROTO(struct tmigr_group *group, union tmigr_state state, u32 childmas= k), + + TP_ARGS(group, state, childmask) +); + +/* CPU events*/ +DECLARE_EVENT_CLASS(tmigr_cpugroup, + + TP_PROTO(struct tmigr_cpu *tmc), + + TP_ARGS(tmc), + + TP_STRUCT__entry( + __field( void *, parent) + __field( unsigned int, cpu) + ), + + TP_fast_assign( + __entry->cpu =3D tmc->cpuevt.cpu; + __entry->parent =3D tmc->tmgroup; + ), + + TP_printk("cpu=3D%d parent=3D%p", __entry->cpu, __entry->parent) +); + +DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_new_timer, + + TP_PROTO(struct tmigr_cpu *tmc), + + TP_ARGS(tmc) +); + +DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_active, + + TP_PROTO(struct tmigr_cpu *tmc), + + TP_ARGS(tmc) +); + +DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_online, + + TP_PROTO(struct tmigr_cpu *tmc), + + TP_ARGS(tmc) +); + +DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_offline, + + TP_PROTO(struct tmigr_cpu *tmc), + + TP_ARGS(tmc) +); + +DEFINE_EVENT(tmigr_cpugroup, tmigr_handle_remote_cpu, + + TP_PROTO(struct tmigr_cpu *tmc), + + TP_ARGS(tmc) +); + +TRACE_EVENT(tmigr_cpu_idle, + + TP_PROTO(struct tmigr_cpu *tmc, u64 nextevt), + + TP_ARGS(tmc, nextevt), + + TP_STRUCT__entry( + __field( void *, parent) + __field( unsigned int, cpu) + __field( u64, nextevt) + ), + + TP_fast_assign( + __entry->cpu =3D tmc->cpuevt.cpu; + __entry->parent =3D tmc->tmgroup; + __entry->nextevt =3D nextevt; + ), + + TP_printk("cpu=3D%d parent=3D%p nextevt=3D%llu", + __entry->cpu, __entry->parent, __entry->nextevt) +); + +TRACE_EVENT(tmigr_update_events, + + TP_PROTO(struct tmigr_group *child, struct tmigr_group *group, + union tmigr_state childstate, union tmigr_state groupstate, + u64 nextevt), + + TP_ARGS(child, group, childstate, groupstate, nextevt), + + TP_STRUCT__entry( + __field( void *, child ) + __field( void *, group ) + __field( u64, nextevt ) + __field( u64, group_next_expiry ) + __field( unsigned int, group_lvl ) + __field( u8, child_active ) + __field( u8, group_active ) + __field( unsigned int, child_evtcpu ) + __field( u64, child_evt_expiry ) + ), + + TP_fast_assign( + __entry->child =3D child; + __entry->group =3D group; + __entry->nextevt =3D nextevt; + __entry->group_next_expiry =3D group->next_expiry; + __entry->group_lvl =3D group->level; + __entry->child_active =3D childstate.active; + __entry->group_active =3D groupstate.active; + __entry->child_evtcpu =3D child ? child->groupevt.cpu : 0; + __entry->child_evt_expiry =3D child ? child->groupevt.nextevt.expires : = 0; + ), + + TP_printk("child=3D%p group=3D%p group_lvl=3D%d child_active=3D%0x group_= active=3D%0x " + "nextevt=3D%llu next_expiry=3D%llu child_evt_expiry=3D%llu child_evtcp= u=3D%d", + __entry->child, __entry->group, __entry->group_lvl, __entry->child_act= ive, + __entry->group_active, + __entry->nextevt, __entry->group_next_expiry, __entry->child_evt_expir= y, + __entry->child_evtcpu) +); + +TRACE_EVENT(tmigr_handle_remote, + + TP_PROTO(struct tmigr_group *group), + + TP_ARGS(group), + + TP_STRUCT__entry( + __field( void * , group ) + __field( unsigned int , lvl ) + ), + + TP_fast_assign( + __entry->group =3D group; + __entry->lvl =3D group->level; + ), + + TP_printk("group=3D%p lvl=3D%d", + __entry->group, __entry->lvl) +); + +#endif /* _TRACE_TIMER_MIGRATION_H */ + +/* This part must be outside protection */ +#include diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c index 5a600de3623b..5a371bc252d4 100644 --- a/kernel/time/timer_migration.c +++ b/kernel/time/timer_migration.c @@ -13,6 +13,9 @@ #include "timer_migration.h" #include "tick-internal.h" =20 +#define CREATE_TRACE_POINTS +#include + /* * The timer migration mechanism is built on a hierarchy of groups. The * lowest level group contains CPUs, the next level groups of CPU groups @@ -320,6 +323,8 @@ static bool tmigr_active_up(struct tmigr_group *group, */ group->groupevt.ignore =3D 1; =20 + trace_tmigr_group_set_cpu_active(group, newstate, childmask); + return walk_done; } =20 @@ -344,6 +349,7 @@ void tmigr_cpu_activate(void) raw_spin_lock(&tmc->lock); tmc->idle =3D 0; tmc->wakeup =3D KTIME_MAX; + trace_tmigr_cpu_active(tmc); __tmigr_cpu_activate(tmc); raw_spin_unlock(&tmc->lock); } @@ -450,6 +456,9 @@ static bool tmigr_update_events(struct tmigr_group *gro= up, data->nextexp =3D tmigr_next_groupevt_expires(group); } =20 + trace_tmigr_update_events(child, group, data->childstate, + data->groupstate, nextexp); + unlock: raw_spin_unlock(&group->lock); =20 @@ -493,6 +502,8 @@ static u64 tmigr_new_timer(struct tmigr_cpu *tmc, u64 n= extexp) if (tmc->remote) return KTIME_MAX; =20 + trace_tmigr_cpu_new_timer(tmc); + tmc->cpuevt.ignore =3D 0; =20 data.groupstate.state =3D atomic_read(tmc->tmgroup->migr_state); @@ -593,6 +604,8 @@ static bool tmigr_inactive_up(struct tmigr_group *group, } } =20 + trace_tmigr_group_set_cpu_inactive(group, newstate, childmask); + return walk_done; } =20 @@ -669,6 +682,7 @@ u64 tmigr_cpu_deactivate(u64 nextexp) tmc->idle =3D 1; =20 unlock: + trace_tmigr_cpu_idle(tmc, ret); raw_spin_unlock(&tmc->lock); return ret; } @@ -695,6 +709,8 @@ static u64 tmigr_handle_remote_cpu(unsigned int cpu, u6= 4 now, return next; } =20 + trace_tmigr_handle_remote_cpu(tmc); + tmc->remote =3D 1; =20 /* Drop the lock to allow the remote CPU to exit idle */ @@ -746,6 +762,7 @@ static bool tmigr_handle_remote_up(struct tmigr_group *= group, =20 childmask =3D data->childmask; =20 + trace_tmigr_handle_remote(group); again: /* * Handle the group only if @childmask is the migrator or if the @@ -979,6 +996,7 @@ static struct tmigr_group *tmigr_get_group(unsigned int= cpu, unsigned int node, tmigr_init_group(group, lvl, node, migr_state); /* Setup successful. Add it to the hierarchy */ list_add(&group->list, &tmigr_level_list[lvl]); + trace_tmigr_group_set(group); return group; } =20 @@ -997,6 +1015,8 @@ static void tmigr_connect_child_parent(struct tmigr_gr= oup *child, raw_spin_unlock(&parent->lock); raw_spin_unlock_irqrestore(&child->lock, flags); =20 + trace_tmigr_connect_child_parent(child); + /* * To prevent inconsistent states, active childs needs to be active * in new parent as well. Inactive childs are already marked @@ -1083,6 +1103,8 @@ static int tmigr_setup_groups(unsigned int cpu, unsig= ned int node) =20 raw_spin_unlock_irqrestore(&group->lock, flags); =20 + trace_tmigr_connect_cpu_parent(tmc); + /* There are no childs that needs to be connected */ continue; } else { @@ -1151,6 +1173,7 @@ static int tmigr_cpu_online(unsigned int cpu) tmc->wakeup =3D KTIME_MAX; } raw_spin_lock_irqsave(&tmc->lock, flags); + trace_tmigr_cpu_online(tmc); __tmigr_cpu_activate(tmc); tmc->online =3D 1; raw_spin_unlock_irqrestore(&tmc->lock, flags); @@ -1164,6 +1187,7 @@ static int tmigr_cpu_offline(unsigned int cpu) raw_spin_lock_irq(&tmc->lock); tmc->online =3D 0; __tmigr_cpu_deactivate(tmc, KTIME_MAX); + trace_tmigr_cpu_offline(tmc); raw_spin_unlock_irq(&tmc->lock); =20 return 0; --=20 2.30.2