gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nanosleep: fix tscs_rem underflow issue

Browse Source
This commit is contained in:
NAKAMURA Gou
2015-09-17 21:13:34 +09:00
parent ea5a1a8693
commit 7b32f2f73b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/syscall.c
View File

@ -5024,7 +5024,7 @@ SYSCALL_DECLARE(nanosleep)
unsigned long nanosecs; unsigned long nanosecs;
unsigned long nanosecs_rem; unsigned long nanosecs_rem;
unsigned long tscs; unsigned long tscs;
unsigned long tscs_rem; long tscs_rem;
struct timespec _tv; struct timespec _tv;
struct timespec _rem; struct timespec _rem;
int ret = 0; int ret = 0;
@ -5046,14 +5046,18 @@ SYSCALL_DECLARE(nanosleep)
/* Spin wait */ /* Spin wait */
while (rdtsc() - ts < tscs) { while (rdtsc() - ts < tscs) {
if (hassigpending(cpu_local_var(current))) { if (hassigpending(cpu_local_var(current))) {
tscs_rem = tscs - (rdtsc() - ts);
nanosecs_rem = tscs_rem * ihk_mc_get_ns_per_tsc() / 1000;
ret = -EINTR; ret = -EINTR;
break; break;
} }
} }
if ((ret == -EINTR) && rem) { if ((ret == -EINTR) && rem) {
tscs_rem = tscs - (rdtsc() - ts);
if (tscs_rem < 0) {
tscs_rem = 0;
}
nanosecs_rem = tscs_rem * ihk_mc_get_ns_per_tsc() / 1000;
_rem.tv_sec = nanosecs_rem / NS_PER_SEC; _rem.tv_sec = nanosecs_rem / NS_PER_SEC;
_rem.tv_nsec = nanosecs_rem % NS_PER_SEC; _rem.tv_nsec = nanosecs_rem % NS_PER_SEC;