XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

ddk: kernel rw locks

Browse Source 
git-svn-id: svn://kolibrios.org@5345 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2015-01-04 15:48:58 +00:00
parent 966e9d897b
commit cfd2f3ef88
5 changed files with 42 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/ddk/core.S
View File

@ -47,6 +47,11 @@
.global _MutexInit .global _MutexInit
.global _MutexLock .global _MutexLock
.global _MutexUnlock .global _MutexUnlock
.global _InitRwsem
.global _DownRead
.global _DownWrite
.global _UpRead
.global _UpWrite
.global _PciApi .global _PciApi
.global _PciRead16 .global _PciRead16
@ -120,6 +125,12 @@
.def _MutexLock; .scl 2; .type 32; .endef .def _MutexLock; .scl 2; .type 32; .endef
.def _MutexUnlock; .scl 2; .type 32; .endef .def _MutexUnlock; .scl 2; .type 32; .endef
.def _InitRwsem; .scl 2; .type 32; .endef
.def _DownRead; .scl 2; .type 32; .endef
.def _DownWrite; .scl 2; .type 32; .endef
.def _UpRead; .scl 2; .type 32; .endef
.def _UpWrite; .scl 2; .type 32; .endef
.def _PciApi; .scl 2; .type 32; .endef .def _PciApi; .scl 2; .type 32; .endef
.def _PciRead16; .scl 2; .type 32; .endef .def _PciRead16; .scl 2; .type 32; .endef
.def _PciRead32; .scl 2; .type 32; .endef .def _PciRead32; .scl 2; .type 32; .endef
@ -191,6 +202,12 @@ _MutexInit:
_MutexLock: _MutexLock:
_MutexUnlock: _MutexUnlock:
_InitRwsem:
_DownRead:
_DownWrite:
_UpRead:
_UpWrite:
_PciApi: _PciApi:
_PciRead16: _PciRead16:
_PciRead32: _PciRead32:
@ -263,6 +280,12 @@ _WaitEventTimeout:
.ascii " -export:MutexLock" # fastcall .ascii " -export:MutexLock" # fastcall
.ascii " -export:MutexUnlock" # fastcall .ascii " -export:MutexUnlock" # fastcall
.ascii " -export:InitRwsem" # fastcall
.ascii " -export:DownRead" # fastcall
.ascii " -export:DownWrite" # fastcall
.ascii " -export:UpRead" # fastcall
.ascii " -export:UpWrite" # fastcall
.ascii " -export:PciApi" # .ascii " -export:PciApi" #
.ascii " -export:PciRead16" # stdcall .ascii " -export:PciRead16" # stdcall
.ascii " -export:PciRead32" # stdcall .ascii " -export:PciRead32" # stdcall

164
drivers/include/asm/rwsem.h
View File

