mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
293007b033
If CONFIG_IO_URING isn't set, then io_uring_sqe_cmd() is not defined.
As the nvme driver uses this helper, it causes a compilation issue:
drivers/nvme/host/ioctl.c: In function 'nvme_uring_cmd_io':
drivers/nvme/host/ioctl.c:555:44: error: implicit declaration of function 'io_uring_sqe_cmd'; did you mean 'io_uring_free'? [-Werror=implicit-function-declaration]
555 | const struct nvme_uring_cmd *cmd = io_uring_sqe_cmd(ioucmd->sqe);
| ^~~~~~~~~~~~~~~~
| io_uring_free
Fix it by just making io_uring_sqe_cmd() generally available - the types
are known, and there's no reason to hide it under CONFIG_IO_URING.
Fixes: fd9b8547bc ("io_uring: Pass whole sqe to commands")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Chen-Yu Tsai <wenst@chromium.org>
Tested-by: Chen-Yu Tsai <wenst@chromium.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
107 lines
2.7 KiB
C
107 lines
2.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
#ifndef _LINUX_IO_URING_H
|
|
#define _LINUX_IO_URING_H
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/xarray.h>
|
|
#include <uapi/linux/io_uring.h>
|
|
|
|
enum io_uring_cmd_flags {
|
|
IO_URING_F_COMPLETE_DEFER = 1,
|
|
IO_URING_F_UNLOCKED = 2,
|
|
/* the request is executed from poll, it should not be freed */
|
|
IO_URING_F_MULTISHOT = 4,
|
|
/* executed by io-wq */
|
|
IO_URING_F_IOWQ = 8,
|
|
/* int's last bit, sign checks are usually faster than a bit test */
|
|
IO_URING_F_NONBLOCK = INT_MIN,
|
|
|
|
/* ctx state flags, for URING_CMD */
|
|
IO_URING_F_SQE128 = (1 << 8),
|
|
IO_URING_F_CQE32 = (1 << 9),
|
|
IO_URING_F_IOPOLL = (1 << 10),
|
|
};
|
|
|
|
struct io_uring_cmd {
|
|
struct file *file;
|
|
const struct io_uring_sqe *sqe;
|
|
union {
|
|
/* callback to defer completions to task context */
|
|
void (*task_work_cb)(struct io_uring_cmd *cmd, unsigned);
|
|
/* used for polled completion */
|
|
void *cookie;
|
|
};
|
|
u32 cmd_op;
|
|
u32 flags;
|
|
u8 pdu[32]; /* available inline for free use */
|
|
};
|
|
|
|
static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
|
|
{
|
|
return sqe->cmd;
|
|
}
|
|
|
|
#if defined(CONFIG_IO_URING)
|
|
int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
|
|
struct iov_iter *iter, void *ioucmd);
|
|
void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, ssize_t res2,
|
|
unsigned issue_flags);
|
|
void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,
|
|
void (*task_work_cb)(struct io_uring_cmd *, unsigned));
|
|
struct sock *io_uring_get_socket(struct file *file);
|
|
void __io_uring_cancel(bool cancel_all);
|
|
void __io_uring_free(struct task_struct *tsk);
|
|
void io_uring_unreg_ringfd(void);
|
|
const char *io_uring_get_opcode(u8 opcode);
|
|
|
|
static inline void io_uring_files_cancel(void)
|
|
{
|
|
if (current->io_uring) {
|
|
io_uring_unreg_ringfd();
|
|
__io_uring_cancel(false);
|
|
}
|
|
}
|
|
static inline void io_uring_task_cancel(void)
|
|
{
|
|
if (current->io_uring)
|
|
__io_uring_cancel(true);
|
|
}
|
|
static inline void io_uring_free(struct task_struct *tsk)
|
|
{
|
|
if (tsk->io_uring)
|
|
__io_uring_free(tsk);
|
|
}
|
|
#else
|
|
static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
|
|
struct iov_iter *iter, void *ioucmd)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret,
|
|
ssize_t ret2, unsigned issue_flags)
|
|
{
|
|
}
|
|
static inline void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,
|
|
void (*task_work_cb)(struct io_uring_cmd *, unsigned))
|
|
{
|
|
}
|
|
static inline struct sock *io_uring_get_socket(struct file *file)
|
|
{
|
|
return NULL;
|
|
}
|
|
static inline void io_uring_task_cancel(void)
|
|
{
|
|
}
|
|
static inline void io_uring_files_cancel(void)
|
|
{
|
|
}
|
|
static inline void io_uring_free(struct task_struct *tsk)
|
|
{
|
|
}
|
|
static inline const char *io_uring_get_opcode(u8 opcode)
|
|
{
|
|
return "";
|
|
}
|
|
#endif
|
|
|
|
#endif
|