From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.49 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793158324; b=OpLqZkMeKwWzW1qXy3qkH9IgyqrkyGk3v1S/FpdFvWIN+tr8wRpfIm3Ea4H8yg5YlT1C 5YwjUyeZNydc5C8psrF4BC0Z2JjnJLaCPWBoKpskanrfb3UklSKBR6MSk43LT7umB2EaD GuogVV1a/FFItOS03Y9bdIPYyCeghBQtil3ImS651GjK0fJpwtxe+EY62lQE3Kq5yoYnd RuGqRAsIO+H/kt1ooU710z0cxeiDRz05cvjdPTWQeCZ30fQ3yY0P/v9B6/gWLA/p5P8v4 OD2ywi5FTMv2IZzHEbBqcmSmZ//jHVNKsYx6uBjXeywBLXozvHWJZBFCEn1eMw3VQdQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793158324; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=Jtc1fVPemAMqEoN4axaTKj+FevgUODBLdLJA6bSk8XM=; b=PJdg74Rjz+P/E0+6LOAucfBGzZ+IxcPe8tXs8OQD7S47yMfWATIF71eQt/I0+CoGJNO7 AVvfAF/8xaH9B2OrpmaH2Y3lDPnI9YihJ3sBT0CNzwvd0llLjDNy5wUEXXvNQFGWfby52 M0vlXZBwIBlEUTCjqPdf6ShM/guHVK3qE+CxE1xLKPM7tDXWoHaa85y6usj6rfeR+n/mN WrNH5KnOvTLYVl1R571sHiRlHUtGFSeyFZOThmles2t72fXeMN9aTZjx26R2E10xVVS+X nXlHfMx9NV0a1NbtHNRZqz9KYdWqelIzm0eSlc4wY75l4cquQAS/DHm2++v26vowFnA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=YN1rJqSK; arc=none smtp.remote-ip=209.85.128.49 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D924606A32C for ; Wed, 28 Oct 2026 03:32:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1D924606A32C 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=YN1rJqSK Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4a7992e2f7dso4035985e9.3 for ; Tue, 27 Oct 2026 20:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793158322; x=1793763122; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Jtc1fVPemAMqEoN4axaTKj+FevgUODBLdLJA6bSk8XM=; b=YN1rJqSK4kfGeTi3P9WEN2JcOPI2UwtVuMHGOQaZb+j2qAUU19Wd43m8weFH5DCDIU oztgwHo2X4/DH4+lDGlZTTG0uzpvImrec4k3MMl2JOqzmXv0lWNmfWGNG4MRNO/cP1kj BjPEfioEt4GzPmC2+szafeNnMWTndPrJMTFgzrHa/dX8xVXt7gD/2HLhfc6Z5XZOPkEz Wlq+WwlG5/OkzQGWXtYwujgaBGaEImDIopp0Y0RfpHYLGom3sZkhuaPBDz9dH1ZIdnAr ep5D63bTpGGi1gSnuPoQVrZXkOv5pU68+AWIt5RHiZjQlRMhjyEr6VUrVqHg7hMNadCn A3jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793158322; x=1793763122; h=content-transfer-encoding:mime-version:references:in-reply-to :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=Jtc1fVPemAMqEoN4axaTKj+FevgUODBLdLJA6bSk8XM=; b=rLmKYWJwQk9DqnqYI+ZEXLhw9Vdlgp5wjvyBbOo62AzUhBUjme9iUYhjZ0HijYLAnn BT1/bqsUkcsUhYl/h/nRdZGpAqj//L32OiQmnX3GHagkZNEokVkTBblhgDlA96IhfMrq 5pLwbxdPdQZpwEf+f+CG2Y4TQlzbYaijB/u9uJQ+G40AMysRog5X/VnUOzPglwc+YePl some+ZjBPCsspfkMRCQ6QxwfT8PFxR+FEkxhB1swTspa/nvL7Egfk7FChfpWgQR24P5P mfduph7OB6M1VTepPzoDpx2BkLMntmeqvAoUL3cUZSBCxRVJUG9Df3KfEK0J335Dw2dA 0KnA== X-Forwarded-Encrypted: i=1; AKwUvBzACoZHxWJJq36eIqbfD4N/sWmdoYKYestW8w6cDkbd0a4++k83Fid/lB6moDaSKsUi68kZCacFXPsVreA=@vger.kernel.org X-Gm-Message-State: AFq9FYIdUClZZOw8YY8xeZ56bkgPAcaMifCvxd3XuhjOAxiWo4U/uz1W j1d/kAeKWaidJR8cPcSeuyeqtpXPgQZIaAvZR8i4iPKYugZLOWNUTOcu X-Gm-Gg: AYBFou0VLKdFSvQBAhbZDYl4poBUhpQL58YI3GnjK/zihZ37Y3usJ1DyX5/6ccc0Fhq EwwHSz+ov8x8h3JHunNiocuGgrj1jUzCAt+usrc+8soSOduGbJgDnriEkCUrgQT2dETojUs1vWP T23C3LzuC6wFZW/xyhySU9u8JMgelcSTViTZV8B4WO9Onll6CqhVX4OezrzKh5a+dKhCNkDFhmB vrbP/nfkVhOkz/DG944dZeEKOGiN2afct5wLincQRVUWqk8EgzDmiDr3JLVzwzDbQOmy2xEJYBn GEOqrtMr9xmjYV+Mh+tPGT19rt+XOKEgQp03IBTI3j/hmprFPoEl4EK09WPgJ0O9dYCX2+L1zeY QQMKYohvn3pbkLxq4xNVGgvqbahI321wRztceeMNpK/H9t4veaNGmPu0TrWC8UaAvPu8Qx0NvZD INK+tHprlIgV2Aq4X1okOLJ9tRdTpo26x5cJma+WuZAFxr+XtGGBLtbcUPHYcbvdlqcnXxZtQ7t 5ondBtDfooMHjTFoHdI+AILc3HxSNut6YXXDkqd21Mn4kB5IX4qB/YzI83fdvl7kxKey6nOvP7s ONUwnwFMVPthZFzdbkUiQsdm203XeLaVhFINVmn9X6KF1hHU2bN1G3DsRuKRQ89juUQV0yasDm2 yUx/LfgkmcRBdMC6h27SPY55/9zsy8sKIS+WNstziMzvGNRqRsdyFmTj0gEUEBf821u1UmdQ1li NtZOd6Td5xoYeQZXHkIwx0iR7DRNBwV8iL X-Received: by 2002:a05:600c:a314:b0:4a3:5d64:df91 with SMTP id 5b1f17b1804b1-4a96b29d208mr13460435e9.18.1793158322397; Tue, 27 Oct 2026 20:32:02 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-a45b-7d01-5035-b393-698f-53f0.310.pool.telefonica.de. [2a02:3100:a45b:7d01:5035:b393:698f:53f0]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48e3ecdfd8dsm24290569f8f.56.2026.10.27.20.31.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 27 Oct 2026 20:32:01 -0700 (PDT) From: Karl Mehltretter To: Steven Rostedt , Peter Zijlstra , Thomas Gleixner , Sebastian Andrzej Siewior Cc: Karl Mehltretter , Catalin Marinas , Will Deacon , Mark Rutland , Ingo Molnar , Andy Lutomirski , Frederic Weisbecker , "Paul E. McKenney" , Boqun Feng , Waiman Long , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Ben Segall , Mel Gorman , Valentin Schneider , K Prateek Nayak , Hongyan Xia , Jonathan Corbet , Shuah Khan , Randy Dunlap , Andrew Morton , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-arm-kernel@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, linux-doc@vger.kernel.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH v2 07/13] context_tracking: Split IRQ-exit preparation from the EQS transition Date: Wed, 28 Oct 2026 04:31:21 +0100 Message-Id: <20261028033127.82193-8-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261028033127.82193-1-kmehltretter@gmail.com> References: <20261028033127.82193-1-kmehltretter@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ct_irq_exit() combines traceable nesting and tracepoint work with the final transition to an RCU extended quiescent state. A pre-counted ordinary hardirq return needs to run that preparation before its synthetic hardirq classification is removed, but it must enter the quiescent state only after the raw count and lockdep teardown. Split IRQ exit into prepare and finish phases. The prepare phase validates and updates interrupt nesting, then emits the tracepoint while RCU is watching. The finish phase performs the raw quiescent-state transition and RCU Tasks bookkeeping. Keep ct_irq_exit() and ct_nmi_exit() as adjacent prepare and finish wrappers. Existing IRQ and NMI callers retain their ordering and behavior. Assisted-by: LLM --- include/linux/context_tracking_irq.h | 32 +++++++++++- kernel/context_tracking.c | 78 ++++++++++++++++++++++------ 2 files changed, 93 insertions(+), 17 deletions(-) diff --git a/include/linux/context_tracking_irq.h b/include/linux/context_tracking_irq.h index 197916ee91a4b..b038cd1249148 100644 --- a/include/linux/context_tracking_irq.h +++ b/include/linux/context_tracking_irq.h @@ -2,8 +2,23 @@ #ifndef _LINUX_CONTEXT_TRACKING_IRQ_H #define _LINUX_CONTEXT_TRACKING_IRQ_H +#include + +/** + * struct ct_irq_exit_state - Opaque context-tracking IRQ-exit state + * @exit_rcu: The interrupted context was in an RCU extended quiescent state + * + * This object is filled in by ct_irq_exit_prepare() and must be passed to the + * matching ct_irq_exit_finish(). Callers must consider its members private. + */ +struct ct_irq_exit_state { + bool exit_rcu; +}; + #ifdef CONFIG_CONTEXT_TRACKING_IDLE void ct_irq_enter(void); +struct ct_irq_exit_state ct_irq_exit_prepare(void); +void ct_irq_exit_finish(struct ct_irq_exit_state state); void ct_irq_exit(void); void ct_irq_enter_irqson(void); void ct_irq_exit_irqson(void); @@ -11,7 +26,22 @@ void ct_nmi_enter(void); void ct_nmi_exit(void); #else static __always_inline void ct_irq_enter(void) { } -static __always_inline void ct_irq_exit(void) { } +static __always_inline struct ct_irq_exit_state ct_irq_exit_prepare(void) +{ + return (struct ct_irq_exit_state) { }; +} + +static __always_inline void ct_irq_exit_finish(struct ct_irq_exit_state state) +{ + (void)state; +} + +static __always_inline void ct_irq_exit(void) +{ + struct ct_irq_exit_state state = ct_irq_exit_prepare(); + + ct_irq_exit_finish(state); +} static inline void ct_irq_enter_irqson(void) { } static inline void ct_irq_exit_irqson(void) { } static __always_inline void ct_nmi_enter(void) { } diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index a743e7ffa6c00..80ed8ec606c6a 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -169,20 +169,10 @@ static void noinstr ct_kernel_enter(bool user, int offset) instrumentation_end(); } -/** - * ct_nmi_exit - inform RCU of exit from NMI context - * - * If we are returning from the outermost NMI handler that interrupted an - * RCU-idle period, update ct->state and ct->nmi_nesting - * to let the RCU grace-period handling know that the CPU is back to - * being RCU-idle. - * - * If you add or remove a call to ct_nmi_exit(), be sure to test - * with CONFIG_RCU_EQS_DEBUG=y. - */ -void noinstr ct_nmi_exit(void) +static struct ct_irq_exit_state noinstr __ct_nmi_exit_prepare(void) { struct context_tracking *ct = this_cpu_ptr(&context_tracking); + struct ct_irq_exit_state state = { }; instrumentation_begin(); /* @@ -203,7 +193,7 @@ void noinstr ct_nmi_exit(void) WRITE_ONCE(ct->nmi_nesting, /* No store tearing. */ ct_nmi_nesting() - 2); instrumentation_end(); - return; + return state; } /* This NMI interrupted an RCU-idle CPU, restore RCU-idleness. */ @@ -213,6 +203,15 @@ void noinstr ct_nmi_exit(void) // instrumentation for the noinstr ct_kernel_exit_state() instrument_atomic_write(&ct->state, sizeof(ct->state)); instrumentation_end(); + state.exit_rcu = true; + + return state; +} + +static void noinstr __ct_nmi_exit_finish(struct ct_irq_exit_state state) +{ + if (!state.exit_rcu) + return; // RCU is watching here ... ct_kernel_exit_state(CT_RCU_WATCHING); @@ -222,6 +221,24 @@ void noinstr ct_nmi_exit(void) rcu_task_exit(); } +/** + * ct_nmi_exit - inform RCU of exit from NMI context + * + * If we are returning from the outermost NMI handler that interrupted an + * RCU-idle period, update ct->state and ct->nmi_nesting + * to let the RCU grace-period handling know that the CPU is back to + * being RCU-idle. + * + * If you add or remove a call to ct_nmi_exit(), be sure to test + * with CONFIG_RCU_EQS_DEBUG=y. + */ +void noinstr ct_nmi_exit(void) +{ + struct ct_irq_exit_state state = __ct_nmi_exit_prepare(); + + __ct_nmi_exit_finish(state); +} + /** * ct_nmi_enter - inform RCU of entry to NMI context * @@ -348,7 +365,35 @@ noinstr void ct_irq_enter(void) } /** - * ct_irq_exit - inform RCU that current CPU is exiting irq towards idle + * ct_irq_exit_prepare - prepare to exit an IRQ towards idle + * + * Perform the traceable part of an IRQ exit and return an opaque object for + * ct_irq_exit_finish(). RCU remains watching until the matching finish call. + * The caller must keep interrupts disabled, must not schedule or migrate, and + * must invoke ct_irq_exit_finish() exactly once. + * + * Return: An opaque object to pass to ct_irq_exit_finish(). + */ +struct ct_irq_exit_state noinstr ct_irq_exit_prepare(void) +{ + lockdep_assert_irqs_disabled(); + return __ct_nmi_exit_prepare(); +} + +/** + * ct_irq_exit_finish - finish exiting an IRQ towards idle + * @state: Return value from the matching ct_irq_exit_prepare() + * + * Complete a pending transition to an RCU extended quiescent state. Nothing + * traceable may run between this function and the low-level return path. + */ +void noinstr ct_irq_exit_finish(struct ct_irq_exit_state state) +{ + __ct_nmi_exit_finish(state); +} + +/** + * ct_irq_exit - inform RCU that current CPU is exiting IRQ towards idle * * Exit from an interrupt handler, which might possibly result in entering * idle mode, in other words, leaving the mode in which read-side critical @@ -368,8 +413,9 @@ noinstr void ct_irq_enter(void) */ noinstr void ct_irq_exit(void) { - lockdep_assert_irqs_disabled(); - ct_nmi_exit(); + struct ct_irq_exit_state state = ct_irq_exit_prepare(); + + ct_irq_exit_finish(state); } /* -- 2.39.5 (Apple Git-154)