From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 023EF28DB55 for ; Sat, 26 Sep 2026 14:35:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790433314; cv=none; b=pq2X2Vs/Bla2Wy91v1WLunnUVV8p43nIwQ2FT3CQIhcdqVyth9JF/u3WUjHdHLvGj5/e1VKYzzdpiDBaTKESmLPQqrYj7eRuw36wrGc08l3NqSBtocG5pktOSrNUdFV8JuOO7ZqLwFhOiaGi9+k0ZdQoL09YJGCjg6bC/2MnRL0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790433314; c=relaxed/simple; bh=JveIdfMnbEYqobIaG4H/0vVCYtVazpDPoziCms40STk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=pOexnVA9hm0RxTmu4XFTrgpjYchUgz8zJrB/oLPhF1+++HMsX6yb6ggN9OnQTNHGCaFhu3t99PoYf8WZ5NygBcVxQE/2Dy1n2FXcgaHCCXxrsS8dgo1+PeCtjbGV9ijj8Zo78itHJv0KRS32VaX0U3XTEqUY+CTwRoOzs3dfHXI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BLnqVR1/; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BLnqVR1/" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49ccead2aecso8179775e9.0 for ; Sat, 26 Sep 2026 07:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790433311; x=1791038111; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=sRi2uvg9/167pPQxsIteWZThRIVLdNuXQXVpU9sXzLQ=; b=BLnqVR1/lCxtlwXYd+QzB/SwAC6wHkKRGIWuhhfhn/PUs3rZH5oNR9GurtJHoPKr2F 5XH1n0jtlHJR+C4mK4/4M/DTPMTYKHGxXw2b6H8QahqTow2yLhRLB7SKbkOkMftjeI+y 2zDc5VFBAkntYxTOMEvmqC264Ern0JuesAM65EgTTU57sxlsK5otVTwbF6fk0AkLU9n6 dD/xpxDNbLAfyAx5X+mwyCqg1j7mQFxr7oHyCSassNtr8+Oa/uqM7T46VCARkVBFBvuj KLqb6mFbVDp4+OIcuqW6amTrcI/A5zU3SI4ia7Pqq0s/Wx7txWuqHGRtlkDCSbF0xAvV DF7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790433311; x=1791038111; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=sRi2uvg9/167pPQxsIteWZThRIVLdNuXQXVpU9sXzLQ=; b=AAi5EspAd4aoebG0udU+f407DFd4lVNpnvRYN7YXcMPuY9uTFxkMSCU7jiTWx7Hk9G hNcahMtd82b30MeYxatMHIxoFNTlKJ3Qz0DtLmvHnlDTVyIy81jN3FD8wYL/y6MtTuY/ RVRbIgdmUEisYCKcHAFjs5hUfQdNluaETsHZskTzJQLCCiwJ9xLnfXmxwiiSEN2hpIOi fztpSi1beOmobkHZCihgCNb6LrjIAjHOgwnc+vDEx6sEkUEwkNdw/1UXBTPABoaZsdu3 RKduZmyc6IgNIu2SodHR87EeKyWaPhgMdsbTeGlMr7vRlavexHyTxwd6ff1itNthD2dm Fbsw== X-Forwarded-Encrypted: i=1; AKwUvBySgZydzzxx9pcNGs5nCkvsXNwHvaBvwBvfPw2t+/2aq2EkxBzvlEdwS3Q8D96DIdQ8gp6QeqBr2to=@vger.kernel.org X-Gm-Message-State: AFuF++nUKTutqCFc717PeQOu9XeHk3OOb7Rb+kk1otaxY7RYq0wDtfRH ee/XEpGwJwcCqYtMIBrurzziBzxzdDFj4g3VG65e5QewoihZJ4t69WVp X-Gm-Gg: AYBFou1DOh1TmVzDaq/D5J9KgrXWcIEo2wibTZwICFBUmcMBtsppCxzrbTUERCmGUw/ TR3YOvoxq8vUODy5Zb7n3QfQ8CRlnfTJ5Kn20yD0ECX6c7pltYKKN0KouyObIQNBS1i4E9/2b0Y klSgWFirJ9aJz51u+3CZzlv5v8ILIzNUE8xBhdJz9VepCsPTo6cr+l5owFwYCC+EB3TQE//198n 5kCzGtMQ9koSWPxF1WdF0ipYMPP8zCK6MwGu1Ik3QX65WcRMJ25clFlE9DBoVBaFpT0buly7TFz CNCQuLNrFLLU8Lyd3Gbk0+2bnHEsZBwHPovQdQZQSIg8QfXmgXE40Z8QAwHTGppgCWw66El3TMd 7VJ+HjWgvDi6GYM1kbOzV0SPYs4F3QMys2stORei1+B2wdZW+bBcBKckGpR+2l66bnkZjIbhpRa wq+Kv8j4dujmYL40SDkK/rjdmKZUybhYAmZcQtnHZI2ZJYTGI+Spd3p1W3rQ0G0LunD6fMVZmaU ZcXLzYBvTFYogncsp/N5iuA5yEIHn//yxzAvoStig34eLBdyxP3YZGahqcETNHDFtFmCEdHe+8u kCIJl0E9YuVviWU4nLTPsVzQWwLOk/fYYz8Xd3iyMjxZgOGOFIewKGtJ1HMxilH1iOVZd5aR+pZ i0+xxn0iyl9XQ X-Received: by 2002:a05:600c:3107:b0:49c:cee2:1697 with SMTP id 5b1f17b1804b1-49ff06e502dmr96350065e9.16.1790433310920; Sat, 26 Sep 2026 07:35:10 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-b162-c701-4960-a998-3de8-2fce.310.pool.telefonica.de. [2a02:3100:b162:c701:4960:a998:3de8:2fce]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4887a64ef3asm14533819f8f.30.2026.09.26.07.35.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 26 Sep 2026 07:35:10 -0700 (PDT) From: Karl Mehltretter To: Peter Zijlstra , Thomas Gleixner Cc: Karl Mehltretter , Sebastian Andrzej Siewior , Frederic Weisbecker , Clark Williams , Steven Rostedt , Boqun Feng , Lyude Paul , Joel Fernandes , Alexander Potapenko , Marco Elver , Jonathan Corbet , Bradley Morgan , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev Subject: [PATCH v4] softirq: Preserve interrupt context during IRQ exit Date: Sat, 26 Sep 2026 16:35:05 +0200 Message-Id: <20260926143505.66024-1-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On the return from interrupt path, __irq_exit_rcu() removes HARDIRQ_OFFSET from the preemption counter at the very top of the function. Everything after that reports the current context as task instead of hard interrupt. The code in the function itself, such as invoke_softirq(), is aware of this and does not rely on the counter. Everything else which derives the context from preempt_count gets it wrong in that window: - ftrace, perf and the ring buffer record task context and use the task recursion and context slots. - KCSAN attributes the accesses to the interrupted task, KMSAN uses and changes its state. KCOV and the printk caller id see a task. - On PREEMPT_RT can_spin_trylock() and local_trylock() reject hard interrupt context to avoid interfering with PI when the interrupted task is blocked on a lock. That check does not reject calls made in this window. BPF programs attached to sched_waking or sched_wakeup can reach it through kmalloc_nolock(). - An oops kills the interrupted task instead of ending in "Fatal exception in interrupt". Tracing and the sanitizers see the wrong context in this window. No failure caused by this misclassification is known. The early removal of HARDIRQ_OFFSET predates git. lockdep is not affected because lockdep_hardirq_exit() is the last operation in irq_exit(). Keep HARDIRQ_OFFSET until right before tick_irq_exit(), which needs in_hardirq() to be false for the outermost interrupt. Softirq handlers must not run with HARDIRQ_OFFSET set, so softirq_handle_begin() replaces it with SOFTIRQ_OFFSET and softirq_handle_end() reverts that, each in a single raw preempt_count update. The raw operations keep the preemption disable location recorded by irq_enter_rcu(), and lockdep is updated by hand. softirq_handle_begin() detects the case with in_hardirq() because __do_softirq() is reached through the stack switch in do_softirq_own_stack() and cannot take an argument. The checks run before HARDIRQ_OFFSET is removed. !in_interrupt() becomes irq_count() == HARDIRQ_OFFSET, as in irq_enter_rcu(). The timer thread check becomes !in_nmi() && hardirq_count() == HARDIRQ_OFFSET. It does not test softirq_count(): the timer thread must also wake when the interrupt hit softirq processing or a section with BHs disabled. A softirq raised in the timer thread wakeup is handled by the timer thread, which handles all pending softirqs. A softirq raised from a tracepoint on the final preempt_count_sub() waits for the next interrupt exit and can trigger NOHZ tick-stop warnings meanwhile. That is not the normal path and does not justify a check on every interrupt exit. A tracepoint on tick_irq_exit() already behaves the same way. The number of preempt_count updates and the interrupt time accounting are unchanged. The preemptoff tracer now reports the interrupt and the softirq processing on top of it as one section, and function graph with nofuncgraph-irqs also skips the interrupt exit work, including the __do_softirq() frame. Suggested-by: Peter Zijlstra Link: https://lore.kernel.org/r/20260813130826.GW687043@noisy.programming.kicks-ass.net Assisted-by: LLM Signed-off-by: Karl Mehltretter Reviewed-by: Bradley Morgan --- Notes: Thanks for the review, Sebastian, and for the Reviewed-by, Bradley. Changes in v4: - Drop the ksoftirqd wakeup after the final preempt_count_sub(). A tracepoint consumer raising a softirq there is not a path to cater for (Sebastian). - Reword the first changelog paragraph (Sebastian). - Rebase on v7.3-rc4, which contains the prerequisites a155ac8f0c52 and 2af470916a20. tip/irq/core does not have them yet. - Keep the Reviewed-by from v3. The only code change is the removal above. Testing: the v4 code is the v3 code without the trailing check, which is the state that ran on the x86-64 and arm64 QEMU matrix, the SAM9X75 (also RT) and the Raspberry Pi 500+ (also RT) before v3 was posted. The Pi 400 ran the variant with the check. On v7.3-rc4, base against v4 booted and stressed cleanly in QEMU on arm64 (virt, SMP, lockdep) and arm32 (versatilepb, lockdep). v3: https://lore.kernel.org/r/20260924041538.52574-1-kmehltretter@gmail.com v2: https://lore.kernel.org/r/20260905023210.82853-1-kmehltretter@gmail.com Documentation/core-api/entry.rst | 16 +++++--- kernel/softirq.c | 65 ++++++++++++++++++++++++++------ 2 files changed, 63 insertions(+), 18 deletions(-) diff --git a/Documentation/core-api/entry.rst b/Documentation/core-api/entry.rst index 79fdaed954d9..ff3df997b151 100644 --- a/Documentation/core-api/entry.rst +++ b/Documentation/core-api/entry.rst @@ -197,8 +197,9 @@ return true, handles NOHZ tick state and interrupt time accounting. This means that up to the point where irq_enter_rcu() is invoked in_hardirq() returns false. -irq_exit_rcu() handles interrupt time accounting, undoes the preemption -count update and eventually handles soft interrupts and NOHZ tick state. +irq_exit_rcu() handles interrupt time accounting, handles soft interrupts if +possible, undoes the preemption count update and finally handles the NOHZ tick +state. In theory, the preemption count could be updated in irqentry_enter(). In practice, deferring this update to irq_enter_rcu() allows the preemption-count @@ -207,10 +208,13 @@ irqentry_exit(), which are described in the next paragraph. The only downside is that the early entry code up to irq_enter_rcu() must be aware that the preemption count has not yet been updated with the HARDIRQ_OFFSET state. -Note that irq_exit_rcu() must remove HARDIRQ_OFFSET from the preemption count -before it handles soft interrupts, whose handlers must run in BH context rather -than irq-disabled context. In addition, irqentry_exit() might schedule, which -also requires that HARDIRQ_OFFSET has been removed from the preemption count. +Note that soft interrupt handlers must run in BH context rather than in hard +interrupt context. irq_exit_rcu() therefore replaces HARDIRQ_OFFSET with +SOFTIRQ_OFFSET in the preemption count while it handles soft interrupts and +puts HARDIRQ_OFFSET back afterwards, so that the remaining interrupt exit work +is still attributed to the interrupt. HARDIRQ_OFFSET is removed before +irq_exit_rcu() returns because irqentry_exit() might schedule, which requires +that HARDIRQ_OFFSET has been removed from the preemption count. Even though interrupt handlers are expected to run with local interrupts disabled, interrupt nesting is common from an entry/exit perspective. For diff --git a/kernel/softirq.c b/kernel/softirq.c index 5d02c36c40e3..12e3e4493767 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -350,8 +350,8 @@ static inline void ksoftirqd_run_end(void) local_irq_enable(); } -static inline void softirq_handle_begin(void) { } -static inline void softirq_handle_end(void) { } +static inline bool softirq_handle_begin(void) { return false; } +static inline void softirq_handle_end(bool from_irq_exit) { } static inline bool should_wake_ksoftirqd(void) { @@ -481,15 +481,40 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) } EXPORT_SYMBOL(__local_bh_enable_ip); -static inline void softirq_handle_begin(void) +static inline bool softirq_handle_begin(void) { - __local_bh_disable_ip(_RET_IP_, SOFTIRQ_OFFSET); + bool from_irq_exit = in_hardirq(); + + if (!from_irq_exit) { + __local_bh_disable_ip(_RET_IP_, SOFTIRQ_OFFSET); + return false; + } + + /* + * Only reached from irq_exit(), with HARDIRQ_OFFSET still set. + * Replace it with SOFTIRQ_OFFSET before handle_softirqs() enables + * interrupts. Use the raw operation to preserve the preemption + * disable location recorded by irq_enter_rcu(), and update lockdep + * directly. + */ + __preempt_count_sub(HARDIRQ_OFFSET - SOFTIRQ_OFFSET); + lockdep_softirqs_off(_RET_IP_); + WARN_ON_ONCE(irq_count() != SOFTIRQ_OFFSET); + + return true; } -static inline void softirq_handle_end(void) +static inline void softirq_handle_end(bool from_irq_exit) { - __local_bh_enable(SOFTIRQ_OFFSET); - WARN_ON_ONCE(in_interrupt()); + if (!from_irq_exit) { + __local_bh_enable(SOFTIRQ_OFFSET); + WARN_ON_ONCE(in_interrupt()); + return; + } + + lockdep_softirqs_on(_RET_IP_); + __preempt_count_add(HARDIRQ_OFFSET - SOFTIRQ_OFFSET); + WARN_ON_ONCE(irq_count() != HARDIRQ_OFFSET); } static inline void ksoftirqd_run_begin(void) @@ -605,6 +630,7 @@ static void handle_softirqs(bool ksirqd) unsigned long old_flags = current->flags; int max_restart = MAX_SOFTIRQ_RESTART; struct softirq_action *h; + bool from_irq_exit; bool in_hardirq; __u32 pending; int softirq_bit; @@ -618,7 +644,7 @@ static void handle_softirqs(bool ksirqd) pending = local_softirq_pending(); - softirq_handle_begin(); + from_irq_exit = softirq_handle_begin(); in_hardirq = lockdep_softirq_start(); account_softirq_enter(current); @@ -670,7 +696,7 @@ static void handle_softirqs(bool ksirqd) account_softirq_exit(current); lockdep_softirq_end(in_hardirq); - softirq_handle_end(); + softirq_handle_end(from_irq_exit); current_restore_flags(old_flags, PF_MEMALLOC); } @@ -748,8 +774,12 @@ static inline void __irq_exit_rcu(void) lockdep_assert_irqs_disabled(); #endif account_hardirq_exit(current); - preempt_count_sub(HARDIRQ_OFFSET); - if (!in_interrupt() && local_softirq_pending()) { + + /* + * HARDIRQ_OFFSET is still set. Only the outermost interrupt handles + * softirqs, and only if it did not hit a softirq or BH disabled section. + */ + if (irq_count() == HARDIRQ_OFFSET && local_softirq_pending()) { /* * If we left hrtimers unarmed, make sure to arm them now, * before enabling interrupts to run softirq. @@ -758,10 +788,21 @@ static inline void __irq_exit_rcu(void) invoke_softirq(); } + /* + * Wake the timer thread even if the interrupt hit a softirq or a + * section with BHs disabled. Only nested interrupts and NMIs are + * excluded. + */ if (IS_ENABLED(CONFIG_IRQ_FORCED_THREADING) && force_irqthreads() && - local_timers_pending_force_th() && !(in_nmi() | in_hardirq())) + local_timers_pending_force_th() && + !in_nmi() && hardirq_count() == HARDIRQ_OFFSET) wake_timersd(); + /* + * tick_irq_exit() relies on in_hardirq() being false for the + * outermost interrupt. + */ + preempt_count_sub(HARDIRQ_OFFSET); tick_irq_exit(); } base-commit: 93f51579e7df248780214094418f205253383cc5 -- 2.39.5 (Apple Git-154)