@ -39,112 +39,24 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/asm.h> #include <asm/asm.h>
/* #define FASTCALL __attribute__ ((fastcall)) __attribute__ ((dllimport))
* The bias values and the counter type limits the number of
* potential readers/writers to 32767 for 32 bits and 2147483647
* for 64 bits.
*/
#ifdef CONFIG_X86_64 void FASTCALL DownRead(struct rw_semaphore *sem)__asm__("DownRead");
# define RWSEM_ACTIVE_MASK 0xffffffffL void FASTCALL DownWrite(struct rw_semaphore *sem)__asm__("DownWrite");
#else void FASTCALL UpRead(struct rw_semaphore *sem)__asm__("UpRead");
# define RWSEM_ACTIVE_MASK 0x0000ffffL void FASTCALL UpWrite(struct rw_semaphore *sem)__asm__("UpWrite");
#endif
#define RWSEM_UNLOCKED_VALUE 0x00000000L
#define RWSEM_ACTIVE_BIAS 0x00000001L
#define RWSEM_WAITING_BIAS (-RWSEM_ACTIVE_MASK-1)
#define RWSEM_ACTIVE_READ_BIAS RWSEM_ACTIVE_BIAS
#define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
/* /*
* lock for reading * lock for reading
*/ */
static inline void __down_read(struct rw_semaphore *sem) static inline void __down_read(struct rw_semaphore *sem)
{ {
asm volatile("# beginning down_read\n\t" DownRead(sem);
LOCK_PREFIX _ASM_INC "(%1)\n\t"
/* adds 0x00000001 */
" jns 1f\n"
" call call_rwsem_down_read_failed\n"
"1:\n\t"
"# ending down_read\n\t"
: "+m" (sem->count)
: "a" (sem)
: "memory", "cc");
}
/*
* trylock for reading -- returns 1 if successful, 0 if contention
*/
static inline int __down_read_trylock(struct rw_semaphore *sem)
{
long result, tmp;
asm volatile("# beginning __down_read_trylock\n\t"
" mov %0,%1\n\t"
"1:\n\t"
" mov %1,%2\n\t"
" add %3,%2\n\t"
" jle 2f\n\t"
LOCK_PREFIX " cmpxchg %2,%0\n\t"
" jnz 1b\n\t"
"2:\n\t"
"# ending __down_read_trylock\n\t"
: "+m" (sem->count), "=&a" (result), "=&r" (tmp)
: "i" (RWSEM_ACTIVE_READ_BIAS)
: "memory", "cc");
return result >= 0 ? 1 : 0;
}
/*
* lock for writing
*/
static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
{
long tmp;
asm volatile("# beginning down_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
/* adds 0xffff0001, returns the old value */
" test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
/* was the active mask 0 before? */
" jz 1f\n"
" call call_rwsem_down_write_failed\n"
"1:\n"
"# ending down_write"
: "+m" (sem->count), "=d" (tmp)
: "a" (sem), "1" (RWSEM_ACTIVE_WRITE_BIAS)
: "memory", "cc");
} }
static inline void __down_write(struct rw_semaphore *sem) static inline void __down_write(struct rw_semaphore *sem)
{ {
__down_write_nested(sem, 0); DownWrite(sem);
}
/*
* trylock for writing -- returns 1 if successful, 0 if contention
*/
static inline int __down_write_trylock(struct rw_semaphore *sem)
{
long result, tmp;
asm volatile("# beginning __down_write_trylock\n\t"
" mov %0,%1\n\t"
"1:\n\t"
" test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
/* was the active mask 0 before? */
" jnz 2f\n\t"
" mov %1,%2\n\t"
" add %3,%2\n\t"
LOCK_PREFIX " cmpxchg %2,%0\n\t"
" jnz 1b\n\t"
"2:\n\t"
" sete %b1\n\t"
" movzbl %b1, %k1\n\t"
"# ending __down_write_trylock\n\t"
: "+m" (sem->count), "=&a" (result), "=&r" (tmp)
: "er" (RWSEM_ACTIVE_WRITE_BIAS)
: "memory", "cc");
return result;
} }
/* /*
@ -152,17 +64,7 @@ static inline int __down_write_trylock(struct rw_semaphore *sem)
*/ */
static inline void __up_read(struct rw_semaphore *sem) static inline void __up_read(struct rw_semaphore *sem)
{ {
long tmp; UpRead(sem);
asm volatile("# beginning __up_read\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
/* subtracts 1, returns the old value */
" jns 1f\n\t"
" call call_rwsem_wake\n" /* expects old value in %edx */
"1:\n"
"# ending __up_read\n"
: "+m" (sem->count), "=d" (tmp)
: "a" (sem), "1" (-RWSEM_ACTIVE_READ_BIAS)
: "memory", "cc");
} }
/* /*
@ -170,55 +72,7 @@ static inline void __up_read(struct rw_semaphore *sem)
*/ */
static inline void __up_write(struct rw_semaphore *sem) static inline void __up_write(struct rw_semaphore *sem)
{ {
long tmp; UpWrite(sem);
asm volatile("# beginning __up_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
/* subtracts 0xffff0001, returns the old value */
" jns 1f\n\t"
" call call_rwsem_wake\n" /* expects old value in %edx */
"1:\n\t"
"# ending __up_write\n"
: "+m" (sem->count), "=d" (tmp)
: "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS)
: "memory", "cc");
}
/*
* downgrade write lock to read lock
*/
static inline void __downgrade_write(struct rw_semaphore *sem)
{
asm volatile("# beginning __downgrade_write\n\t"
LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
/*
* transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
* 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
*/
" jns 1f\n\t"
" call call_rwsem_downgrade_wake\n"
"1:\n\t"
"# ending __downgrade_write\n"
: "+m" (sem->count)
: "a" (sem), "er" (-RWSEM_WAITING_BIAS)
: "memory", "cc");
}
/*
* implement atomic add functionality
*/
static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
{
asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
: "+m" (sem->count)
: "er" (delta));
}
/*
* implement exchange and add functionality
*/
static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
{
return delta + xadd(&sem->count, delta);
} }
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

1
drivers/include/ddk.h
View File

@ -7,6 +7,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/rwsem.h>
#include <linux/pci.h> #include <linux/pci.h>

2
drivers/include/linux/rwsem.h
View File

@ -25,8 +25,8 @@ struct rw_semaphore;
#else #else
/* All arch specific implementations share the same struct */ /* All arch specific implementations share the same struct */
struct rw_semaphore { struct rw_semaphore {
long count;
struct list_head wait_list; struct list_head wait_list;
long count;
raw_spinlock_t wait_lock; raw_spinlock_t wait_lock;
#ifdef CONFIG_RWSEM_SPIN_ON_OWNER #ifdef CONFIG_RWSEM_SPIN_ON_OWNER
struct optimistic_spin_queue osq; /* spinner MCS lock */ struct optimistic_spin_queue osq; /* spinner MCS lock */

11
drivers/include/syscall.h
View File

@ -1,9 +1,8 @@
#include <ddk.h>
#ifndef __SYSCALL_H__ #ifndef __SYSCALL_H__
#define __SYSCALL_H__ #define __SYSCALL_H__
#include <ddk.h>
typedef u32 addr_t; typedef u32 addr_t;
typedef u32 count_t; typedef u32 count_t;
@ -55,6 +54,12 @@ void FASTCALL MutexInit(struct mutex*)__asm__("MutexInit");
void FASTCALL MutexLock(struct mutex*)__asm__("MutexLock"); void FASTCALL MutexLock(struct mutex*)__asm__("MutexLock");
void FASTCALL MutexUnlock(struct mutex*)__asm__("MutexUnlock"); void FASTCALL MutexUnlock(struct mutex*)__asm__("MutexUnlock");
void FASTCALL InitRwsem(struct rw_semaphore *sem)__asm__("InitRwsem");
void FASTCALL DownRead(struct rw_semaphore *sem)__asm__("DownRead");
void FASTCALL DownWrite(struct rw_semaphore *sem)__asm__("DownWrite");
void FASTCALL UpRead(struct rw_semaphore *sem)__asm__("UpRead");
void FASTCALL UpWrite(struct rw_semaphore *sem)__asm__("UpWrite");
addr_t IMPORT GetStackBase(void)__asm__("GetStackBase"); addr_t IMPORT GetStackBase(void)__asm__("GetStackBase");
u32 IMPORT GetPid(void)__asm__("GetPid"); u32 IMPORT GetPid(void)__asm__("GetPid");