mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-27 06:34:11 +08:00
b10827814e
Commit fb9edbe984 shortened held_lock->check from a 2-bit field
to a 1-bit field.
Make liblockdep compatible with the new definition by passing check=1
to lock_acquire() calls, rather than the old value check=2 (which
inadvertently disabled checks by overflowing to 0).
Without this fix, several of the test cases in liblockdep run_tests.sh
were failing.
Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
87 lines
2.6 KiB
C
87 lines
2.6 KiB
C
#ifndef _LIBLOCKDEP_RWLOCK_H
|
|
#define _LIBLOCKDEP_RWLOCK_H
|
|
|
|
#include <pthread.h>
|
|
#include "common.h"
|
|
|
|
struct liblockdep_pthread_rwlock {
|
|
pthread_rwlock_t rwlock;
|
|
struct lockdep_map dep_map;
|
|
};
|
|
|
|
typedef struct liblockdep_pthread_rwlock liblockdep_pthread_rwlock_t;
|
|
|
|
#define LIBLOCKDEP_PTHREAD_RWLOCK_INITIALIZER(rwl) \
|
|
(struct liblockdep_pthread_rwlock) { \
|
|
.rwlock = PTHREAD_RWLOCK_INITIALIZER, \
|
|
.dep_map = STATIC_LOCKDEP_MAP_INIT(#rwl, &((&(rwl))->dep_map)), \
|
|
}
|
|
|
|
static inline int __rwlock_init(liblockdep_pthread_rwlock_t *lock,
|
|
const char *name,
|
|
struct lock_class_key *key,
|
|
const pthread_rwlockattr_t *attr)
|
|
{
|
|
lockdep_init_map(&lock->dep_map, name, key, 0);
|
|
|
|
return pthread_rwlock_init(&lock->rwlock, attr);
|
|
}
|
|
|
|
#define liblockdep_pthread_rwlock_init(lock, attr) \
|
|
({ \
|
|
static struct lock_class_key __key; \
|
|
\
|
|
__rwlock_init((lock), #lock, &__key, (attr)); \
|
|
})
|
|
|
|
static inline int liblockdep_pthread_rwlock_rdlock(liblockdep_pthread_rwlock_t *lock)
|
|
{
|
|
lock_acquire(&lock->dep_map, 0, 0, 2, 1, NULL, (unsigned long)_RET_IP_);
|
|
return pthread_rwlock_rdlock(&lock->rwlock);
|
|
|
|
}
|
|
|
|
static inline int liblockdep_pthread_rwlock_unlock(liblockdep_pthread_rwlock_t *lock)
|
|
{
|
|
lock_release(&lock->dep_map, 0, (unsigned long)_RET_IP_);
|
|
return pthread_rwlock_unlock(&lock->rwlock);
|
|
}
|
|
|
|
static inline int liblockdep_pthread_rwlock_wrlock(liblockdep_pthread_rwlock_t *lock)
|
|
{
|
|
lock_acquire(&lock->dep_map, 0, 0, 0, 1, NULL, (unsigned long)_RET_IP_);
|
|
return pthread_rwlock_wrlock(&lock->rwlock);
|
|
}
|
|
|
|
static inline int liblockdep_pthread_rwlock_tryrdlock(liblockdep_pthread_rwlock_t *lock)
|
|
{
|
|
lock_acquire(&lock->dep_map, 0, 1, 2, 1, NULL, (unsigned long)_RET_IP_);
|
|
return pthread_rwlock_tryrdlock(&lock->rwlock) == 0 ? 1 : 0;
|
|
}
|
|
|
|
static inline int liblockdep_pthread_rwlock_trywlock(liblockdep_pthread_rwlock_t *lock)
|
|
{
|
|
lock_acquire(&lock->dep_map, 0, 1, 0, 1, NULL, (unsigned long)_RET_IP_);
|
|
return pthread_rwlock_trywlock(&lock->rwlock) == 0 ? 1 : 0;
|
|
}
|
|
|
|
static inline int liblockdep_rwlock_destroy(liblockdep_pthread_rwlock_t *lock)
|
|
{
|
|
return pthread_rwlock_destroy(&lock->rwlock);
|
|
}
|
|
|
|
#ifdef __USE_LIBLOCKDEP
|
|
|
|
#define pthread_rwlock_t liblockdep_pthread_rwlock_t
|
|
#define pthread_rwlock_init liblockdep_pthread_rwlock_init
|
|
#define pthread_rwlock_rdlock liblockdep_pthread_rwlock_rdlock
|
|
#define pthread_rwlock_unlock liblockdep_pthread_rwlock_unlock
|
|
#define pthread_rwlock_wrlock liblockdep_pthread_rwlock_wrlock
|
|
#define pthread_rwlock_tryrdlock liblockdep_pthread_rwlock_tryrdlock
|
|
#define pthread_rwlock_trywlock liblockdep_pthread_rwlock_trywlock
|
|
#define pthread_rwlock_destroy liblockdep_rwlock_destroy
|
|
|
|
#endif
|
|
|
|
#endif
|