timers/migration: Improve tracing

Trace points of inactive and active propagation are located at the end of
the related functions. The interesting information of those trace points is
the updated group state. When trace points are not located directly at the
place where group state changed, order of trace points in traces could be
confusing.

Move inactive and active propagation trace points directly after update of
group state values.

Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20240716-tmigr-fixes-v4-3-757baa7803fe@linutronix.de

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 867f0ecf2e74f6d94734e29c2335c14b8a275319..4fbd9304e8964995a48768700e96c717c30e758b 100644 (file)
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -656,6 +656,8 @@ static bool tmigr_active_up(struct tmigr_group *group,
 
        } while (!atomic_try_cmpxchg(&group->migr_state, &curstate.state, newstate.state));
 
+       trace_tmigr_group_set_cpu_active(group, newstate, childmask);
+
        if (walk_done == false)
                data->childmask = group->childmask;
 
@@ -673,8 +675,6 @@ static bool tmigr_active_up(struct tmigr_group *group,
         */
        group->groupevt.ignore = true;
 
-       trace_tmigr_group_set_cpu_active(group, newstate, childmask);
-
        return walk_done;
 }
 
@@ -1306,9 +1306,10 @@ static bool tmigr_inactive_up(struct tmigr_group *group,
 
                WARN_ON_ONCE((newstate.migrator != TMIGR_NONE) && !(newstate.active));
 
-               if (atomic_try_cmpxchg(&group->migr_state, &curstate.state,
-                                      newstate.state))
+               if (atomic_try_cmpxchg(&group->migr_state, &curstate.state, newstate.state)) {
+                       trace_tmigr_group_set_cpu_inactive(group, newstate, childmask);
                        break;
+               }
 
                /*
                 * The memory barrier is paired with the cmpxchg() in
@@ -1327,8 +1328,6 @@ static bool tmigr_inactive_up(struct tmigr_group *group,
        if (walk_done == false)
                data->childmask = group->childmask;
 
-       trace_tmigr_group_set_cpu_inactive(group, newstate, childmask);
-
        return walk_done;
 }