mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-01 10:42:11 +00:00
fa1f511623
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: f70405afc9 ("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
45 lines
1.0 KiB
C
45 lines
1.0 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
#ifndef _LINUX_RWBASE_RT_H
|
|
#define _LINUX_RWBASE_RT_H
|
|
|
|
#include <linux/rtmutex.h>
|
|
#include <linux/atomic.h>
|
|
|
|
#define READER_BIAS (1U << 31)
|
|
#define WRITER_BIAS (1U << 30)
|
|
|
|
struct rwbase_rt {
|
|
atomic_t readers;
|
|
struct rt_mutex_base rtmutex;
|
|
};
|
|
|
|
#define __RWBASE_INITIALIZER(name) \
|
|
{ \
|
|
.readers = ATOMIC_INIT(READER_BIAS), \
|
|
.rtmutex = __RT_MUTEX_BASE_INITIALIZER(name.rtmutex), \
|
|
}
|
|
|
|
#define init_rwbase_rt(rwbase) \
|
|
do { \
|
|
rt_mutex_base_init(&(rwbase)->rtmutex); \
|
|
atomic_set(&(rwbase)->readers, READER_BIAS); \
|
|
} while (0)
|
|
|
|
|
|
static __always_inline bool rw_base_is_locked(const struct rwbase_rt *rwb)
|
|
{
|
|
return atomic_read(&rwb->readers) != READER_BIAS;
|
|
}
|
|
|
|
static __always_inline bool rw_base_is_write_locked(const struct rwbase_rt *rwb)
|
|
{
|
|
return atomic_read(&rwb->readers) == WRITER_BIAS;
|
|
}
|
|
|
|
static __always_inline bool rw_base_is_contended(const struct rwbase_rt *rwb)
|
|
{
|
|
return atomic_read(&rwb->readers) > 0;
|
|
}
|
|
|
|
#endif /* _LINUX_RWBASE_RT_H */
|