From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6F7F4CF8864 for ; Thu, 20 Nov 2025 15:13:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C678B6B0007; Thu, 20 Nov 2025 10:13:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C18236B00BB; Thu, 20 Nov 2025 10:13:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ADFF46B00BC; Thu, 20 Nov 2025 10:13:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 957D86B0007 for ; Thu, 20 Nov 2025 10:13:00 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5AD43C0136 for ; Thu, 20 Nov 2025 15:13:00 +0000 (UTC) X-FDA: 84131328120.07.0237048 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf01.hostedemail.com (Postfix) with ESMTP id 787C94001D for ; Thu, 20 Nov 2025 15:12:58 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Zf2UISNm; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3-C8faQUKCCUFMWFSHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--elver.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3-C8faQUKCCUFMWFSHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--elver.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1763651578; a=rsa-sha256; cv=none; b=th6fJahfKoUbzwEwkg7mRkKtBqvUQ8Nl7YD1mo7z9GNW6SbhghuqtE8DoIp7maPImqIKfX 3kOyf23u8GncyCOLLoCa3IzVp+1UpXpd9ZZgTKdzw+VlikDw716CuZ0k0gsXSnTqHHLBsz 5ecy/w4zT6gW9KDM0/FK2qeFOyJAp90= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Zf2UISNm; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3-C8faQUKCCUFMWFSHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--elver.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3-C8faQUKCCUFMWFSHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--elver.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1763651578; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=z5PhmCa+DLEqmDE5eb5xrg5+OT8/kRfk1ooPiNLHiV0=; b=1Gr5sMMTxBZVfUyYACpiPFB2LDOEp5ddQcAdon7T/Tl+eYa6RpinktLfFHZQT8dWNFgmj/ R7USCbNhHi5PoJDqkyGJaz7mBqzA6UT1RUZ2PRWYhYf0KKGpyNb/QQj1x/oZcy4sYsdZV3 7lvhwjlhYaTBwUo//wz0+j+Hs4E0P9k= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-477563e531cso9824465e9.1 for ; Thu, 20 Nov 2025 07:12:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763651577; x=1764256377; darn=kvack.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=z5PhmCa+DLEqmDE5eb5xrg5+OT8/kRfk1ooPiNLHiV0=; b=Zf2UISNm457kjREl+YlF5FkPTkXfsq6V8tdWtDNJ4CQZ3dtJfINauFWtYgWfu7n41g 1QIVHELw/hRo9syEY+2wmQy3p3KhLpKuDSZ2j0kLBmOmA5mfj4yJAJLD3q48dthNWoKc VazoN2Y0fyjHUgAEGEnCXw45DdbuP061nZ0kFqiHXs2TulcudJFaYs3Dcd1iJZxuwS4x KAHidq9LnCfxKAnxmrvA6PajVbAYH2qpsDDAkcfha+v4Xb3qmXnaw93eAIfgfAXU8wrd gPnXwnpYAwdR35X1T5amnMZIXtJCKYidIriDdxonLMftpUYI/EN6q4ml2hXLNpSddRYG I8/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763651577; x=1764256377; 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=z5PhmCa+DLEqmDE5eb5xrg5+OT8/kRfk1ooPiNLHiV0=; b=xENzaHqX4WvgDFk1ZMsCUI+fD6+k8w7hWqub6MeS75rymglsgm/AJx3er1Anc1vDjn 5J4tNf8lMMY0XN2va5VnVv6xdLfeWTOepKApJTW2LkfL/68/XhPd1L4IK6l8XmX624Ss nepItwQ4hU0tKqwdszbNY7kbymt3RxVYELIuDKFSNCngZ3e7n8WfMznw9s6uUBfPXuj+ jp1wJn2Y9MTjUQZE4M2P/DT/jlpoI8hQ32baDhkfqZcoAeC9DWiyGx4+xdhs12tlJSf/ rJ/DI7cN3ZUNdwVPgJ2bYI/4qDfArrG+QNhM9qGWJ8H4djYMEuYFzf5Df/5r5IerZnaG mjLQ== X-Forwarded-Encrypted: i=1; AJvYcCUPdNVIdkIllrZxhUFKiit/PRUCEacSB8lw7SCswiCotXuTY2WcxtaV9UO1NkP3AvvOCRkCcyEK5Q==@kvack.org X-Gm-Message-State: AOJu0Yw09phFdQogkwPK6EHwaA+Xng/Mi0swGNkVB4mWhibDwRAY9lWe d5leRsEK2nRehg1ZsC52h4vw4PYDE58XD1rK0Tqolm3WvcxrSWigraHWBLuHGW2LXnFyl5rIMbx 7Lw== X-Google-Smtp-Source: AGHT+IH0FdJpjdqU0cJV/KlDTVw3ojFJ0vxFBAm6SujS3GvmL9GP80aIbaRpEJZoUkjA3A+G3C9B0YOJgg== X-Received: from wmbb9.prod.google.com ([2002:a05:600c:5889:b0:477:9e14:84dc]) (user=elver job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b05:b0:477:a978:3a7b with SMTP id 5b1f17b1804b1-477b8a9f30amr31592855e9.22.1763651576808; Thu, 20 Nov 2025 07:12:56 -0800 (PST) Date: Thu, 20 Nov 2025 16:09:42 +0100 In-Reply-To: <20251120151033.3840508-7-elver@google.com> Mime-Version: 1.0 References: <20251120145835.3833031-2-elver@google.com> <20251120151033.3840508-7-elver@google.com> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251120151033.3840508-18-elver@google.com> Subject: [PATCH v4 17/35] locking/rwsem: Support Clang's context analysis From: Marco Elver To: elver@google.com, Peter Zijlstra , Boqun Feng , Ingo Molnar , Will Deacon Cc: "David S. Miller" , Luc Van Oostenryck , Chris Li , "Paul E. McKenney" , Alexander Potapenko , Arnd Bergmann , Bart Van Assche , Christoph Hellwig , Dmitry Vyukov , Eric Dumazet , Frederic Weisbecker , Greg Kroah-Hartman , Herbert Xu , Ian Rogers , Jann Horn , Joel Fernandes , Johannes Berg , 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, linux-wireless@vger.kernel.org, llvm@lists.linux.dev, rcu@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 787C94001D X-Stat-Signature: wcr3dsn17gtezbh1xibdbja43e1dpj8b X-Rspam-User: X-HE-Tag: 1763651578-140454 X-HE-Meta: U2FsdGVkX18C9DTDvbnJFj4DvCyydAvnbjL/xwRqR8fOhHNCOniDkk2TpFjvtJT2JLxFRe1FibfcDJtP9+3cWxC9ugFDrM1iFwkGlJ4MK+sTifAGfEIk7gnIT+6iokrdOZj8iyO4StX2mK2xtA52SIkj1Zr7P2bmS8GVIYD6d3aP/uvHDadeliLtBqDAXQCa2vO+v2MCXHB3ynNgJ3eR73p9oueuW1klzr05n+NkAh/1bao5/4dgPDiqCckAurkqS8uMyDzO3vFkQFyIbxxd7jsaWQ/j33UIfY3FzDq4cSHTiw/Cr5JJkE4t7AUpX6z934aASacffp/5u+as5Vo3plW3O21/R1IOgqwc1aaW1vvkB5KREL+VUhwtYE0u5cr+giglsggvUYPEkLOMyB8sgRspBzeatuWJaHBSYL5K5WnrYNh8NyhZ6zVWQwlV0rd/6ibGRnQLhCK7gS+e7Uw9/4S5JFIpgGC3fdre+gMZzbV7p/9EhvOFrsE12LzbFnjWCN+GwYSvGjZ2ekzswI6zlwh2zum0itW6DFpZGmnlw8yr/EKBePb0dXmBhcruXfGlPv9lX7XXHZruTVKjXFf9RRbzJYk7JVBJdmMo9DPdlG46oogJU4gEJhqMoy0Kb3XlIwd56ERoScfArO1MW3tmgdMmXN22O++VCko8R00jC47rdcl45Kj5KcQpJ4ua9vAGPJpOUf5/AEnjK7WyjOzU1seqPqunF28T8MzKierL61u2nF+ohobhm2qzHZrTeLquZJIscfNkuzmVt1mEXSiiqkFZvHSRhEVfEXzDHdNtu5WscKQ6v3GqeDg+xLR5r2NWp+NCy1HqPMSf1G+jURM6QjJxmDMmUGND84gvFjOx/BsTtyEHk1nKAtWo3Ub+5p7MEEY1RvZqMJpA6D0vk+Oj+K5vz6teyymdz8EaG3ZLoWpeJsyiC/ApzZc48Ilrbu4Ky6SEi4RVU/MeOyNrmUT vuKNLomT 6wWJyNKWX3fmU1xZvnjYbTsGpL9Avirj6w0YE/NX+m4RMGtLdTBnu1s/Fhsx3SG3w+1oYUFvT/LCiLyiL/IMgPze2cXMSXqcweHLFax1iAhpt/6Cz9rKQDOaGflNgrQrk3dzCMot1Pfx6oNrtPXc5Z/yNGe2m6/GhuW+edeqUu4cG42nhw2PoLPyMSGYN2P8yApzMF1EGrDdCj+MaPj8AJFsziU49fddsdjXZmPV4hbziyajJE8QC4M4xA7l8xQHUXBcbTNOwW0SZydZF+JBsBKIEfuU1GDYvLpn9760dkJJSf5huNcfAtfI+HviVzYxI+7PzYzbJeqH1dT/DQaAVhBDtn7w8Kc1+qWdr1cMaNV8sH1G4qsRl/YEMglXg5nzw7KRDfSc+58EHLwSzgvPr8tBld5fKpLArNIU+xd9rt0xFf92CXC/cqX5dofQT7fH5u31Dtw8oT1FW7LABxKh7GNsXzu309Vv3nrtf5wWxMChWJ6qAWxy2X9oFqTZcr+ONqenj1YCFqoK0g4nysMvsG/d6/Cpbjm6gZQrP6L7iJ+54rdDR5e+bto82qBeFsVhqt+cS9A71QfMZjzVuhY+0rRnFB0r9nKRlrGL523zVIw9nyji69wyOBSQ4BskRgnx12yKqnng+3HXjGDB9sU08rGzOD/oaCNVBNlaydIKATeCJOIFa0pk7VhQxO7KK+yKsSK/8 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add support for Clang's context analysis for rw_semaphore. Signed-off-by: Marco Elver --- v4: * Rename capability -> context analysis. v3: * Switch to DECLARE_LOCK_GUARD_1_ATTRS() (suggested by Peter) * __assert -> __assume rename --- Documentation/dev-tools/context-analysis.rst | 2 +- include/linux/rwsem.h | 66 ++++++++++++-------- lib/test_context-analysis.c | 64 +++++++++++++++++++ 3 files changed, 106 insertions(+), 26 deletions(-) diff --git a/Documentation/dev-tools/context-analysis.rst b/Documentation/dev-tools/context-analysis.rst index 59fc8e4cc203..dc7ae4f641f2 100644 --- a/Documentation/dev-tools/context-analysis.rst +++ b/Documentation/dev-tools/context-analysis.rst @@ -81,7 +81,7 @@ Supported Kernel Primitives Currently the following synchronization primitives are supported: `raw_spinlock_t`, `spinlock_t`, `rwlock_t`, `mutex`, `seqlock_t`, -`bit_spinlock`, RCU, SRCU (`srcu_struct`). +`bit_spinlock`, RCU, SRCU (`srcu_struct`), `rw_semaphore`. For context guards with an initialization function (e.g., `spin_lock_init()`), calling this function before initializing any guarded members or globals diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index f1aaf676a874..922790635f79 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -45,7 +45,7 @@ * reduce the chance that they will share the same cacheline causing * cacheline bouncing problem. */ -struct rw_semaphore { +context_guard_struct(rw_semaphore) { atomic_long_t count; /* * Write owner or one of the read owners as well flags regarding @@ -76,11 +76,13 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem) } static inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem) + __assumes_ctx_guard(sem) { WARN_ON(atomic_long_read(&sem->count) == RWSEM_UNLOCKED_VALUE); } static inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *sem) + __assumes_ctx_guard(sem) { WARN_ON(!(atomic_long_read(&sem->count) & RWSEM_WRITER_LOCKED)); } @@ -119,6 +121,7 @@ do { \ static struct lock_class_key __key; \ \ __init_rwsem((sem), #sem, &__key); \ + __assume_ctx_guard(sem); \ } while (0) /* @@ -148,7 +151,7 @@ extern bool is_rwsem_reader_owned(struct rw_semaphore *sem); #include -struct rw_semaphore { +context_guard_struct(rw_semaphore) { struct rwbase_rt rwbase; #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lockdep_map dep_map; @@ -172,6 +175,7 @@ do { \ static struct lock_class_key __key; \ \ __init_rwsem((sem), #sem, &__key); \ + __assume_ctx_guard(sem); \ } while (0) static __always_inline int rwsem_is_locked(const struct rw_semaphore *sem) @@ -180,11 +184,13 @@ static __always_inline int rwsem_is_locked(const struct rw_semaphore *sem) } static __always_inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem) + __assumes_ctx_guard(sem) { WARN_ON(!rwsem_is_locked(sem)); } static __always_inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *sem) + __assumes_ctx_guard(sem) { WARN_ON(!rw_base_is_write_locked(&sem->rwbase)); } @@ -202,6 +208,7 @@ static __always_inline int rwsem_is_contended(struct rw_semaphore *sem) */ static inline void rwsem_assert_held(const struct rw_semaphore *sem) + __assumes_ctx_guard(sem) { if (IS_ENABLED(CONFIG_LOCKDEP)) lockdep_assert_held(sem); @@ -210,6 +217,7 @@ static inline void rwsem_assert_held(const struct rw_semaphore *sem) } static inline void rwsem_assert_held_write(const struct rw_semaphore *sem) + __assumes_ctx_guard(sem) { if (IS_ENABLED(CONFIG_LOCKDEP)) lockdep_assert_held_write(sem); @@ -220,48 +228,56 @@ static inline void rwsem_assert_held_write(const struct rw_semaphore *sem) /* * lock for reading */ -extern void down_read(struct rw_semaphore *sem); -extern int __must_check down_read_interruptible(struct rw_semaphore *sem); -extern int __must_check down_read_killable(struct rw_semaphore *sem); +extern void down_read(struct rw_semaphore *sem) __acquires_shared(sem); +extern int __must_check down_read_interruptible(struct rw_semaphore *sem) __cond_acquires_shared(0, sem); +extern int __must_check down_read_killable(struct rw_semaphore *sem) __cond_acquires_shared(0, sem); /* * trylock for reading -- returns 1 if successful, 0 if contention */ -extern int down_read_trylock(struct rw_semaphore *sem); +extern int down_read_trylock(struct rw_semaphore *sem) __cond_acquires_shared(true, sem); /* * lock for writing */ -extern void down_write(struct rw_semaphore *sem); -extern int __must_check down_write_killable(struct rw_semaphore *sem); +extern void down_write(struct rw_semaphore *sem) __acquires(sem); +extern int __must_check down_write_killable(struct rw_semaphore *sem) __cond_acquires(0, sem); /* * trylock for writing -- returns 1 if successful, 0 if contention */ -extern int down_write_trylock(struct rw_semaphore *sem); +extern int down_write_trylock(struct rw_semaphore *sem) __cond_acquires(true, sem); /* * release a read lock */ -extern void up_read(struct rw_semaphore *sem); +extern void up_read(struct rw_semaphore *sem) __releases_shared(sem); /* * release a write lock */ -extern void up_write(struct rw_semaphore *sem); +extern void up_write(struct rw_semaphore *sem) __releases(sem); -DEFINE_GUARD(rwsem_read, struct rw_semaphore *, down_read(_T), up_read(_T)) -DEFINE_GUARD_COND(rwsem_read, _try, down_read_trylock(_T)) -DEFINE_GUARD_COND(rwsem_read, _intr, down_read_interruptible(_T), _RET == 0) +DEFINE_LOCK_GUARD_1(rwsem_read, struct rw_semaphore, down_read(_T->lock), up_read(_T->lock)) +DEFINE_LOCK_GUARD_1_COND(rwsem_read, _try, down_read_trylock(_T->lock)) +DEFINE_LOCK_GUARD_1_COND(rwsem_read, _intr, down_read_interruptible(_T->lock), _RET == 0) -DEFINE_GUARD(rwsem_write, struct rw_semaphore *, down_write(_T), up_write(_T)) -DEFINE_GUARD_COND(rwsem_write, _try, down_write_trylock(_T)) -DEFINE_GUARD_COND(rwsem_write, _kill, down_write_killable(_T), _RET == 0) +DECLARE_LOCK_GUARD_1_ATTRS(rwsem_read, __assumes_ctx_guard(_T), /* */) +DECLARE_LOCK_GUARD_1_ATTRS(rwsem_read_try, __assumes_ctx_guard(_T), /* */) +DECLARE_LOCK_GUARD_1_ATTRS(rwsem_read_intr, __assumes_ctx_guard(_T), /* */) + +DEFINE_LOCK_GUARD_1(rwsem_write, struct rw_semaphore, down_write(_T->lock), up_write(_T->lock)) +DEFINE_LOCK_GUARD_1_COND(rwsem_write, _try, down_write_trylock(_T->lock)) +DEFINE_LOCK_GUARD_1_COND(rwsem_write, _kill, down_write_killable(_T->lock), _RET == 0) + +DECLARE_LOCK_GUARD_1_ATTRS(rwsem_write, __assumes_ctx_guard(_T), /* */) +DECLARE_LOCK_GUARD_1_ATTRS(rwsem_write_try, __assumes_ctx_guard(_T), /* */) +DECLARE_LOCK_GUARD_1_ATTRS(rwsem_write_kill, __assumes_ctx_guard(_T), /* */) /* * downgrade write lock to read lock */ -extern void downgrade_write(struct rw_semaphore *sem); +extern void downgrade_write(struct rw_semaphore *sem) __releases(sem) __acquires_shared(sem); #ifdef CONFIG_DEBUG_LOCK_ALLOC /* @@ -277,11 +293,11 @@ extern void downgrade_write(struct rw_semaphore *sem); * lockdep_set_class() at lock initialization time. * See Documentation/locking/lockdep-design.rst for more details.) */ -extern void down_read_nested(struct rw_semaphore *sem, int subclass); -extern int __must_check down_read_killable_nested(struct rw_semaphore *sem, int subclass); -extern void down_write_nested(struct rw_semaphore *sem, int subclass); -extern int down_write_killable_nested(struct rw_semaphore *sem, int subclass); -extern void _down_write_nest_lock(struct rw_semaphore *sem, struct lockdep_map *nest_lock); +extern void down_read_nested(struct rw_semaphore *sem, int subclass) __acquires_shared(sem); +extern int __must_check down_read_killable_nested(struct rw_semaphore *sem, int subclass) __cond_acquires_shared(0, sem); +extern void down_write_nested(struct rw_semaphore *sem, int subclass) __acquires(sem); +extern int down_write_killable_nested(struct rw_semaphore *sem, int subclass) __cond_acquires(0, sem); +extern void _down_write_nest_lock(struct rw_semaphore *sem, struct lockdep_map *nest_lock) __acquires(sem); # define down_write_nest_lock(sem, nest_lock) \ do { \ @@ -295,8 +311,8 @@ do { \ * [ This API should be avoided as much as possible - the * proper abstraction for this case is completions. ] */ -extern void down_read_non_owner(struct rw_semaphore *sem); -extern void up_read_non_owner(struct rw_semaphore *sem); +extern void down_read_non_owner(struct rw_semaphore *sem) __acquires_shared(sem); +extern void up_read_non_owner(struct rw_semaphore *sem) __releases_shared(sem); #else # define down_read_nested(sem, subclass) down_read(sem) # define down_read_killable_nested(sem, subclass) down_read_killable(sem) diff --git a/lib/test_context-analysis.c b/lib/test_context-analysis.c index bd75b5ade8ff..2203a57cd40d 100644 --- a/lib/test_context-analysis.c +++ b/lib/test_context-analysis.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -255,6 +256,69 @@ static void __used test_seqlock_writer(struct test_seqlock_data *d) write_sequnlock_irqrestore(&d->sl, flags); } +struct test_rwsem_data { + struct rw_semaphore sem; + int counter __guarded_by(&sem); +}; + +static void __used test_rwsem_init(struct test_rwsem_data *d) +{ + init_rwsem(&d->sem); + d->counter = 0; +} + +static void __used test_rwsem_reader(struct test_rwsem_data *d) +{ + down_read(&d->sem); + (void)d->counter; + up_read(&d->sem); + + if (down_read_trylock(&d->sem)) { + (void)d->counter; + up_read(&d->sem); + } +} + +static void __used test_rwsem_writer(struct test_rwsem_data *d) +{ + down_write(&d->sem); + d->counter++; + up_write(&d->sem); + + down_write(&d->sem); + d->counter++; + downgrade_write(&d->sem); + (void)d->counter; + up_read(&d->sem); + + if (down_write_trylock(&d->sem)) { + d->counter++; + up_write(&d->sem); + } +} + +static void __used test_rwsem_assert(struct test_rwsem_data *d) +{ + rwsem_assert_held_nolockdep(&d->sem); + d->counter++; +} + +static void __used test_rwsem_guard(struct test_rwsem_data *d) +{ + { guard(rwsem_read)(&d->sem); (void)d->counter; } + { guard(rwsem_write)(&d->sem); d->counter++; } +} + +static void __used test_rwsem_cond_guard(struct test_rwsem_data *d) +{ + scoped_cond_guard(rwsem_read_try, return, &d->sem) { + (void)d->counter; + } + scoped_cond_guard(rwsem_write_try, return, &d->sem) { + d->counter++; + } +} + struct test_bit_spinlock_data { unsigned long bits; int counter __guarded_by(__bitlock(3, &bits)); -- 2.52.0.rc1.455.g30608eb744-goog