From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.70 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795345013; b=g0hr6zleTI0qlh6PBOK/Uplpngy+2kxfCEdccku66h4WLcN0CIRmkTNOOCHvxjobo3Ay 5AET+VjC8vLAUn/BF3Dgz2yAyOuC8mtDaBBUnRpg0J8saE4fDif34l8v4ybf/QZtif37Y cegw4efRq3BBLmq0mUKYO498gYKh8CLwGQJcbcslGbPK0vvTICuXBI/eGEbzIEQF5Ep/o 2rV2rPYsPNL5k8RBxvSaYeD+trFZYHwRupExuAkRKR2x2mjPXjq55/ZCX66bbKnlDRhN9 os4PeN9+GNd5F/fMx+wtJ62mZ8FbJubwTLX8m4vcT7GAEIfZ0iCvuhYHczr0YcYkkDQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795345013; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Received:Date:Mime-Version:X-Developer-Key: X-Developer-Signature:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=TBdQn4iaXs4K3IS08zgLB1njZ8472GlpmHn+HZOS+/M=; b=YkzcAKurUF7XWZFKK6Lt4htrOAWhJRWjvkEn2Uj4Sj8IyAbzw2fxKGDR2ZGNuH7OX31s 3XCHolcYEfjdpYGKfZMQfhOzccHKOud1c7WlZVa97omOT3udHLmQ4YcPxDjUEu+ihhYyf Gbv6KzJqTuAEpm6xVn/CKeDehKL+yf+GQ0ffqhemHr2sI1L7BZGJ/G8STTtblh/X01xAY v1BSFQnywVixiQg+GDVoonDOAbxwtKAi5ysln1HefyVRLOpR4Mqj+/ie0SwhiZokhcr+d Qbd9BHuRidktlswaF8IvX/rRC+fY2vsCldGmpyxuOPVWohnFVwxb251R0iaArrCqOyg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=oXtOugmu; arc=none smtp.remote-ip=209.85.128.70 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (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 28231606A32A for ; Sun, 22 Nov 2026 10:56:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 28231606A32A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=oXtOugmu Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4bb68d624baso19173225e9.2 for ; Sun, 22 Nov 2026 02:56:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795345011; x=1795949811; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:mime-version:date:from :to:cc:subject:date:message-id:reply-to:content-type; bh=TBdQn4iaXs4K3IS08zgLB1njZ8472GlpmHn+HZOS+/M=; b=oXtOugmuHOFHmburj9SdXa8ZkbrkIgAB4CMd7Nx9R8Ckwt98ZJS+P4TQuz7HQjCse/ vgjNra6fDGMnqvw70Vp+CsT3XZIxEK+YSgwlBewcvJ/MRX1l9UOIj4xL7fuNtMBC6B8t d9cAWue5SLn2EkyPu0E83SutPxQfMjwXGlDlP+ogQlBAZEbeNWE6cNlBSBvZxIJxFkn/ DYLRstpxQXgGbQSQkZEoew6TvHnPlVX44wwsr+Mo+Bn0B5ikVSuWrJwpYl2TvPrs+6Ff t+FFevAoaevv1QKR4L+orL+MoMQp7HkUnFzxy0Yf+vVIbKWzmJE8XANB+DpYEsmr4bE0 jKPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795345011; x=1795949811; h=content-type:cc:to:from:subject:message-id:mime-version:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TBdQn4iaXs4K3IS08zgLB1njZ8472GlpmHn+HZOS+/M=; b=B6Pz88hB9nfw+tJy8sxsZW3i2JUMNqNjJBr4U4CptQ8O5T9bQGbXq2tiXoO55WiXxx jL/oEZn7hvwvAyyl9yPnZaoLOqri0KKlFDqZYFWg92vu+z0yrhS8tuEEqJHxly3nH1ea ixbl5imcgpsdef61186IH291XpbGaD62ObkRjDwFHJSHVKJBGrvgOa3292nXSY8gdnSH NtdJQPM5h2FHJjZcauZIAdX6iYfsZogFtVi409zVXdbkqPiJQAF2UMxCb96+tCMMjRxI HO32/q9akV51+4d+Omdyi8vjeefgw3hLW2ks0fLK68q1qJhQxjOFlS6mJOIW2enia4yu s1HA== X-Gm-Message-State: APuU4Z/3BCqUlF+94gSoOskg9ZdlvNNI1bj6OvicEYRXNQhyeEg6Wl8G AezTI67YZYmU1tO6xZCvZk4OvfwkY+PHGYDM7eugv8vktNfz3AzVw872opoUVP0+wtaaIOqRY/k vR/tAa1CZ4P5SyflRXwOIqIMKFh1FM/v18H1hMbsRekymnxKp62Hnjtwtz1ylxIiAtwBd5Gnr94 ZTbj/GXdXLqx0Eojg5Ob14Vhubh42AcDIIcA== X-Received: from wmej22.prod.google.com ([2002:a05:600c:42d6:b0:4bb:4bbf:7120]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1548:b0:4a3:59c9:a756 with SMTP id 5b1f17b1804b1-4bb88800013mr196849355e9.6.1795345011084; Sun, 22 Nov 2026 02:56:51 -0800 (PST) Date: Sun, 22 Nov 2026 11:56:47 +0100 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 X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=5956; i=ardb@kernel.org; h=from:subject; bh=DWnBtyBokAGUqkZ0KDweRYYnMpGBh6VqAzR3FDs49SA=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIZvpVP6UqzMkdP+Izn0/J3SjuelRjrdn5m1ZJ/Go1n5/9 4MrXtH9HaUsDGJcDLJiiiwCs/++23l6olSt8yxZmDmsTCBDGLg4BWAiIt8ZGaYLHvKZNzvbQr92 6g3Ztupb+3YoL5ric0lI+Mqe87p/U9MZGRbKZ0gd825UltvOclL1weJb/caNf0J+6Ac7ttSz78y bxAkA X-Mailer: git-send-email 2.56.1.750.gf70dc682cf-goog Message-ID: <20261122105646.2223131-2-ardb+git@google.com> Subject: [PATCH] locking/local_lock: Don't evaluate the per-CPU lock pointer if unused From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Sebastian Andrzej Siewior , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" From: Ard Biesheuvel When lock debugging is disabled, local_lock_acquire() and friends are empty, and so the per-CPU lock pointer that is passed to them, which is usually computed using this_cpu_ptr(), is not used at all. However, on x86, when the compiler does not support named address spaces (i.e., Clang), this_cpu_ptr() is based on inline asm with a memory operand, and Clang does not discard such inline asm even if its result is unused. So the computation of the per-CPU address of the lock is emitted regardless, e.g., on every local_lock_nested_bh() in process_backlog() and on every local_lock() in the folio batching code. This was addressed before by commit 9983a9d577db ("locking/local_lock: Make the empty local_lock_*() function a macro.") but that change was reverted by commit 2d2f8f083ef2 ("Revert "locking/local_lock: Make the empty local_lock_*() function a macro."") once commit 1c1e7e3c23dd ("x86/percpu: Remove volatile from arch_raw_cpu_ptr().") had dropped the volatile qualifier from the inline asm, on the basis that the compiler no longer emits the unused per-CPU reference in that case. This is true for GCC, but not for Clang. So implement the !CONFIG_DEBUG_LOCK_ALLOC versions of these helpers as macros that only reference their argument in dead code, so that it is type checked but never evaluated. Referencing it only in an unevaluated context instead, as the typecheck() in the original macros did, makes Clang complain about per-CPU locks that are only used via these helpers (-Wunneeded-internal-declaration), which is what commit a4812d47deff ("mm/page_alloc: mark pagesets as __maybe_unused") had to work around at the time. Also, only evaluate the lock pointer in __local_lock_acquire() and __local_lock_release() when it is actually needed, i.e., for local_trylock_t. Cc: Sebastian Andrzej Siewior Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Will Deacon Cc: Boqun Feng Cc: Waiman Long Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Bill Wendling Cc: Justin Stitt Cc: llvm@lists.linux.dev Fixes: 2d2f8f083ef2 ("Revert "locking/local_lock: Make the empty local_lock_*() function a macro."") Signed-off-by: Ard Biesheuvel --- include/linux/local_lock_internal.h | 47 +++++++++++++------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/include/linux/local_lock_internal.h b/include/linux/local_lock_internal.h index 234be7f12c15..7c3191438c90 100644 --- a/include/linux/local_lock_internal.h +++ b/include/linux/local_lock_internal.h @@ -69,10 +69,21 @@ static inline void local_lock_debug_init(local_lock_t *l) #else /* CONFIG_DEBUG_LOCK_ALLOC */ # define LOCAL_LOCK_DEBUG_INIT(lockname) # define LOCAL_TRYLOCK_DEBUG_INIT(lockname) -static inline void local_lock_acquire(local_lock_t *l) { } -static inline void local_trylock_acquire(local_lock_t *l) { } -static inline void local_lock_release(local_lock_t *l) { } static inline void local_lock_debug_init(local_lock_t *l) { } + +/* + * The argument passed to these is usually a this_cpu_ptr() expression, which + * is implemented using inline asm when the compiler lacks support for named + * address spaces (e.g., Clang). Clang may fail to discard such inline asm + * even if its result is never used, so only reference the argument in dead + * code, which type checks it without evaluating it. (Referencing it only in an + * unevaluated context such as sizeof() would make Clang complain about per-CPU + * locks that are only used via these helpers being unneeded.) + */ +static inline void __local_lock_typecheck(local_lock_t *l) { } +# define local_lock_acquire(l) ({ if (0) __local_lock_typecheck(l); }) +# define local_trylock_acquire(l) ({ if (0) __local_lock_typecheck(l); }) +# define local_lock_release(l) ({ if (0) __local_lock_typecheck(l); }) #endif /* !CONFIG_DEBUG_LOCK_ALLOC */ #define INIT_LOCAL_LOCK(lockname) { LOCAL_LOCK_DEBUG_INIT(lockname) } @@ -105,20 +116,23 @@ do { \ local_lock_debug_init(lock); \ } while (0) +/* + * Only evaluate @lock if it is actually used, i.e., for local_trylock_t, or + * when lock debugging is enabled (see local_lock_acquire() above). + */ #define __local_lock_acquire(lock) \ do { \ - local_trylock_t *__tl; \ - local_lock_t *__l; \ - \ - __l = (local_lock_t *)(lock); \ - __tl = (local_trylock_t *)__l; \ _Generic((lock), \ local_trylock_t *: ({ \ + local_trylock_t *__tl = (local_trylock_t *)(lock); \ + \ lockdep_assert(__tl->acquired == 0); \ WRITE_ONCE(__tl->acquired, 1); \ + local_lock_acquire((local_lock_t *)__tl); \ }), \ - local_lock_t *: (void)0); \ - local_lock_acquire(__l); \ + local_lock_t *: ({ \ + local_lock_acquire((local_lock_t *)(lock)); \ + })); \ } while (0) #define __local_lock(lock) \ @@ -181,18 +195,17 @@ do { \ #define __local_lock_release(lock) \ do { \ - local_trylock_t *__tl; \ - local_lock_t *__l; \ - \ - __l = (local_lock_t *)(lock); \ - __tl = (local_trylock_t *)__l; \ - local_lock_release(__l); \ _Generic((lock), \ local_trylock_t *: ({ \ + local_trylock_t *__tl = (local_trylock_t *)(lock); \ + \ + local_lock_release((local_lock_t *)__tl); \ lockdep_assert(__tl->acquired == 1); \ WRITE_ONCE(__tl->acquired, 0); \ }), \ - local_lock_t *: (void)0); \ + local_lock_t *: ({ \ + local_lock_release((local_lock_t *)(lock)); \ + })); \ } while (0) #define __local_unlock(lock) \ -- 2.56.1.750.gf70dc682cf-goog