Commit dd386b0d authored by Caleb Sander Mateos's avatar Caleb Sander Mateos Committed by Jens Axboe
Browse files

io_uring/uring_cmd: correct io_uring_cmd_done() ret type 



io_uring_cmd_done() takes the result code for the CQE as a ssize_t ret
argument. However, the CQE res field is a s32 value, as is the argument
to io_req_set_res(). To clarify that only s32 values can be faithfully
represented without truncation, change io_uring_cmd_done()'s ret
argument type to s32.

Signed-off-by: default avatarCaleb Sander Mateos <csander@purestorage.com>
Link: https://lore.kernel.org/r/20250902012609.1513123-1-csander@purestorage.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent df3a7762

include/linux/io_uring/cmd.h

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd, 
 * Note: the caller should never hard code @issue_flags and is only allowed

 * to pass the mask provided by the core io_uring code.

 */

void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, u64 res2,

void io_uring_cmd_done(struct io_uring_cmd *cmd, s32 ret, u64 res2,

			unsigned issue_flags);



void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,
@@ -104,7 +104,7 @@ static inline int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd, 
{

	return -EOPNOTSUPP;

}

static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret,

static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, s32 ret,

		u64 ret2, unsigned issue_flags)

{

}

io_uring/uring_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static inline void io_req_set_cqe32_extra(struct io_kiocb *req, 
 * Called by consumers of io_uring_cmd, if they originally returned

 * -EIOCBQUEUED upon receiving the command.

 */

void io_uring_cmd_done(struct io_uring_cmd *ioucmd, ssize_t ret, u64 res2,

void io_uring_cmd_done(struct io_uring_cmd *ioucmd, s32 ret, u64 res2,

		       unsigned issue_flags)

{

	struct io_kiocb *req = cmd_to_io_kiocb(ioucmd);