alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-09 00:00:17 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

update linux shim with new guards

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-07-15 16:32:57 -04:00
parent ac9ca56637
commit 9becf21b43
4 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/percpu-rwsem.h
View File

@ -4,6 +4,7 @@
#define _LINUX_PERCPU_RWSEM_H
#include <pthread.h>
#include <linux/cleanup.h>
#include <linux/preempt.h>
struct percpu_rw_semaphore {
@ -55,4 +56,11 @@ static inline int percpu_init_rwsem(struct percpu_rw_semaphore *sem)
#define percpu_rwsem_assert_held(sem) do {} while (0)
DEFINE_GUARD(percpu_read, struct percpu_rw_semaphore *,
percpu_down_read(_T), percpu_up_read(_T))
DEFINE_GUARD_COND(percpu_read, _try, percpu_down_read_trylock(_T))
DEFINE_GUARD(percpu_write, struct percpu_rw_semaphore *,
percpu_down_write(_T), percpu_up_write(_T))
#endif

5
include/linux/preempt.h
View File

@ -1,6 +1,8 @@
#ifndef __LINUX_PREEMPT_H
#define __LINUX_PREEMPT_H
#include <linux/cleanup.h>
extern void preempt_disable(void);
extern void preempt_enable(void);
@ -13,4 +15,7 @@ extern void preempt_enable(void);
#define preempt_enable_notrace() preempt_enable()
#define preemptible() 0
DEFINE_LOCK_GUARD_0(preempt, preempt_disable(), preempt_enable())
DEFINE_LOCK_GUARD_0(preempt_notrace, preempt_disable_notrace(), preempt_enable_notrace())
#endif /* __LINUX_PREEMPT_H */

54
include/linux/rwsem.h
View File

@ -2,6 +2,7 @@
#define __TOOLS_LINUX_RWSEM_H
#include <pthread.h>
#include <linux/cleanup.h>
struct rw_semaphore {
pthread_rwlock_t lock;
@ -18,12 +19,53 @@ static inline void init_rwsem(struct rw_semaphore *lock)
pthread_rwlock_init(&lock->lock, NULL);
}
#define down_read(l) pthread_rwlock_rdlock(&(l)->lock)
#define down_read_killable(l) (pthread_rwlock_rdlock(&(l)->lock), 0)
#define down_read_trylock(l) (!pthread_rwlock_tryrdlock(&(l)->lock))
#define up_read(l) pthread_rwlock_unlock(&(l)->lock)
static inline void down_read(struct rw_semaphore *sem)
{
pthread_rwlock_rdlock(&sem->lock);
}
#define down_write(l) pthread_rwlock_wrlock(&(l)->lock)
#define up_write(l) pthread_rwlock_unlock(&(l)->lock)
static inline int down_read_trylock(struct rw_semaphore *sem)
{
return !pthread_rwlock_tryrdlock(&sem->lock);
}
static inline int down_read_interruptible(struct rw_semaphore *sem)
{
pthread_rwlock_rdlock(&sem->lock);
return 0;
}
static inline int down_read_killable(struct rw_semaphore *sem)
{
pthread_rwlock_rdlock(&sem->lock);
return 0;
}
static inline void up_read(struct rw_semaphore *sem)
{
pthread_rwlock_unlock(&sem->lock);
}
static inline void down_write(struct rw_semaphore *sem)
{
pthread_rwlock_wrlock(&sem->lock);
}
static inline int down_write_trylock(struct rw_semaphore *sem)
{
return !pthread_rwlock_trywrlock(&sem->lock);
}
static inline void up_write(struct rw_semaphore *sem)
{
pthread_rwlock_unlock(&sem->lock);
}
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) == 0)
DEFINE_GUARD(rwsem_write, struct rw_semaphore *, down_write(_T), up_write(_T))
DEFINE_GUARD_COND(rwsem_write, _try, down_write_trylock(_T))
#endif /* __TOOLS_LINUX_RWSEM_H */

2
include/linux/spinlock.h
View File

@ -42,11 +42,11 @@ DEFINE_LOCK_GUARD_1(spinlock, spinlock_t,
spin_unlock(_T->lock))
DEFINE_LOCK_GUARD_1_COND(spinlock, _try, spin_trylock(_T->lock))
#if 0
DEFINE_LOCK_GUARD_1(spinlock_irq, spinlock_t,
spin_lock_irq(_T->lock),
spin_unlock_irq(_T->lock))
#if 0
DEFINE_LOCK_GUARD_1_COND(spinlock_irq, _try,
spin_trylock_irq(_T->lock))