mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-30 05:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mouse: fix deadlock

Browse Source
This commit is contained in:
Matheus
2024-04-20 15:46:17 -03:00
parent 65ca92b3a3
commit d10de37498
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/io/mouse.c
+19 -8
View File
@@ -23,6 +23,7 @@ static mouse_t *newmouse() {
POLL_INITHEADER(&mouse->pollheader);
SPINLOCK_INIT(mouse->lock);
MUTEX_INIT(&mouse->readmutex);
return mouse;
}
@@ -77,11 +78,7 @@ static int read(int minor, void *buffer, size_t size, uintmax_t offset, int flag
if (packetcount == 0)
return error;
// disable interrupts here as to not lose any interrupts
// and because we cannot sleep with a raised ipl
bool oldintstatus = interrupt_set(false);
spinlock_acquire(&mouse->lock);
MUTEX_ACQUIRE(&mouse->readmutex, false);
// wait until there is data to read or return if nonblock
for (;;) {
polldesc_t desc = {0};
@@ -89,22 +86,33 @@ static int read(int minor, void *buffer, size_t size, uintmax_t offset, int flag
if (error)
goto leave;
// disable interrupts here as to not lose any interrupts
// and because we cannot sleep with a raised ipl
bool oldintstatus = interrupt_set(false);
spinlock_acquire(&mouse->lock);
int revents = internalpoll(mouse, &desc.data[0], POLLIN);
if (revents) {
spinlock_release(&mouse->lock);
interrupt_set(oldintstatus);
poll_leave(&desc);
poll_destroydesc(&desc);
break;
}
if (revents == 0 && flags & V_FFLAGS_NONBLOCKING) {
spinlock_release(&mouse->lock);
interrupt_set(oldintstatus);
poll_leave(&desc);
poll_destroydesc(&desc);
error = EAGAIN;
goto leave;
}
spinlock_release(&mouse->lock);
error = poll_dowait(&desc, 0);
spinlock_acquire(&mouse->lock);
interrupt_set(oldintstatus);
poll_leave(&desc);
poll_destroydesc(&desc);
@@ -117,8 +125,7 @@ static int read(int minor, void *buffer, size_t size, uintmax_t offset, int flag
__assert(*readc);
leave:
spinlock_release(&mouse->lock);
interrupt_set(oldintstatus);
MUTEX_RELEASE(&mouse->readmutex);
return error;
}
@@ -128,12 +135,16 @@ static int poll(int minor, polldata_t *data, int events) {
if (mouse == NULL)
return POLLERR;
MUTEX_ACQUIRE(&mouse->readmutex, false);
long ipl = interrupt_raiseipl(IPL_MOUSE);
spinlock_acquire(&mouse->lock);
int revents = internalpoll(mouse, data, events);
spinlock_release(&mouse->lock);
interrupt_loweripl(ipl);
MUTEX_RELEASE(&mouse->readmutex);
return revents;
}