提交 00fefb9c 编写于 作者: G Gu Zheng 提交者: Benjamin LaHaise

aio: use iovec array rather than the single one

Previously, we only offer a single iovec to handle all the read/write cases, so
the PREADV/PWRITEV request always need to alloc more iovec buffer when copying
user vectors.
If we use a tmp iovec array rather than the single one, some small PREADV/PWRITEV
workloads(vector size small than the tmp buffer) will not need to alloc more
iovec buffer when copying user vectors.
Reviewed-by: NJeff Moyer <jmoyer@redhat.com>
Signed-off-by: NGu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: NBenjamin LaHaise <bcrl@kvack.org>
上级 2be4e7de
...@@ -1243,12 +1243,12 @@ static ssize_t aio_setup_vectored_rw(struct kiocb *kiocb, ...@@ -1243,12 +1243,12 @@ static ssize_t aio_setup_vectored_rw(struct kiocb *kiocb,
if (compat) if (compat)
ret = compat_rw_copy_check_uvector(rw, ret = compat_rw_copy_check_uvector(rw,
(struct compat_iovec __user *)buf, (struct compat_iovec __user *)buf,
*nr_segs, 1, *iovec, iovec); *nr_segs, UIO_FASTIOV, *iovec, iovec);
else else
#endif #endif
ret = rw_copy_check_uvector(rw, ret = rw_copy_check_uvector(rw,
(struct iovec __user *)buf, (struct iovec __user *)buf,
*nr_segs, 1, *iovec, iovec); *nr_segs, UIO_FASTIOV, *iovec, iovec);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -1285,7 +1285,7 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode, ...@@ -1285,7 +1285,7 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
fmode_t mode; fmode_t mode;
aio_rw_op *rw_op; aio_rw_op *rw_op;
rw_iter_op *iter_op; rw_iter_op *iter_op;
struct iovec inline_vec, *iovec = &inline_vec; struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
struct iov_iter iter; struct iov_iter iter;
switch (opcode) { switch (opcode) {
...@@ -1320,7 +1320,7 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode, ...@@ -1320,7 +1320,7 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
if (!ret) if (!ret)
ret = rw_verify_area(rw, file, &req->ki_pos, req->ki_nbytes); ret = rw_verify_area(rw, file, &req->ki_pos, req->ki_nbytes);
if (ret < 0) { if (ret < 0) {
if (iovec != &inline_vec) if (iovec != inline_vecs)
kfree(iovec); kfree(iovec);
return ret; return ret;
} }
...@@ -1367,7 +1367,7 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode, ...@@ -1367,7 +1367,7 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
return -EINVAL; return -EINVAL;
} }
if (iovec != &inline_vec) if (iovec != inline_vecs)
kfree(iovec); kfree(iovec);
if (ret != -EIOCBQUEUED) { if (ret != -EIOCBQUEUED) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册