GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-03 21:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aio: split out iocb copy from io_submit_one()

Browse source 
In preparation of handing in iocbs in a different fashion as well. Also
make it clear that the iocb being passed in isn't modified, by marking
it const throughout.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2018-11-24 14:46:14 -07:00
parent 71ebc6fef0
commit 88a6f18b95
1 changed files with 38 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

68
fs/aio.c
View file

@ -1422,7 +1422,7 @@ static void aio_complete_rw(struct kiocb *kiocb, long res, long res2)
aio_complete(iocb, res, res2); aio_complete(iocb, res, res2);
} }
static int aio_prep_rw(struct kiocb *req, struct iocb *iocb) static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb)
{ {
int ret; int ret;
@ -1463,7 +1463,7 @@ out_fput:
return ret; return ret;
} }
static int aio_setup_rw(int rw, struct iocb *iocb, struct iovec **iovec, static int aio_setup_rw(int rw, const struct iocb *iocb, struct iovec **iovec,
bool vectored, bool compat, struct iov_iter *iter) bool vectored, bool compat, struct iov_iter *iter)
{ {
void __user *buf = (void __user *)(uintptr_t)iocb->aio_buf; void __user *buf = (void __user *)(uintptr_t)iocb->aio_buf;
@ -1502,8 +1502,8 @@ static inline void aio_rw_done(struct kiocb *req, ssize_t ret)
} }
} }
static ssize_t aio_read(struct kiocb *req, struct iocb *iocb, bool vectored, static ssize_t aio_read(struct kiocb *req, const struct iocb *iocb,
bool compat) bool vectored, bool compat)
{ {
struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs; struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
struct iov_iter iter; struct iov_iter iter;
@ -1535,8 +1535,8 @@ out_fput:
return ret; return ret;
} }
static ssize_t aio_write(struct kiocb *req, struct iocb *iocb, bool vectored, static ssize_t aio_write(struct kiocb *req, const struct iocb *iocb,
bool compat) bool vectored, bool compat)
{ {
struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs; struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
struct iov_iter iter; struct iov_iter iter;
@ -1591,7 +1591,8 @@ static void aio_fsync_work(struct work_struct *work)
aio_complete(container_of(req, struct aio_kiocb, fsync), ret, 0); aio_complete(container_of(req, struct aio_kiocb, fsync), ret, 0);
} }
static int aio_fsync(struct fsync_iocb *req, struct iocb *iocb, bool datasync) static int aio_fsync(struct fsync_iocb *req, const struct iocb *iocb,
bool datasync)
{ {
if (unlikely(iocb->aio_buf || iocb->aio_offset || iocb->aio_nbytes || if (unlikely(iocb->aio_buf || iocb->aio_offset || iocb->aio_nbytes ||
iocb->aio_rw_flags)) iocb->aio_rw_flags))
@ -1719,7 +1720,7 @@ aio_poll_queue_proc(struct file *file, struct wait_queue_head *head,
add_wait_queue(head, &pt->iocb->poll.wait); add_wait_queue(head, &pt->iocb->poll.wait);
} }
static ssize_t aio_poll(struct aio_kiocb *aiocb, struct iocb *iocb) static ssize_t aio_poll(struct aio_kiocb *aiocb, const struct iocb *iocb)
{ {
struct kioctx *ctx = aiocb->ki_ctx; struct kioctx *ctx = aiocb->ki_ctx;
struct poll_iocb *req = &aiocb->poll; struct poll_iocb *req = &aiocb->poll;
@ -1791,27 +1792,23 @@ out:
return 0; return 0;
} }
static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
bool compat) struct iocb __user *user_iocb, bool compat)
{ {
struct aio_kiocb *req; struct aio_kiocb *req;
struct iocb iocb;
ssize_t ret; ssize_t ret;
if (unlikely(copy_from_user(&iocb, user_iocb, sizeof(iocb))))
return -EFAULT;
/* enforce forwards compatibility on users */ /* enforce forwards compatibility on users */
if (unlikely(iocb.aio_reserved2)) { if (unlikely(iocb->aio_reserved2)) {
pr_debug("EINVAL: reserve field set\n"); pr_debug("EINVAL: reserve field set\n");
return -EINVAL; return -EINVAL;
} }
/* prevent overflows */ /* prevent overflows */
if (unlikely( if (unlikely(
(iocb.aio_buf != (unsigned long)iocb.aio_buf) || (iocb->aio_buf != (unsigned long)iocb->aio_buf) ||
(iocb.aio_nbytes != (size_t)iocb.aio_nbytes) || (iocb->aio_nbytes != (size_t)iocb->aio_nbytes) ||
((ssize_t)iocb.aio_nbytes < 0) ((ssize_t)iocb->aio_nbytes < 0)
)) { )) {
pr_debug("EINVAL: overflow check\n"); pr_debug("EINVAL: overflow check\n");
return -EINVAL; return -EINVAL;
@ -1825,14 +1822,14 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
if (unlikely(!req)) if (unlikely(!req))
goto out_put_reqs_available; goto out_put_reqs_available;
if (iocb.aio_flags & IOCB_FLAG_RESFD) { if (iocb->aio_flags & IOCB_FLAG_RESFD) {
/* /*
* If the IOCB_FLAG_RESFD flag of aio_flags is set, get an * If the IOCB_FLAG_RESFD flag of aio_flags is set, get an
* instance of the file* now. The file descriptor must be * instance of the file* now. The file descriptor must be
* an eventfd() fd, and will be signaled for each completed * an eventfd() fd, and will be signaled for each completed
* event using the eventfd_signal() function. * event using the eventfd_signal() function.
*/ */
req->ki_eventfd = eventfd_ctx_fdget((int) iocb.aio_resfd); req->ki_eventfd = eventfd_ctx_fdget((int) iocb->aio_resfd);
if (IS_ERR(req->ki_eventfd)) { if (IS_ERR(req->ki_eventfd)) {
ret = PTR_ERR(req->ki_eventfd); ret = PTR_ERR(req->ki_eventfd);
req->ki_eventfd = NULL; req->ki_eventfd = NULL;
@ -1847,32 +1844,32 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
} }
req->ki_user_iocb = user_iocb; req->ki_user_iocb = user_iocb;
req->ki_user_data = iocb.aio_data; req->ki_user_data = iocb->aio_data;
switch (iocb.aio_lio_opcode) { switch (iocb->aio_lio_opcode) {
case IOCB_CMD_PREAD: case IOCB_CMD_PREAD:
ret = aio_read(&req->rw, &iocb, false, compat); ret = aio_read(&req->rw, iocb, false, compat);
break; break;
case IOCB_CMD_PWRITE: case IOCB_CMD_PWRITE:
ret = aio_write(&req->rw, &iocb, false, compat); ret = aio_write(&req->rw, iocb, false, compat);
break; break;
case IOCB_CMD_PREADV: case IOCB_CMD_PREADV:
ret = aio_read(&req->rw, &iocb, true, compat); ret = aio_read(&req->rw, iocb, true, compat);
break; break;
case IOCB_CMD_PWRITEV: case IOCB_CMD_PWRITEV:
ret = aio_write(&req->rw, &iocb, true, compat); ret = aio_write(&req->rw, iocb, true, compat);
break; break;
case IOCB_CMD_FSYNC: case IOCB_CMD_FSYNC:
ret = aio_fsync(&req->fsync, &iocb, false); ret = aio_fsync(&req->fsync, iocb, false);
break; break;
case IOCB_CMD_FDSYNC: case IOCB_CMD_FDSYNC:
ret = aio_fsync(&req->fsync, &iocb, true); ret = aio_fsync(&req->fsync, iocb, true);
break; break;
case IOCB_CMD_POLL: case IOCB_CMD_POLL:
ret = aio_poll(req, &iocb); ret = aio_poll(req, iocb);
break; break;
default: default:
pr_debug("invalid aio operation %d\n", iocb.aio_lio_opcode); pr_debug("invalid aio operation %d\n", iocb->aio_lio_opcode);
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
@ -1894,6 +1891,17 @@ out_put_reqs_available:
return ret; return ret;
} }
static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
bool compat)
{
struct iocb iocb;
if (unlikely(copy_from_user(&iocb, user_iocb, sizeof(iocb))))
return -EFAULT;
return __io_submit_one(ctx, &iocb, user_iocb, compat);
}
/* sys_io_submit: /* sys_io_submit:
* Queue the nr iocbs pointed to by iocbpp for processing. Returns * Queue the nr iocbs pointed to by iocbpp for processing. Returns
* the number of iocbs queued. May return -EINVAL if the aio_context * the number of iocbs queued. May return -EINVAL if the aio_context