Skip to content

Commit 3035b9b

Browse files
Ming Leiaxboe
authored andcommitted
ublk: add parameter struct io_uring_cmd * to ublk_prep_auto_buf_reg()
Add parameter `struct io_uring_cmd *` to ublk_prep_auto_buf_reg() and prepare for reusing this helper for the coming UBLK_BATCH_IO feature, which can fetch & commit one batch of io commands via single uring_cmd. Reviewed-by: Caleb Sander Mateos <csander@purestorage.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 9574b21 commit 3035b9b

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/block/ublk_drv.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,11 +1176,12 @@ ublk_auto_buf_reg_fallback(const struct ublk_queue *ubq, struct ublk_io *io)
11761176
}
11771177

11781178
static bool ublk_auto_buf_reg(const struct ublk_queue *ubq, struct request *req,
1179-
struct ublk_io *io, unsigned int issue_flags)
1179+
struct ublk_io *io, struct io_uring_cmd *cmd,
1180+
unsigned int issue_flags)
11801181
{
11811182
int ret;
11821183

1183-
ret = io_buffer_register_bvec(io->cmd, req, ublk_io_release,
1184+
ret = io_buffer_register_bvec(cmd, req, ublk_io_release,
11841185
io->buf.index, issue_flags);
11851186
if (ret) {
11861187
if (io->buf.flags & UBLK_AUTO_BUF_REG_FALLBACK) {
@@ -1192,18 +1193,19 @@ static bool ublk_auto_buf_reg(const struct ublk_queue *ubq, struct request *req,
11921193
}
11931194

11941195
io->task_registered_buffers = 1;
1195-
io->buf_ctx_handle = io_uring_cmd_ctx_handle(io->cmd);
1196+
io->buf_ctx_handle = io_uring_cmd_ctx_handle(cmd);
11961197
io->flags |= UBLK_IO_FLAG_AUTO_BUF_REG;
11971198
return true;
11981199
}
11991200

12001201
static bool ublk_prep_auto_buf_reg(struct ublk_queue *ubq,
12011202
struct request *req, struct ublk_io *io,
1203+
struct io_uring_cmd *cmd,
12021204
unsigned int issue_flags)
12031205
{
12041206
ublk_init_req_ref(ubq, io);
12051207
if (ublk_support_auto_buf_reg(ubq) && ublk_rq_has_data(req))
1206-
return ublk_auto_buf_reg(ubq, req, io, issue_flags);
1208+
return ublk_auto_buf_reg(ubq, req, io, cmd, issue_flags);
12071209

12081210
return true;
12091211
}
@@ -1278,7 +1280,7 @@ static void ublk_dispatch_req(struct ublk_queue *ubq,
12781280
if (!ublk_start_io(ubq, req, io))
12791281
return;
12801282

1281-
if (ublk_prep_auto_buf_reg(ubq, req, io, issue_flags))
1283+
if (ublk_prep_auto_buf_reg(ubq, req, io, io->cmd, issue_flags))
12821284
ublk_complete_io_cmd(io, req, UBLK_IO_RES_OK, issue_flags);
12831285
}
12841286

0 commit comments

Comments
 (0)