Re: [RFC PATCH v2 1/9] tracing/irq: Add generic IRQ context boundary tracepoints
From: Gabriele Monaco
Date: Sat Nov 21 2026 - 05:26:59 EST
On Sat, 2026-11-07 at 18:12 +0100, Karl Mehltretter wrote:
...
> void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)
> {
> + unsigned long trace_flags = 0;
> unsigned long flags;
> + bool trace_serving;
> int newcnt;
>
> WARN_ON_ONCE(in_hardirq());
> @@ -200,6 +202,16 @@ void __local_bh_disable_ip(unsigned long ip, unsigned int
> cnt)
> }
> }
>
> + /*
> + * A serving interval starts here, before handle_softirqs(). When its
> + * entry is traced, keep IRQs and task switches from observing the
> bit
> + * before the event. Any blocking BH lock was acquired above.
> + */
> + trace_serving = (cnt & SOFTIRQ_OFFSET) &&
> + trace_softirq_context_entry_tp_enabled();
> + if (trace_serving)
> + local_irq_save(trace_flags);
> +
> /*
> * Track the per CPU softirq disabled state. On RT this is per CPU
> * state to allow preemption of bottom half disabled sections.
> @@ -233,15 +245,27 @@ void __local_bh_disable_ip(unsigned long ip, unsigned
> int cnt)
> raw_local_irq_restore(flags);
> }
> }
> +
> + if (trace_serving) {
> + trace_softirq_context_entry_tp(!!in_serving_softirq(),
> false);
Probably someone more experienced with this code can comment whether the
tracepoints and other things you do make sense, you're going to need an
ack from these folks anyway.
>From the tracing point of view. You're doing good avoiding any extra
action if trace_##_enabled() is false. Since you are already checking
for it, you may simplify the call to the tracepoint, essentially
trace_##_tp() <=> if (trace_##_enabled()) trace_call__##_tp()
As you see, you're basically checking for the static key twice. Not a
big deal but you can use the new API and skip it:
s/trace_softirq_context_entry_tp/trace_call__sched_set_state_tp/
Obviously you do the trace_call__##_tp() function ONLY if you're already
checking the static key.
> + local_irq_restore(trace_flags);
> + }
> }
> EXPORT_SYMBOL(__local_bh_disable_ip);
>
> static void __local_bh_enable(unsigned int cnt, bool unlock)
> {
> + bool entering = (cnt & SOFTIRQ_OFFSET) && !in_serving_softirq();
> + bool trace_exiting = (cnt & SOFTIRQ_OFFSET) && !entering &&
> + trace_softirq_context_exit_tp_enabled();
> unsigned long flags;
> bool sirq_en = false;
> int newcnt;
>
> + /* Callers already disabled IRQs around the counter and its events.
> */
> + if (trace_exiting)
> + trace_softirq_context_exit_tp(!!in_serving_softirq(), false);
Here as well, you're checking so you can simply trace_call()
> +
> if (IS_ENABLED(CONFIG_PREEMPT_RT_NEEDS_BH_LOCK)) {
> DEBUG_LOCKS_WARN_ON(current->softirq_disable_cnt !=
> this_cpu_read(softirq_ctrl.cnt));
> @@ -276,6 +300,18 @@ static void __local_bh_enable(unsigned int cnt, bool
> unlock)
> WARN_ON_ONCE(current->softirq_disable_cnt < 0);
> }
> }
> +
> + /*
> + * An exit probe can raise a softirq while serving state still
> suppresses
> + * the normal ksoftirqd wakeup. Hand it off once no outer BH-disable
> + * reference remains.
> + */
> + if (trace_exiting && sirq_en && unlikely(local_softirq_pending()))
> + wakeup_softirqd();
> +
> + /* local_bh_enable() can turn BH-disabled state into serving state.
> */
> + if (entering)
> + trace_softirq_context_entry_tp(!!in_serving_softirq(),
> false);
Here for example, entering doesn't check the static key so you must keep
the tracing as is.
> }
>
> void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
> @@ -640,11 +676,15 @@ static void handle_softirqs(bool ksirqd)
> */
> current->flags &= ~PF_MEMALLOC;
>
> - pending = local_softirq_pending();
> -
> from_irq_exit = softirq_handle_begin();
> in_hardirq = lockdep_softirq_start();
> account_softirq_enter(current);
> + if (!IS_ENABLED(CONFIG_PREEMPT_RT))
> + trace_softirq_context_entry_tp(!!in_serving_softirq(),
> + from_irq_exit);
> +
> + /* Include work raised by the context-entry event. */
> + pending = local_softirq_pending();
>
> restart:
> /* Reset the pending bitmask before enabling irqs */
> @@ -692,6 +732,14 @@ static void handle_softirqs(bool ksirqd)
> wakeup_softirqd();
> }
>
> + if (!IS_ENABLED(CONFIG_PREEMPT_RT) &&
> + trace_softirq_context_exit_tp_enabled()) {
> + trace_softirq_context_exit_tp(!!in_serving_softirq(),
> + from_irq_exit);
> + /* The final pending-work decision above has already
> completed. */
> + if (unlikely(local_softirq_pending()))
> + wakeup_softirqd();
> + }
> account_softirq_exit(current);
> lockdep_softirq_end(in_hardirq);
> softirq_handle_end(from_irq_exit);
> @@ -722,6 +770,7 @@ void irq_enter_rcu(void)
> tick_irq_enter();
>
> account_hardirq_enter(current);
> + trace_hardirq_context_entry_tp(hardirq_count() >> HARDIRQ_SHIFT);
Here again, no check, so keep it as is.
Thanks,
Gabriele