Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

kernel/syscall: make lwip lock irq-safe

Browse source
This commit is contained in:
daniel-k 2016-08-29 16:07:37 +02:00
parent d31ba3c3ac
commit f09df8d82d
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
hermit/kernel/syscall.c
View file

@ -44,7 +44,7 @@
#include <lwip/stats.h>
//TODO: don't use one big kernel lock to comminicate with all proxies
static spinlock_t lwip_lock = SPINLOCK_INIT;
static spinlock_irqsave_t lwip_lock = SPINLOCK_IRQSAVE_INIT;
extern spinlock_irqsave_t stdio_lock;
extern int32_t isle;
@ -85,7 +85,7 @@ void NORETURN sys_exit(int arg)
{
sys_exit_t sysargs = {__NR_exit, arg};
spinlock_lock(&lwip_lock);
spinlock_irqsave_lock(&lwip_lock);
if (libc_sd >= 0)
{
int s = libc_sd;
@ -93,7 +93,7 @@ void NORETURN sys_exit(int arg)
lwip_write(s, &sysargs, sizeof(sysargs));
libc_sd = -1;
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
// switch to LwIP thread
reschedule();
@ -102,7 +102,7 @@ void NORETURN sys_exit(int arg)
idle_poll = 0;
} else {
idle_poll = 0;
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
}
do_exit(arg);
@ -129,9 +129,9 @@ ssize_t sys_read(int fd, char* buf, size_t len)
return ret;
}
spinlock_lock(&lwip_lock);
spinlock_irqsave_lock(&lwip_lock);
if (libc_sd < 0) {
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return -ENOSYS;
}
@ -147,7 +147,7 @@ ssize_t sys_read(int fd, char* buf, size_t len)
{
ret = lwip_read(s, buf+i, j-i);
if (ret < 0) {
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return ret;
}
@ -155,7 +155,7 @@ ssize_t sys_read(int fd, char* buf, size_t len)
}
}
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return j;
}
@ -189,10 +189,10 @@ ssize_t sys_write(int fd, const char* buf, size_t len)
return ret;
}
spinlock_lock(&lwip_lock);
spinlock_irqsave_lock(&lwip_lock);
if (libc_sd < 0)
{
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
spinlock_irqsave_lock(&stdio_lock);
for(i=0; i<len; i++)
@ -210,7 +210,7 @@ ssize_t sys_write(int fd, const char* buf, size_t len)
{
ret = lwip_write(s, (char*)buf+i, len-i);
if (ret < 0) {
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return ret;
}
@ -223,7 +223,7 @@ ssize_t sys_write(int fd, const char* buf, size_t len)
i = ret;
} else i = len;
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return i;
}
@ -266,7 +266,7 @@ int sys_open(const char* name, int flags, int mode)
int s, i, ret, sysnr = __NR_open;
size_t len;
spinlock_lock(&lwip_lock);
spinlock_irqsave_lock(&lwip_lock);
if (libc_sd < 0) {
ret = -EINVAL;
goto out;
@ -309,7 +309,7 @@ int sys_open(const char* name, int flags, int mode)
lwip_read(s, &ret, sizeof(ret));
out:
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return ret;
}
@ -333,7 +333,7 @@ int sys_close(int fd)
return 0;
}
spinlock_lock(&lwip_lock);
spinlock_irqsave_lock(&lwip_lock);
if (libc_sd < 0) {
ret = 0;
goto out;
@ -346,7 +346,7 @@ int sys_close(int fd)
lwip_read(s, &ret, sizeof(ret));
out:
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return ret;
}
@ -443,10 +443,10 @@ off_t sys_lseek(int fd, off_t offset, int whence)
sys_lseek_t sysargs = {__NR_lseek, fd, offset, whence};
int s;
spinlock_lock(&lwip_lock);
spinlock_irqsave_lock(&lwip_lock);
if (libc_sd < 0) {
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return -ENOSYS;
}
@ -454,7 +454,7 @@ off_t sys_lseek(int fd, off_t offset, int whence)
lwip_write(s, &sysargs, sizeof(sysargs));
lwip_read(s, &off, sizeof(off));
spinlock_unlock(&lwip_lock);
spinlock_irqsave_unlock(&lwip_lock);
return off;
}