d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More locking fixes.

Browse Source
This commit is contained in:
Benno Rice 2002-05-12 13:43:21 +00:00
parent 163c384f66
commit 608cd3ca29
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/powerpc/aim/trap.c
View File

@ -265,8 +265,6 @@ trap(frame)
int n;
register_t args[10];
PROC_LOCK(p);
#if 0
uvmexp.syscalls++;
#endif
@ -309,6 +307,13 @@ trap(frame)
params = args;
}
/*
* Try to run the syscall without Giant if the syscall
* is MP safe.
*/
if ((callp->sy_narg & SYF_MPSAFE) == 0)
mtx_lock(&Giant);
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSCALL))
ktrsyscall(p, code, argsize, params);
@ -344,12 +349,17 @@ syscall_bad:
break;
}
/*
* Release Giant if we had to get it. Don't use
* mtx_owned(), we want to catch broken syscalls.
*/
if ((callp->sy_narg & SYF_MPSAFE) == 0)
mtx_unlock(&Giant);
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p, code, error, rval[0]);
#endif
}
PROC_UNLOCK(p);
break;
case EXC_FPU|EXC_USER:

16
sys/powerpc/powerpc/trap.c
View File

@ -265,8 +265,6 @@ trap(frame)
int n;
register_t args[10];
PROC_LOCK(p);
#if 0
uvmexp.syscalls++;
#endif
@ -309,6 +307,13 @@ trap(frame)
params = args;
}
/*
* Try to run the syscall without Giant if the syscall
* is MP safe.
*/
if ((callp->sy_narg & SYF_MPSAFE) == 0)
mtx_lock(&Giant);
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSCALL))
ktrsyscall(p, code, argsize, params);
@ -344,12 +349,17 @@ syscall_bad:
break;
}
/*
* Release Giant if we had to get it. Don't use
* mtx_owned(), we want to catch broken syscalls.
*/
if ((callp->sy_narg & SYF_MPSAFE) == 0)
mtx_unlock(&Giant);
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p, code, error, rval[0]);
#endif
}
PROC_UNLOCK(p);
break;
case EXC_FPU|EXC_USER: