Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make AIO initialization MP-safe. 

Actually, lwp_exit() with (l != curlwp) will not work.
This fix might be pulled up from vmlocking branch.
This commit is contained in:
rmind 2007-05-31 06:24:23 +00:00
parent 7fb92a5963
commit 59085afd2c
3 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_exit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_exit.c,v 1.179 2007/05/17 14:51:39 yamt Exp $ */
/* $NetBSD: kern_exit.c,v 1.180 2007/05/31 06:24:23 rmind Exp $ */
/*-
* Copyright (c) 1998, 1999, 2006, 2007 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.179 2007/05/17 14:51:39 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.180 2007/05/31 06:24:23 rmind Exp $");
#include "opt_ktrace.h"
#include "opt_perfctrs.h"
@ -240,7 +240,7 @@ exit1(struct lwp *l, int rv)
mutex_exit(&p->p_smutex);
/* Destroy all AIO works */
aio_exit(p);
aio_exit(p, p->p_aio);
/*
* Drain all remaining references that procfs, ptrace and others may

38
sys/kern/sys_aio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_aio.c,v 1.4 2007/05/31 05:29:43 rmind Exp $ */
/* $NetBSD: sys_aio.c,v 1.5 2007/05/31 06:24:23 rmind Exp $ */
/*
* Copyright (c) 2007, Mindaugas Rasiukevicius <rmind at NetBSD org>
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.4 2007/05/31 05:29:43 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.5 2007/05/31 06:24:23 rmind Exp $");
#include "opt_ddb.h"
@ -103,40 +103,39 @@ aio_init(struct proc *p)
if (aio == NULL)
return EAGAIN;
/* Recheck if we are really first */
mutex_enter(&p->p_mutex);
if (p->p_aio) {
mutex_exit(&p->p_mutex);
kmem_free(aio, sizeof(struct aioproc));
return 0;
}
p->p_aio = aio;
/* Initialize queue and their synchronization structures */
mutex_init(&aio->aio_mtx, MUTEX_DEFAULT, IPL_NONE);
cv_init(&aio->aio_worker_cv, "aiowork");
cv_init(&aio->done_cv, "aiodone");
TAILQ_INIT(&aio->jobs_queue);
/* It is safe to leave this window without AIO worker set */
mutex_exit(&p->p_mutex);
/*
* Create an AIO worker thread.
* XXX: Currently, AIO thread is not protected against user's actions.
*/
inmem = uvm_uarea_alloc(&uaddr);
if (uaddr == 0) {
aio_exit(p);
aio_exit(p, aio);
return EAGAIN;
}
if (newlwp(curlwp, p, uaddr, inmem, 0, NULL, 0,
aio_worker, NULL, &l)) {
uvm_uarea_free(uaddr);
aio_exit(p);
aio_exit(p, aio);
return EAGAIN;
}
/* Recheck if we are really first */
mutex_enter(&p->p_mutex);
if (p->p_aio) {
mutex_exit(&p->p_mutex);
aio_exit(p, aio);
lwp_exit(l);
return 0;
}
p->p_aio = aio;
mutex_exit(&p->p_mutex);
/* Complete the initialization of thread, and run it */
mutex_enter(&p->p_smutex);
aio->aio_worker = l;
@ -155,14 +154,12 @@ aio_init(struct proc *p)
* Exit of Asynchronous I/O subsystem of process.
*/
void
aio_exit(struct proc *p)
aio_exit(struct proc *p, struct aioproc *aio)
{
struct aioproc *aio;
struct aio_job *a_job;
if (p->p_aio == NULL)
if (aio == NULL)
return;
aio = p->p_aio;
/* Free AIO queue */
while (!TAILQ_EMPTY(&aio->jobs_queue)) {
@ -177,7 +174,6 @@ aio_exit(struct proc *p)
cv_destroy(&aio->done_cv);
mutex_destroy(&aio->aio_mtx);
kmem_free(aio, sizeof(struct aioproc));
p->p_aio = NULL;
}
/*

4
sys/sys/aio.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: aio.h,v 1.4 2007/05/31 05:39:24 rmind Exp $ */
/* $NetBSD: aio.h,v 1.5 2007/05/31 06:24:23 rmind Exp $ */
/*
* Copyright (c) 2007, Mindaugas Rasiukevicius <rmind at NetBSD org>
@ -115,7 +115,7 @@ struct aioproc {
/* Prototypes */
void aio_sysinit(void);
int aio_init(struct proc *);
void aio_exit(struct proc *);
void aio_exit(struct proc *, struct aioproc *);
void aio_print_jobs(void (*pr)(const char *, ...));
#endif /* _KERNEL */