Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ublk: pass q_id and tag to __ublk_check_and_get_req() 

__ublk_check_and_get_req() only uses its ublk_queue argument to get the
q_id and tag. Pass those arguments explicitly to save an access to the
ublk_queue.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Caleb Sander Mateos 2025-09-17 19:49:46 -06:00 committed by Jens Axboe
parent ce88e3ef33
commit 25c028aa79
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/block/ublk_drv.c
View File

@ -250,8 +250,7 @@ static void ublk_io_release(void *priv);
static void ublk_stop_dev_unlocked(struct ublk_device *ub); static void ublk_stop_dev_unlocked(struct ublk_device *ub);
static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq); static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq);
static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub, static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,
const struct ublk_queue *ubq, struct ublk_io *io, u16 q_id, u16 tag, struct ublk_io *io, size_t offset);
size_t offset);
static inline unsigned int ublk_req_build_flags(struct request *req); static inline unsigned int ublk_req_build_flags(struct request *req);
static inline struct ublksrv_io_desc * static inline struct ublksrv_io_desc *
@ -2126,7 +2125,7 @@ static void ublk_io_release(void *priv)
static int ublk_register_io_buf(struct io_uring_cmd *cmd, static int ublk_register_io_buf(struct io_uring_cmd *cmd,
struct ublk_device *ub, struct ublk_device *ub,
const struct ublk_queue *ubq, u16 q_id, u16 tag,
struct ublk_io *io, struct ublk_io *io,
unsigned int index, unsigned int issue_flags) unsigned int index, unsigned int issue_flags)
{ {
@ -2136,7 +2135,7 @@ static int ublk_register_io_buf(struct io_uring_cmd *cmd,
if (!ublk_dev_support_zero_copy(ub)) if (!ublk_dev_support_zero_copy(ub))
return -EINVAL; return -EINVAL;
req = __ublk_check_and_get_req(ub, ubq, io, 0); req = __ublk_check_and_get_req(ub, q_id, tag, io, 0);
if (!req) if (!req)
return -EINVAL; return -EINVAL;
@ -2153,7 +2152,7 @@ static int ublk_register_io_buf(struct io_uring_cmd *cmd,
static int static int
ublk_daemon_register_io_buf(struct io_uring_cmd *cmd, ublk_daemon_register_io_buf(struct io_uring_cmd *cmd,
struct ublk_device *ub, struct ublk_device *ub,
const struct ublk_queue *ubq, struct ublk_io *io, u16 q_id, u16 tag, struct ublk_io *io,
unsigned index, unsigned issue_flags) unsigned index, unsigned issue_flags)
{ {
unsigned new_registered_buffers; unsigned new_registered_buffers;
@ -2166,7 +2165,7 @@ ublk_daemon_register_io_buf(struct io_uring_cmd *cmd,
*/ */
new_registered_buffers = io->task_registered_buffers + 1; new_registered_buffers = io->task_registered_buffers + 1;
if (unlikely(new_registered_buffers >= UBLK_REFCOUNT_INIT)) if (unlikely(new_registered_buffers >= UBLK_REFCOUNT_INIT))
return ublk_register_io_buf(cmd, ub, ubq, io, index, return ublk_register_io_buf(cmd, ub, q_id, tag, io, index,
issue_flags); issue_flags);
if (!ublk_dev_support_zero_copy(ub) || !ublk_rq_has_data(req)) if (!ublk_dev_support_zero_copy(ub) || !ublk_rq_has_data(req))
@ -2358,8 +2357,8 @@ static int ublk_ch_uring_cmd_local(struct io_uring_cmd *cmd,
* so can be handled on any task * so can be handled on any task
*/ */
if (_IOC_NR(cmd_op) == UBLK_IO_REGISTER_IO_BUF) if (_IOC_NR(cmd_op) == UBLK_IO_REGISTER_IO_BUF)
return ublk_register_io_buf(cmd, ub, ubq, io, addr, return ublk_register_io_buf(cmd, ub, q_id, tag, io,
issue_flags); addr, issue_flags);
goto out; goto out;
} }
@ -2380,7 +2379,7 @@ static int ublk_ch_uring_cmd_local(struct io_uring_cmd *cmd,
switch (_IOC_NR(cmd_op)) { switch (_IOC_NR(cmd_op)) {
case UBLK_IO_REGISTER_IO_BUF: case UBLK_IO_REGISTER_IO_BUF:
return ublk_daemon_register_io_buf(cmd, ub, ubq, io, addr, return ublk_daemon_register_io_buf(cmd, ub, q_id, tag, io, addr,
issue_flags); issue_flags);
case UBLK_IO_COMMIT_AND_FETCH_REQ: case UBLK_IO_COMMIT_AND_FETCH_REQ:
ret = ublk_check_commit_and_fetch(ubq, io, addr); ret = ublk_check_commit_and_fetch(ubq, io, addr);
@ -2429,16 +2428,15 @@ static int ublk_ch_uring_cmd_local(struct io_uring_cmd *cmd,
} }
static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub, static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,
const struct ublk_queue *ubq, struct ublk_io *io, size_t offset) u16 q_id, u16 tag, struct ublk_io *io, size_t offset)
{ {
unsigned tag = io - ubq->ios;
struct request *req; struct request *req;
/* /*
* can't use io->req in case of concurrent UBLK_IO_COMMIT_AND_FETCH_REQ, * can't use io->req in case of concurrent UBLK_IO_COMMIT_AND_FETCH_REQ,
* which would overwrite it with io->cmd * which would overwrite it with io->cmd
*/ */
req = blk_mq_tag_to_rq(ub->tag_set.tags[ubq->q_id], tag); req = blk_mq_tag_to_rq(ub->tag_set.tags[q_id], tag);
if (!req) if (!req)
return NULL; return NULL;
@ -2536,7 +2534,7 @@ static struct request *ublk_check_and_get_req(struct kiocb *iocb,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
*io = &ubq->ios[tag]; *io = &ubq->ios[tag];
req = __ublk_check_and_get_req(ub, ubq, *io, buf_off); req = __ublk_check_and_get_req(ub, q_id, tag, *io, buf_off);
if (!req) if (!req)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);