From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.49 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793158315; b=EAjbcwxsOHjqbz9JakSyy7iFnGGZ3U/MvszLv9dDQPEzZvMDsk6OnP8vAe1Ra6l18EJX L9Ns3IbnYjYx50s5GEuDg0oNcU/B6MJ9A+ULL+FJB/kAqMn0kU2nzGyPshbDIN4aDANvK ZhRfKAeDlrnZDN8NQEYsMYLXP7ln1aSveEPD0V9R9tsEr+Rv44kjjQMumci+JznkVd/rQ wtgTLpHxikJCvNeIQpyAtHkztHyfTNLBHFeJWr3enyGXTLVczMzu0KqAxBAAclGvNEOym uMBX+luzcQ1QJxkvgzwwhhE59xdxVxU7D88cqDaCR0YMYOeW+yoQ2u2F04TTOjJeXnA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793158315; 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=4bZvL/9Bc8+ZGmd5br85IbVSWoa0e2ud1GyeOTF2PTQ=; b=FVDhVFb5tlPB5YOvACnnLRyqDmkjd+7aQ1UBAlAN1DeoIS4EJ3RLm/buW4y1SiIjnHZL yWqGJ49xjwcV/AT8BnuTSfWNFlq95c2LftRzRg3up1TKVXjUy9HIG8Hx36DCrB62Hfhuk O9jul3ZU1LvNEwbyuo4ta9ilyOpjY5H2UcjW9dqEp7qa76441F008x6ETz9xzWTrC7hrr 5QfGAnTMjybANfz7Cc7TzHXTZ2kEqWb4uKp2ln/s7GPbeV/3W6z8Pc3ZfBbyqbP8uokO0 0RW5tQFYMS9TUE8vnVBpqtM1nDZAmPeF5vKT0UJdLvlCm4BcaiLh+KhG2M9nffZ/t+w== 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=dMmmb3sX; arc=none smtp.remote-ip=209.85.221.49 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.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 CCE9A606A32A for ; Wed, 28 Oct 2026 03:31:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org CCE9A606A32A 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=dMmmb3sX Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-48df4f540ebso224101f8f.3 for ; Tue, 27 Oct 2026 20:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793158313; x=1793763113; 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=4bZvL/9Bc8+ZGmd5br85IbVSWoa0e2ud1GyeOTF2PTQ=; b=dMmmb3sXN+9+WtWYT5GIYxukvgjY6lg7vM9vMpuXULzuhss44sjTF2Ww0uz6wBUVUP YeyXil4UPV//QQdO3O7MzMp32Q6YpRghE8pNsbChAsRVNxGn1XyXw2a6Q1cdD1l9do3/ Mpelq8RhzvmulGHfMQbtHfEmrTo/OyDUr27s14L52zhwTeIX1uJCQ0VKIatZERd4E4ID ILeSX8mL2xZoiZlK0PDPsikO1j7O9PBEuaFA6wJCnfEjmdArq0uwtfN7ov+2jQ/iXrp/ zOgQBZlvtPyLXkoa4VVx2lWoCP+MyFqTzLTwDCnuaxA7aL4zMUNzZ3ZaNT3fJ/QXt6bm steg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793158313; x=1793763113; 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=4bZvL/9Bc8+ZGmd5br85IbVSWoa0e2ud1GyeOTF2PTQ=; b=QdYaDdkFEux53XTgVOOWGtmRGXAPg03UTLorMrHIJtx+TKnaFqZxffhNJbi4r9YfN5 phMduniAabNKu5rQyu2esWouWgvAMfWf8cE0EgyYV02sxN54piTOFYp/BeeicFp3xuT5 GOvhegeeWmoKMTN8BHt7wc0zG305QMsoffPvmXtccJfZX9Z7J3vp6zGI8q1quv3PZ5z2 gRHnOF6v1xDLuXD1CcvJ59uAVrUXF7akSZ/vBUYcQK1KyFgljpL7VWNliibzY//Ay+Ts VfI2by3RCkPrIwg3Z1/ELsxnJV0MF9AeIzmq3cyfqEBGrMYsTt6N4NMvVk2EsCJNiRjW qTBQ== X-Forwarded-Encrypted: i=1; AKwUvBxjAAkyStX/gYqJoEdWgT6eAXM2U38A6mMuochqNYQHeDtWzGOXvlHsE0LcQLI//VPZe4ueeDUxI0c=@vger.kernel.org X-Gm-Message-State: AFq9FYI0P/e8RKf7c86LXj2JGLgq9JLrcjZWDf+Qoni9Q/IffDEX5rFb 0edrOvkCvRXgYBQQ3PO+tjnnMnvk0XG2K9CEq6r92TUmWcc7hoy9utIL X-Gm-Gg: AYBFou28q+zJcOOB56pXt+4FL/StUzD5qSbCIz0DjWrIlu1l5MhnyNbcGHah7crcxT3 wkqkhGnbdK22i91v7Xqg5kniWOY1ZHGFPYBg42vqYTFwYwPA0NRwqEf28YJ4NquTmoqSJDxoiGI +Gf+HswOCD/PrExbcastQz/Fr/L+RifREfoSZIIkLOtwjYOCRQkRqRhNNsG8aqC47JgakEkBLWX oUtbffDtwjmuO9iDw7FlTR/5MS1CBKxeFUbv5iUpW/S84nsEiy0GpsVEGIGkyMdUORG4jPi8R4N HasPx9DhkpmX5rr0Od8ZEfEI/IBA/35V565+Xs8cq3o+2Uqqfx1pZmJHSpsbGmzc7jTLk4eDHdn Mcs4ZyCCrkCFRjxJmIZ+3p6ogwAwnY112gAsuVA6vY4Qu4GCaoWudXiEzWpkQ4RhB2koAT86cLj MbB5f7fKHz+kfWuA5DyU4kIUXgsjrqRXZ2gdndcRC0jVIAbv0zQRNHJ5A1PZ3Z2Ts+TWPjKizLH IHAWm8E0gXplcPqsoubpbAwjJsvqywFzWzEPvlVOXuvW7KuySh/2E0/PpQQAI+DYlxxxMc809WH Ez9rAv/HXu5tbi8Ch/M7mMLcIabhqRmBgCfk/AoCKgP7qcbU4n/v0XjCA8395TWdOhkDQPxo7Z3 5Ar7AkEpZjxbDHtcSXL6PTujSCigqEiMxOFidXuAZOoSsaKf016PBICb7NNotSTw43v1lpvGevB uKImhEa0ndXMC+vOMmnOQhNbanPpjPmcTt X-Received: by 2002:a05:6000:1862:b0:48b:d9:cb52 with SMTP id ffacd0b85a97d-48e5d2f0870mr3087140f8f.27.1793158313112; Tue, 27 Oct 2026 20:31:53 -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.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 27 Oct 2026 20:31:51 -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 04/13] lockdep: Use raw access for pinned hardirq state Date: Wed, 28 Oct 2026 04:31:18 +0100 Message-Id: <20261028033127.82193-5-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-doc@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 irqentry_nmi_enter() reads lockdep's hardirq state before __nmi_enter() establishes NMI context. Arm64 does the same for its NMI-like EL1 debug entry. Both paths run with interrupts disabled and cannot migrate. lockdep_hardirqs_enabled() uses this_cpu_read(), whose preemption checks are unnecessary for these callers. Add a raw accessor and use it in the two entry paths and in lockdep_hardirqs_off(). Keep the existing accessor for callers which are not already pinned. Check the interrupt state before accessing per-CPU state in lockdep_hardirqs_off(), independently of warning suppression. On arm64, this change relies on __kern_my_cpu_offset() being forced inline by the earlier prerequisite patch so the call chain remains noinstr-safe. Assisted-by: LLM --- arch/arm64/kernel/entry-common.c | 6 +++--- include/linux/irqflags.h | 3 +++ kernel/entry/common.c | 2 +- kernel/locking/lockdep.c | 6 ++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c index 11d3f888fcd87..003f84109a913 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -177,9 +177,9 @@ asmlinkage void noinstr asm_exit_to_user_mode(struct pt_regs *regs) */ static noinstr irqentry_state_t arm64_enter_el1_dbg(struct pt_regs *regs) { - irqentry_state_t state; - - state.lockdep = lockdep_hardirqs_enabled(); + irqentry_state_t state = { + .lockdep = lockdep_hardirqs_enabled_raw(), + }; lockdep_hardirqs_off(CALLER_ADDR0); ct_nmi_enter(); diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h index 57b074e0cfbbb..5bc179a88e513 100644 --- a/include/linux/irqflags.h +++ b/include/linux/irqflags.h @@ -52,6 +52,8 @@ extern void trace_hardirqs_off(void); # define lockdep_hardirq_context() (raw_cpu_read(hardirq_context)) # define lockdep_softirq_context(p) ((p)->softirq_context) # define lockdep_hardirqs_enabled() (this_cpu_read(hardirqs_enabled)) +/* The caller must already be pinned to the current CPU. */ +# define lockdep_hardirqs_enabled_raw() (raw_cpu_read(hardirqs_enabled)) # define lockdep_softirqs_enabled(p) ((p)->softirqs_enabled) # define lockdep_hardirq_enter() \ do { \ @@ -113,6 +115,7 @@ do { \ # define lockdep_hardirq_context() 0 # define lockdep_softirq_context(p) 0 # define lockdep_hardirqs_enabled() 0 +# define lockdep_hardirqs_enabled_raw() 0 # define lockdep_softirqs_enabled(p) 0 # define lockdep_hardirq_enter() do { } while (0) # define lockdep_hardirq_threaded() do { } while (0) diff --git a/kernel/entry/common.c b/kernel/entry/common.c index e234b04373fea..2f5229132466c 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -158,7 +158,7 @@ irqentry_state_t noinstr irqentry_nmi_enter(struct pt_regs *regs) { irqentry_state_t irq_state; - irq_state.lockdep = lockdep_hardirqs_enabled(); + irq_state.lockdep = lockdep_hardirqs_enabled_raw(); __nmi_enter(); lockdep_hardirqs_off(CALLER_ADDR0); diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index c3dc84a7cef26..01dba8fb32a90 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -4543,10 +4543,12 @@ void noinstr lockdep_hardirqs_off(unsigned long ip) * So we're supposed to get called after you mask local IRQs, but for * some reason the hardware doesn't quite think you did a proper job. */ - if (DEBUG_LOCKS_WARN_ON(!irqs_disabled())) + if (unlikely(!irqs_disabled())) { + DEBUG_LOCKS_WARN_ON(1); return; + } - if (lockdep_hardirqs_enabled()) { + if (lockdep_hardirqs_enabled_raw()) { struct irqtrace_events *trace = ¤t->irqtrace; /* -- 2.39.5 (Apple Git-154)