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

Make /dev/devctl mpsafe.

Browse Source 
MFC after:	1 week
This commit is contained in:
Mateusz Guzik 2014-03-25 03:28:58 +00:00
parent 7717df1279
commit 37dbba2a44
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/kern/subr_bus.c
View File

@ -358,15 +358,16 @@ device_sysctl_fini(device_t dev)
/* Deprecated way to adjust queue length */ /* Deprecated way to adjust queue length */
static int sysctl_devctl_disable(SYSCTL_HANDLER_ARGS); static int sysctl_devctl_disable(SYSCTL_HANDLER_ARGS);
/* XXX Need to support old-style tunable hw.bus.devctl_disable" */ /* XXX Need to support old-style tunable hw.bus.devctl_disable" */
SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RW, NULL, SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RW |
0, sysctl_devctl_disable, "I", "devctl disable -- deprecated"); CTLFLAG_MPSAFE, NULL, 0, sysctl_devctl_disable, "I",
"devctl disable -- deprecated");
#define DEVCTL_DEFAULT_QUEUE_LEN 1000 #define DEVCTL_DEFAULT_QUEUE_LEN 1000
static int sysctl_devctl_queue(SYSCTL_HANDLER_ARGS); static int sysctl_devctl_queue(SYSCTL_HANDLER_ARGS);
static int devctl_queue_length = DEVCTL_DEFAULT_QUEUE_LEN; static int devctl_queue_length = DEVCTL_DEFAULT_QUEUE_LEN;
TUNABLE_INT("hw.bus.devctl_queue", &devctl_queue_length); TUNABLE_INT("hw.bus.devctl_queue", &devctl_queue_length);
SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_queue, CTLTYPE_INT | CTLFLAG_RW, NULL, SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_queue, CTLTYPE_INT | CTLFLAG_RW |
0, sysctl_devctl_queue, "I", "devctl queue length"); CTLFLAG_MPSAFE, NULL, 0, sysctl_devctl_queue, "I", "devctl queue length");
static d_open_t devopen; static d_open_t devopen;
static d_close_t devclose; static d_close_t devclose;
@ -376,7 +377,6 @@ static d_poll_t devpoll;
static struct cdevsw dev_cdevsw = { static struct cdevsw dev_cdevsw = {
.d_version = D_VERSION, .d_version = D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = devopen, .d_open = devopen,
.d_close = devclose, .d_close = devclose,
.d_read = devread, .d_read = devread,
@ -420,23 +420,31 @@ devinit(void)
static int static int
devopen(struct cdev *dev, int oflags, int devtype, struct thread *td) devopen(struct cdev *dev, int oflags, int devtype, struct thread *td)
{ {
if (devsoftc.inuse) if (devsoftc.inuse)
return (EBUSY); return (EBUSY);
mtx_lock(&devsoftc.mtx);
if (devsoftc.inuse) {
mtx_unlock(&devsoftc.mtx);
return (EBUSY);
}
/* move to init */ /* move to init */
devsoftc.inuse = 1; devsoftc.inuse = 1;
devsoftc.nonblock = 0; devsoftc.nonblock = 0;
devsoftc.async_proc = NULL; devsoftc.async_proc = NULL;
mtx_unlock(&devsoftc.mtx);
return (0); return (0);
} }
static int static int
devclose(struct cdev *dev, int fflag, int devtype, struct thread *td) devclose(struct cdev *dev, int fflag, int devtype, struct thread *td)
{ {
devsoftc.inuse = 0;
mtx_lock(&devsoftc.mtx); mtx_lock(&devsoftc.mtx);
devsoftc.inuse = 0;
devsoftc.async_proc = NULL;
cv_broadcast(&devsoftc.cv); cv_broadcast(&devsoftc.cv);
mtx_unlock(&devsoftc.mtx); mtx_unlock(&devsoftc.mtx);
devsoftc.async_proc = NULL;
return (0); return (0);
} }