Received-SPF: pass (google.com: domain of linux-kernel+bounces-107999-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Tue, 19 Mar 2024 19:20:50 +0100
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: Waiman Long <longman@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>, linux-kernel@vger.kernel.org,
	Boqun Feng <boqun.feng@gmail.com>, Ingo Molnar <mingo@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Thomas Gleixner <tglx@linutronix.de>, Will Deacon <will@kernel.org>,
	Clark Williams <williams@redhat.com>
Subject: [PATCH v2] Locking: Let PREEMPT_RT compile again with new rwsem
 asserts.
Message-ID: <20240319182050.U4AzUF3I@linutronix.de>
References: <20240319070550.ws_uO21-@linutronix.de>
 <ZfmVPid-d7cpf6Yt@casper.infradead.org>
 <20240319141506.DUd9NKl4@linutronix.de>
 <9b4f3dac-779a-4eef-945b-3ca1455c0dfe@redhat.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <9b4f3dac-779a-4eef-945b-3ca1455c0dfe@redhat.com>

The commit cited below broke the build for PREEMPT_RT because
rwsem_assert_held_write_nolockdep() passes a struct rw_semaphore but
rw_base_assert_held_write() expects struct rwbase_rt. Fixing the type
alone leads to the problem that WARN_ON() is not found because bug.h is
missing.

In order to resolve this:
- Keep the assert (WARN_ON()) in rwsem.h (not rwbase_rt.h)
- Make rwsem_assert_held_write_nolockdep() do the implementation
  specific (rw_base) writer check.
- Replace the "inline" with __always_inline which was used before.

Fixes: f70405afc99b1 ("locking: Add rwsem_assert_held() and rwsem_assert_he=
ld_write()")
Reported-by: Clark Williams <williams@redhat.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
v1=E2=80=A6v2:
  - Merge rwsem_held_write() into rwsem_assert_held_write_nolockdep() as
    per Waiman Long / Matthew Wilcox.

 include/linux/rwbase_rt.h | 4 ++--
 include/linux/rwsem.h     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/rwbase_rt.h b/include/linux/rwbase_rt.h
index 29c4e4f243e47..f2394a409c9d5 100644
--- a/include/linux/rwbase_rt.h
+++ b/include/linux/rwbase_rt.h
@@ -31,9 +31,9 @@ static __always_inline bool rw_base_is_locked(const struc=
t rwbase_rt *rwb)
 	return atomic_read(&rwb->readers) !=3D READER_BIAS;
 }
=20
-static inline void rw_base_assert_held_write(const struct rwbase_rt *rwb)
+static __always_inline bool rw_base_is_write_locked(const struct rwbase_rt=
 *rwb)
 {
-	WARN_ON(atomic_read(&rwb->readers) !=3D WRITER_BIAS);
+	return atomic_read(&rwb->readers) =3D=3D WRITER_BIAS;
 }
=20
 static __always_inline bool rw_base_is_contended(const struct rwbase_rt *r=
wb)
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
index 4f1c18992f768..c8b543d428b0a 100644
--- a/include/linux/rwsem.h
+++ b/include/linux/rwsem.h
@@ -167,14 +167,14 @@ static __always_inline int rwsem_is_locked(const stru=
ct rw_semaphore *sem)
 	return rw_base_is_locked(&sem->rwbase);
 }
=20
-static inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *=
sem)
+static __always_inline void rwsem_assert_held_nolockdep(const struct rw_se=
maphore *sem)
 {
 	WARN_ON(!rwsem_is_locked(sem));
 }
=20
-static inline void rwsem_assert_held_write_nolockdep(const struct rw_semap=
hore *sem)
+static __always_inline void rwsem_assert_held_write_nolockdep(const struct=
 rw_semaphore *sem)
 {
-	rw_base_assert_held_write(sem);
+	WARN_ON(!rw_base_is_write_locked(&sem->rwbase));
 }
=20
 static __always_inline int rwsem_is_contended(struct rw_semaphore *sem)
--=20
2.43.0