mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 03:18:31 +00:00
block: ublk: check IO buffer based on flag need_get_data
Currently, uring_cmd with UBLK_IO_FETCH_REQ or
UBLK_IO_COMMIT_AND_FETCH_REQ is always checked whether
userspace server has provided IO buffer even flag
UBLK_F_NEED_GET_DATA is configured.
This is a excessive check. If UBLK_F_NEED_GET_DATA is
configured, FETCH_RQ doesn't need to provide IO buffer;
COMMIT_AND_FETCH_REQ also doesn't need to do that if
the IO type is not READ.
Check ub_cmd->addr together with ublk_need_get_data()
and IO type in ublk_ch_uring_cmd().
With this fix, userspace server doesn't need to preserve
buffers for every ublk_io when flag UBLK_F_NEED_GET_DATA
is configured, in order to save memory.
Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
Fixes: c86019ff75
("ublk_drv: add support for UBLK_IO_NEED_GET_DATA")
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230210141356.112321-1-xiaodong.liu@intel.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
460e9bed82
commit
2f1e07dda1
1 changed files with 9 additions and 4 deletions
|
@ -1265,6 +1265,7 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)
|
||||||
u32 cmd_op = cmd->cmd_op;
|
u32 cmd_op = cmd->cmd_op;
|
||||||
unsigned tag = ub_cmd->tag;
|
unsigned tag = ub_cmd->tag;
|
||||||
int ret = -EINVAL;
|
int ret = -EINVAL;
|
||||||
|
struct request *req;
|
||||||
|
|
||||||
pr_devel("%s: received: cmd op %d queue %d tag %d result %d\n",
|
pr_devel("%s: received: cmd op %d queue %d tag %d result %d\n",
|
||||||
__func__, cmd->cmd_op, ub_cmd->q_id, tag,
|
__func__, cmd->cmd_op, ub_cmd->q_id, tag,
|
||||||
|
@ -1315,8 +1316,8 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)
|
||||||
*/
|
*/
|
||||||
if (io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)
|
if (io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)
|
||||||
goto out;
|
goto out;
|
||||||
/* FETCH_RQ has to provide IO buffer */
|
/* FETCH_RQ has to provide IO buffer if NEED GET DATA is not enabled */
|
||||||
if (!ub_cmd->addr)
|
if (!ub_cmd->addr && !ublk_need_get_data(ubq))
|
||||||
goto out;
|
goto out;
|
||||||
io->cmd = cmd;
|
io->cmd = cmd;
|
||||||
io->flags |= UBLK_IO_FLAG_ACTIVE;
|
io->flags |= UBLK_IO_FLAG_ACTIVE;
|
||||||
|
@ -1325,8 +1326,12 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)
|
||||||
ublk_mark_io_ready(ub, ubq);
|
ublk_mark_io_ready(ub, ubq);
|
||||||
break;
|
break;
|
||||||
case UBLK_IO_COMMIT_AND_FETCH_REQ:
|
case UBLK_IO_COMMIT_AND_FETCH_REQ:
|
||||||
/* FETCH_RQ has to provide IO buffer */
|
req = blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag);
|
||||||
if (!ub_cmd->addr)
|
/*
|
||||||
|
* COMMIT_AND_FETCH_REQ has to provide IO buffer if NEED GET DATA is
|
||||||
|
* not enabled or it is Read IO.
|
||||||
|
*/
|
||||||
|
if (!ub_cmd->addr && (!ublk_need_get_data(ubq) || req_op(req) == REQ_OP_READ))
|
||||||
goto out;
|
goto out;
|
||||||
if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV))
|
if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in a new issue