tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

locking: Make rwsem_assert_held_write_nolockdep() build with PREEMPT_RT=y

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2089700

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_held_write()")
Reported-by: Clark Williams <williams@redhat.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Waiman Long <longman@redhat.com>
Link: https://lore.kernel.org/r/20240319182050.U4AzUF3I@linutronix.de
(cherry picked from fa1f51162338b3e2f520d4bfedc42b3b2e00da6d)
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Acked-by: Magali Lemes <magali.lemes@canonical.com>
Acked-by: John Cabaj <john.cabaj@canonical.com>
This commit is contained in:
Sebastian Andrzej Siewior
2024-03-19 19:20:50 +01:00
committed by Kevin Becker
parent c7e8509657
commit e0eea8d35e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/rwbase_rt.h
+2 -2
View File
@@ -31,9 +31,9 @@ static __always_inline bool rw_base_is_locked(const struct rwbase_rt *rwb)
return atomic_read(&rwb->readers) != READER_BIAS;
}
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) != WRITER_BIAS);
return atomic_read(&rwb->readers) == WRITER_BIAS;
}
static __always_inline bool rw_base_is_contended(const struct rwbase_rt *rwb)
include/linux/rwsem.h
+3 -3
View File
@@ -167,14 +167,14 @@ static __always_inline int rwsem_is_locked(const struct rw_semaphore *sem)
return rw_base_is_locked(&sem->rwbase);
}
static inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem)
static __always_inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem)
{
WARN_ON(!rwsem_is_locked(sem));
}
static inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *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));
}
static __always_inline int rwsem_is_contended(struct rw_semaphore *sem)