From nobody Thu Oct 2 10:55:17 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 0F07C31B811 for ; Thu, 18 Sep 2025 14:06:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758204414; cv=none; b=aH8CzrO3UTbLUU9yaoNH0A1R0viERgvoA1D2isrhub7FbLUR6IgTFXfEOn+Lgyv/W+gtqO3HVfoE+UM6yP1LFJiQ7iB5OIjUm0ZXTilyM37bHWsaYm1cnVB1+sZnz4zOyALPKAlBFHdcjJyD/lG58ks0i7eiKgGFxg2MzZVR7hE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758204414; c=relaxed/simple; bh=S7vB4uD4/yxN5FJQ665IvAp5gLmD1SdSV98ycbKNvds=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WE/VGimLhvEnPMMeQolju7Hs4rxFN1A1SO83wcZJo9Ojo+DXoLvuOZFuzgKzE84la8MRErBAQ24AaYK/lSZIHS8QybmNhLi9YOuzHfXvbMC0kCRa1/fv97CASvQGLwAc4Hdi8QmKBFXRYi+z4/nXmzGi59q3jloJmI0Gq9vc8w0= 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=t/L7R9Xj; arc=none smtp.client-ip=209.85.128.73 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="t/L7R9Xj" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-45e037fd142so11172715e9.3 for ; Thu, 18 Sep 2025 07:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758204410; x=1758809210; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uu2U7ivUVuh8UFOqD9X78NwxcdL3Tv7H02aP9D4eaJs=; b=t/L7R9Xjutq6qJb/XwnOBEbD9Uw92vQ+XACzOSG+23f74X9UoCatEcjw9okz+KfBaF 1roIuGnyqBo4VYailvhZkA5FPpdSTzQp6le8gSU5s1pCo41Daao3dIq7hQGvpOazACiE N9WTUsxOjuCo3qKZTgUi4pz9bhC7dC1K7p/XHCFHdY7KjPeG7z+HLqTdhAS9/8JLeLj9 zBkCFyFt2CSR69cbfSTcP/M3zbSVbb/7QRLtn8bKtuCaankt1/dnHAs6JJrVFRIDeGU4 yQIVOqqHmfd5fFEON1/OaKoxRzOvGBcnW+0SZ+UQVBYuh1Ro6GisXnm98W+pfnahiI7O rG3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758204410; x=1758809210; 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=uu2U7ivUVuh8UFOqD9X78NwxcdL3Tv7H02aP9D4eaJs=; b=wGJgs7KMK40pqYCUNYjDTLKbrDCaJYq2i3Ga5V9GubAPZmgs3YvrruQh5vg+u5mX3n 3YkQW5G9KnF4ZB2yQAxkF3bvDTfXqiwp4oZVwSn0nvkef1kjExxaXFxEVkzxx3Z4+/M/ o6PsJtWIXnfwNTQ++ooprGo+xPIIhLQsBEV9BGSj6i4pK+ztZITYZqizNb/SnnowlPMP kwhnAOCzUi9jL8wnyjsGDsO+a+J73FXC5dqK0UpmFhLwC+xdq6xFPxtUhqVVrT1u6e1y 05E/FnQJyHXrHtnpW1KfEhy3Z9XuGnHlsS+KQSrQ8FdBIIs/SbDpBLeqo7DgBgQZ+Jc9 k0ZA== X-Forwarded-Encrypted: i=1; AJvYcCVLeaCGVPvWaMtlf2J18hwa2/c8L3sKQNA93p2iG8MuHZCMnWZwtR0nV34tjTxdc9UFh3XKef+xA5Y/cmk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7Brhx4rvntgVyu93RNBIcdNoX0n7QJZ9rynft97l595xu99Rc bSZqhH+D4ARx2kh17AG0xZwe28sglbH/6IyASd/RQ50zDFS6lynAF8sDis6g7vSHeo8mIwOe5Kw a1g== X-Google-Smtp-Source: AGHT+IHRfJ0sadoWjMsHalmLLwSIXcal7LoFUr3N/EwlXauwuYhWDu8KTQkhk5JA9sEvt9IyjDEeNyzsjA== X-Received: from wmkz6.prod.google.com ([2002:a7b:c7c6:0:b0:45b:79d1:abcb]) (user=elver job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d1a:b0:45d:e326:96e7 with SMTP id 5b1f17b1804b1-46206b20d8bmr53761355e9.29.1758204410398; Thu, 18 Sep 2025 07:06:50 -0700 (PDT) Date: Thu, 18 Sep 2025 15:59:42 +0200 In-Reply-To: <20250918140451.1289454-1-elver@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org 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-32-elver@google.com> Subject: [PATCH v3 31/35] rhashtable: Enable capability analysis 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable capability analysis for rhashtable, which was used as an initial test as it contains a combination of RCU, mutex, and bit_spinlock usage. Users of rhashtable now also benefit from annotations on the API, which will now warn if the RCU read lock is not held where required. Signed-off-by: Marco Elver Cc: Thomas Graf Cc: Herbert Xu Cc: linux-crypto@vger.kernel.org --- v2: * Remove disable/enable_capability_analysis() around headers. --- include/linux/rhashtable.h | 14 +++++++++++--- lib/Makefile | 2 ++ lib/rhashtable.c | 5 +++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index 6c85b28ea30b..347716b1ca37 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h @@ -245,16 +245,17 @@ void *rhashtable_insert_slow(struct rhashtable *ht, c= onst void *key, void rhashtable_walk_enter(struct rhashtable *ht, struct rhashtable_iter *iter); void rhashtable_walk_exit(struct rhashtable_iter *iter); -int rhashtable_walk_start_check(struct rhashtable_iter *iter) __acquires(R= CU); +int rhashtable_walk_start_check(struct rhashtable_iter *iter) __acquires_s= hared(RCU); =20 static inline void rhashtable_walk_start(struct rhashtable_iter *iter) + __acquires_shared(RCU) { (void)rhashtable_walk_start_check(iter); } =20 void *rhashtable_walk_next(struct rhashtable_iter *iter); void *rhashtable_walk_peek(struct rhashtable_iter *iter); -void rhashtable_walk_stop(struct rhashtable_iter *iter) __releases(RCU); +void rhashtable_walk_stop(struct rhashtable_iter *iter) __releases_shared(= RCU); =20 void rhashtable_free_and_destroy(struct rhashtable *ht, void (*free_fn)(void *ptr, void *arg), @@ -325,6 +326,7 @@ static inline struct rhash_lock_head __rcu **rht_bucket= _insert( =20 static inline unsigned long rht_lock(struct bucket_table *tbl, struct rhash_lock_head __rcu **bkt) + __acquires(__bitlock(0, bkt)) { unsigned long flags; =20 @@ -337,6 +339,7 @@ static inline unsigned long rht_lock(struct bucket_tabl= e *tbl, static inline unsigned long rht_lock_nested(struct bucket_table *tbl, struct rhash_lock_head __rcu **bucket, unsigned int subclass) + __acquires(__bitlock(0, bucket)) { unsigned long flags; =20 @@ -349,6 +352,7 @@ static inline unsigned long rht_lock_nested(struct buck= et_table *tbl, static inline void rht_unlock(struct bucket_table *tbl, struct rhash_lock_head __rcu **bkt, unsigned long flags) + __releases(__bitlock(0, bkt)) { lock_map_release(&tbl->dep_map); bit_spin_unlock(0, (unsigned long *)bkt); @@ -402,13 +406,14 @@ static inline void rht_assign_unlock(struct bucket_ta= ble *tbl, struct rhash_lock_head __rcu **bkt, struct rhash_head *obj, unsigned long flags) + __releases(__bitlock(0, bkt)) { if (rht_is_a_nulls(obj)) obj =3D NULL; lock_map_release(&tbl->dep_map); rcu_assign_pointer(*bkt, (void *)obj); preempt_enable(); - __release(bitlock); + __release(__bitlock(0, bkt)); local_irq_restore(flags); } =20 @@ -589,6 +594,7 @@ static inline int rhashtable_compare(struct rhashtable_= compare_arg *arg, static inline struct rhash_head *__rhashtable_lookup( struct rhashtable *ht, const void *key, const struct rhashtable_params params) + __must_hold_shared(RCU) { struct rhashtable_compare_arg arg =3D { .ht =3D ht, @@ -642,6 +648,7 @@ static inline struct rhash_head *__rhashtable_lookup( static inline void *rhashtable_lookup( struct rhashtable *ht, const void *key, const struct rhashtable_params params) + __must_hold_shared(RCU) { struct rhash_head *he =3D __rhashtable_lookup(ht, key, params); =20 @@ -692,6 +699,7 @@ static inline void *rhashtable_lookup_fast( static inline struct rhlist_head *rhltable_lookup( struct rhltable *hlt, const void *key, const struct rhashtable_params params) + __must_hold_shared(RCU) { struct rhash_head *he =3D __rhashtable_lookup(&hlt->ht, key, params); =20 diff --git a/lib/Makefile b/lib/Makefile index 43b965046c2c..85a9144b008a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -50,6 +50,8 @@ lib-$(CONFIG_MIN_HEAP) +=3D min_heap.o lib-y +=3D kobject.o klist.o obj-y +=3D lockref.o =20 +CAPABILITY_ANALYSIS_rhashtable.o :=3D y + obj-y +=3D bcd.o sort.o parser.o debug_locks.o random32.o \ bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \ list_sort.o uuid.o iov_iter.o clz_ctz.o \ diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 3e555d012ed6..fe8dd776837c 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -358,6 +358,7 @@ static int rhashtable_rehash_table(struct rhashtable *h= t) static int rhashtable_rehash_alloc(struct rhashtable *ht, struct bucket_table *old_tbl, unsigned int size) + __must_hold(&ht->mutex) { struct bucket_table *new_tbl; int err; @@ -392,6 +393,7 @@ static int rhashtable_rehash_alloc(struct rhashtable *h= t, * bucket locks or concurrent RCU protected lookups and traversals. */ static int rhashtable_shrink(struct rhashtable *ht) + __must_hold(&ht->mutex) { struct bucket_table *old_tbl =3D rht_dereference(ht->tbl, ht); unsigned int nelems =3D atomic_read(&ht->nelems); @@ -724,7 +726,7 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_exit); * resize events and always continue. */ int rhashtable_walk_start_check(struct rhashtable_iter *iter) - __acquires(RCU) + __acquires_shared(RCU) { struct rhashtable *ht =3D iter->ht; bool rhlist =3D ht->rhlist; @@ -940,7 +942,6 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_peek); * hash table. */ void rhashtable_walk_stop(struct rhashtable_iter *iter) - __releases(RCU) { struct rhashtable *ht; struct bucket_table *tbl =3D iter->walker.tbl; --=20 2.51.0.384.g4c02a37b29-goog