From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 AC56731BCB0 for ; Thu, 18 Sep 2025 14:06:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758204417; cv=none; b=LnhvLKtNJ3qMhnk9c0bvbUNTDrvxgsFOKEYQp3iDqbk7b5hcB/dLBmxsdHEtpzbhqa81/CXTLhJeNJFB3WDIuY+F0S54RbHzC257DnMN2fVKNNRj7RJeEdj3UxH0lz8cnrGopQ3H8KUn6G1Gn4p4keV3EjcsXzOzR8btEYz1eYA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758204417; c=relaxed/simple; bh=f/yC9haOsA7BuarNCC3Pq5BbPzMSt2OIoizyVyq6JDA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=A3pUcCi431ZA9+IorXgaKJGyA9OlxPRQZJpjsMiIepiauR+4Zav7YrUw0JfcevZzK+GuoIinh/7Tudy3gJl2XsWNmZpMmNKcFVYgjUq26vds3IbGgJHR/Xon1SDOmclYIMNDfI+bZGQv5EPWDvjNyb3wpt/fsXqt0h2lWJeVZLs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--elver.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uPExo/Di; arc=none smtp.client-ip=209.85.128.74 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--elver.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uPExo/Di" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-45f2b9b99f0so6250255e9.1 for ; Thu, 18 Sep 2025 07:06:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758204413; x=1758809213; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=m6Ln8CuHzwdFEdgMDhrRww1RTgWw9IPMarfKDLj88go=; b=uPExo/Dih9QNMIZKmMy+F9d/xDM3RKfU7cQVOwzxbMsk4fcxZJ/gVRHyA5MlWSbBH4 eLneLIV9Qb8lIrPQ51osFU+hhlv6pHjA+iCWxHs9E4dXwL6i7SuDp76IpuuSWy7eARfT midjXWtEjl5uLNAY4CilgPsrKY7a2Lvazm8OZ/4ghL4RxP39LtTeDzt6y2mJVkAznRrF nQcqQXixQxsc+M57ve7R2T0CFb4zJ0v5HphRSWfba3BnxrPA9Shwm5lvY2IACeMlnxoJ 3mZGl7VTLSV4oOTuO9PLG+P1a1n3dvUqmgnashy848KBR5shONzWUl7rhIJiHWdgZTMk SP6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758204413; x=1758809213; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=m6Ln8CuHzwdFEdgMDhrRww1RTgWw9IPMarfKDLj88go=; b=vK2kIH2cGK0Cy+lK8vbWHoJCCu2PN2ryzKqvCOi9IAfbvoT4xFx1ektbsKBvNc0v27 pIgdrIX5HcAG6hzPpE+jURSltNfTVCHk+o+yhr5hafueXHbUZVJsHD0WJ0/4urZzALuC GFd3Ysb5O9NTFSbkGbI5qPcspyjSVrSa4D9RxIgKzpVg9TJTOgm8Kj65QV1KH89Wgsll 5I2+7uKU8sqswGukyEO447nDIHyZQGA3n4RYgeeyesrOPiV8K3qzyc8XcmLYbs1YU2rZ sRRQ53M3KsHpsZpRXXL5oBoyeLA8TEwbWqgkE3pPauzsUT6D3yzmC0TeJJnvKTBxUJrI enTA== X-Forwarded-Encrypted: i=1; AJvYcCWq2mJ0gteQlIt5pHtmKn4ZJGl3jy2CBeQJF916uwQbdKHmOUk4kaGePzFBTZ0amg58WPpo@lists.linux.dev X-Gm-Message-State: AOJu0Yy0EGjzTDX9OR5TRkhRQ0a6PyQmVj2f/15EwwDNOLQx2m5/dvsF J0535MS+UJtvzCV0FKkSFe5NdvZNve4ntoj/7B1RKRapidxD0cXZz19FzkUKjXXHh5GUl87oYtz u1A== X-Google-Smtp-Source: AGHT+IGP0WbxoqdPlneUX2xKJu9++ZlvQ/e8NDERumQ6O0subVDhFhk6LjXgg12JZHvhR56srQ1YmvrO2Q== X-Received: from wmbhc26.prod.google.com ([2002:a05:600c:871a:b0:45f:2859:5428]) (user=elver job=prod-delivery.src-stubby-dispatcher) by 2002:a7b:cbd6:0:b0:45b:47e1:ef7b with SMTP id 5b1f17b1804b1-46506364ce0mr25439175e9.17.1758204413172; Thu, 18 Sep 2025 07:06:53 -0700 (PDT) Date: Thu, 18 Sep 2025 15:59:43 +0200 In-Reply-To: <20250918140451.1289454-1-elver@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250918140451.1289454-1-elver@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250918140451.1289454-33-elver@google.com> Subject: [PATCH v3 32/35] printk: Move locking annotation to printk.c From: Marco Elver To: elver@google.com, Peter Zijlstra , Boqun Feng , Ingo Molnar , Will Deacon Cc: "David S. Miller" , Luc Van Oostenryck , "Paul E. McKenney" , Alexander Potapenko , Arnd Bergmann , Bart Van Assche , Bill Wendling , Christoph Hellwig , Dmitry Vyukov , Eric Dumazet , Frederic Weisbecker , Greg Kroah-Hartman , Herbert Xu , Ian Rogers , Jann Horn , Joel Fernandes , Jonathan Corbet , Josh Triplett , Justin Stitt , Kees Cook , Kentaro Takeda , Lukas Bulwahn , Mark Rutland , Mathieu Desnoyers , Miguel Ojeda , Nathan Chancellor , Neeraj Upadhyay , Nick Desaulniers , Steven Rostedt , Tetsuo Handa , Thomas Gleixner , Thomas Graf , Uladzislau Rezki , Waiman Long , kasan-dev@googlegroups.com, linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-security-module@vger.kernel.org, linux-sparse@vger.kernel.org, llvm@lists.linux.dev, rcu@vger.kernel.org Content-Type: text/plain; charset="UTF-8" With Sparse support gone, Clang is a bit more strict and warns: ./include/linux/console.h:492:50: error: use of undeclared identifier 'console_mutex' 492 | extern void console_list_unlock(void) __releases(console_mutex); Since it does not make sense to make console_mutex itself global, move the annotation to printk.c. Capability analysis remains disabled for printk.c. This is needed to enable capability analysis for modules that include . Signed-off-by: Marco Elver --- v2: * New patch. --- include/linux/console.h | 4 ++-- kernel/printk/printk.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/console.h b/include/linux/console.h index 8f10d0a85bb4..6bc0a42e118c 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -488,8 +488,8 @@ static inline bool console_srcu_read_lock_is_held(void) extern int console_srcu_read_lock(void); extern void console_srcu_read_unlock(int cookie); -extern void console_list_lock(void) __acquires(console_mutex); -extern void console_list_unlock(void) __releases(console_mutex); +extern void console_list_lock(void); +extern void console_list_unlock(void); extern struct hlist_head console_list; diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 0efbcdda9aab..e0bfc66152aa 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -244,6 +244,7 @@ int devkmsg_sysctl_set_loglvl(const struct ctl_table *table, int write, * For console list or console->flags updates */ void console_list_lock(void) + __acquires(&console_mutex) { /* * In unregister_console() and console_force_preferred_locked(), @@ -268,6 +269,7 @@ EXPORT_SYMBOL(console_list_lock); * Counterpart to console_list_lock() */ void console_list_unlock(void) + __releases(&console_mutex) { mutex_unlock(&console_mutex); } -- 2.51.0.384.g4c02a37b29-goog