Commit a07d2d79 authored by Bernd Schubert's avatar Bernd Schubert Committed by Jens Axboe
Browse files

io_uring: Change res2 parameter type in io_uring_cmd_done 



Change the type of the res2 parameter in io_uring_cmd_done from ssize_t
to u64. This aligns the parameter type with io_req_set_cqe32_extra,
which expects u64 arguments.
The change eliminates potential issues on 32-bit architectures where
ssize_t might be 32-bit.

Only user of passing res2 is drivers/nvme/host/ioctl.c and it actually
passes u64.

Fixes: ee692a21 ("fs,io_uring: add infrastructure for uring-cmd")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Tested-by: default avatarLi Zetao <lizetao1@huawei.com>
Reviewed-by: default avatarLi Zetao <lizetao1@huawei.com>
Signed-off-by: default avatarBernd Schubert <bschubert@ddn.com>
Link: https://lore.kernel.org/r/20241203-io_uring_cmd_done-res2-as-u64-v2-1-5e59ae617151@ddn.com


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

include/linux/io_uring/cmd.h

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, 
 * 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, ssize_t res2,

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

			unsigned issue_flags);



void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,
@@ -67,7 +67,7 @@ static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, 
	return -EOPNOTSUPP;

}

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

		ssize_t ret2, unsigned issue_flags)

		u64 ret2, unsigned issue_flags)

{

}

static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,

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, ssize_t res2,

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

		       unsigned issue_flags)

{

	struct io_kiocb *req = cmd_to_io_kiocb(ioucmd);