Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Block protocol: add user endpoint to IOCTL request

Browse Source 
I/O control requests now come with the endpoint of the user process
that initiated the ioctl(2) call. It is stored in a new BDEV_USER
field, which is an alias for BDEV_FLAGS. The contents of this field
are to be used only in highly specific situations. It should be
preserved (not replaced!) by services that forward IOCTL requests,
and may be set to NONE for service-initiated IOCTL requests.

Change-Id: I68a01b9ce43eca00e61b985a9cf87f55ba683de4
This commit is contained in:
David van Moolenbroek
2013-07-27 00:49:49 +02:00
committed by Lionel Sambuc
parent 113635b019
commit 95624ae072
16 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libbdev/bdev.c
View File

@@ -305,7 +305,8 @@ ssize_t bdev_scatter(dev_t dev, u64_t pos, iovec_t *vec, int count, int flags)
return bdev_vrdwt(BDEV_SCATTER, dev, pos, vec, count, flags);
}
static int bdev_ioctl_setup(dev_t dev, int request, void *buf, message *m)
static int bdev_ioctl_setup(dev_t dev, int request, void *buf,
endpoint_t user_endpt, message *m)
{
/* Set up an I/O control request.
*/
@@ -339,6 +340,7 @@ static int bdev_ioctl_setup(dev_t dev, int request, void *buf, message *m)
m->BDEV_MINOR = minor(dev);
m->BDEV_REQUEST = request;
m->BDEV_GRANT = grant;
m->BDEV_USER = user_endpt;
return OK;
}
@@ -351,7 +353,7 @@ static void bdev_ioctl_cleanup(const message *m)
cpf_revoke(m->BDEV_GRANT);
}
int bdev_ioctl(dev_t dev, int request, void *buf)
int bdev_ioctl(dev_t dev, int request, void *buf, endpoint_t user_endpt)
{
/* Perform a synchronous I/O control request.
*/
@@ -359,7 +361,7 @@ int bdev_ioctl(dev_t dev, int request, void *buf)
int r, driver_tries = 0;
do {
if ((r = bdev_ioctl_setup(dev, request, buf, &m)) != OK)
if ((r = bdev_ioctl_setup(dev, request, buf, user_endpt, &m)) != OK)
break;
r = bdev_sendrec(dev, &m);
@@ -496,7 +498,7 @@ bdev_id_t bdev_scatter_asyn(dev_t dev, u64_t pos, iovec_t *vec, int count,
}
bdev_id_t bdev_ioctl_asyn(dev_t dev, int request, void *buf,
bdev_callback_t callback, bdev_param_t param)
endpoint_t user_endpt, bdev_callback_t callback, bdev_param_t param)
{
/* Perform an asynchronous I/O control request.
*/
@@ -506,7 +508,8 @@ bdev_id_t bdev_ioctl_asyn(dev_t dev, int request, void *buf,
if ((call = bdev_call_alloc(1)) == NULL)
return ENOMEM;
if ((r = bdev_ioctl_setup(dev, request, buf, &call->msg)) != OK) {
if ((r = bdev_ioctl_setup(dev, request, buf, user_endpt,
&call->msg)) != OK) {
bdev_call_free(call);
return r;
@@ -623,7 +626,8 @@ int bdev_restart_asyn(bdev_call_t *call)
bdev_ioctl_cleanup(&call->msg);
r = bdev_ioctl_setup(call->dev, call->msg.BDEV_REQUEST,
(char *) call->vec[0].iov_addr, &call->msg);
(char *) call->vec[0].iov_addr, call->msg.BDEV_USER,
&call->msg);
break;