io_uring/unix: drop usage of io_uring socket
Commit a4104821ad
upstream.
Since we no longer allow sending io_uring fds over SCM_RIGHTS, move to
using io_is_uring_fops() to detect whether this is a io_uring fd or not.
With that done, kill off io_uring_get_socket() as nobody calls it
anymore.
This is in preparation to yanking out the rest of the core related to
unix gc with io_uring.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
1d467e1050
commit
28fe81bcd3
|
@ -42,11 +42,11 @@ void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, ssize_t res2,
|
||||||
unsigned issue_flags);
|
unsigned issue_flags);
|
||||||
void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,
|
void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,
|
||||||
void (*task_work_cb)(struct io_uring_cmd *, unsigned));
|
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_cancel(bool cancel_all);
|
||||||
void __io_uring_free(struct task_struct *tsk);
|
void __io_uring_free(struct task_struct *tsk);
|
||||||
void io_uring_unreg_ringfd(void);
|
void io_uring_unreg_ringfd(void);
|
||||||
const char *io_uring_get_opcode(u8 opcode);
|
const char *io_uring_get_opcode(u8 opcode);
|
||||||
|
bool io_is_uring_fops(struct file *file);
|
||||||
|
|
||||||
static inline void io_uring_files_cancel(void)
|
static inline void io_uring_files_cancel(void)
|
||||||
{
|
{
|
||||||
|
@ -71,6 +71,10 @@ static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
|
||||||
{
|
{
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
}
|
}
|
||||||
|
static inline bool io_is_uring_fops(struct file *file)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
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, ssize_t ret,
|
||||||
ssize_t ret2, unsigned issue_flags)
|
ssize_t ret2, unsigned issue_flags)
|
||||||
{
|
{
|
||||||
|
@ -79,10 +83,6 @@ static inline void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,
|
||||||
void (*task_work_cb)(struct io_uring_cmd *, unsigned))
|
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_task_cancel(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,19 +153,6 @@ static void __io_submit_flush_completions(struct io_ring_ctx *ctx);
|
||||||
|
|
||||||
static struct kmem_cache *req_cachep;
|
static struct kmem_cache *req_cachep;
|
||||||
|
|
||||||
struct sock *io_uring_get_socket(struct file *file)
|
|
||||||
{
|
|
||||||
#if defined(CONFIG_UNIX)
|
|
||||||
if (io_is_uring_fops(file)) {
|
|
||||||
struct io_ring_ctx *ctx = file->private_data;
|
|
||||||
|
|
||||||
return ctx->ring_sock->sk;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(io_uring_get_socket);
|
|
||||||
|
|
||||||
static inline void io_submit_flush_completions(struct io_ring_ctx *ctx)
|
static inline void io_submit_flush_completions(struct io_ring_ctx *ctx)
|
||||||
{
|
{
|
||||||
if (!wq_list_empty(&ctx->submit_state.compl_reqs))
|
if (!wq_list_empty(&ctx->submit_state.compl_reqs))
|
||||||
|
|
|
@ -52,7 +52,6 @@ static inline bool io_req_ffs_set(struct io_kiocb *req)
|
||||||
}
|
}
|
||||||
|
|
||||||
void __io_req_task_work_add(struct io_kiocb *req, bool allow_local);
|
void __io_req_task_work_add(struct io_kiocb *req, bool allow_local);
|
||||||
bool io_is_uring_fops(struct file *file);
|
|
||||||
bool io_alloc_async_data(struct io_kiocb *req);
|
bool io_alloc_async_data(struct io_kiocb *req);
|
||||||
void io_req_task_queue(struct io_kiocb *req);
|
void io_req_task_queue(struct io_kiocb *req);
|
||||||
void io_queue_iowq(struct io_kiocb *req, bool *dont_use);
|
void io_queue_iowq(struct io_kiocb *req, bool *dont_use);
|
||||||
|
|
|
@ -105,7 +105,7 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp)
|
||||||
if (fd < 0 || !(file = fget_raw(fd)))
|
if (fd < 0 || !(file = fget_raw(fd)))
|
||||||
return -EBADF;
|
return -EBADF;
|
||||||
/* don't allow io_uring files */
|
/* don't allow io_uring files */
|
||||||
if (io_uring_get_socket(file)) {
|
if (io_is_uring_fops(file)) {
|
||||||
fput(file);
|
fput(file);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,10 +34,8 @@ struct sock *unix_get_socket(struct file *filp)
|
||||||
/* PF_UNIX ? */
|
/* PF_UNIX ? */
|
||||||
if (s && sock->ops && sock->ops->family == PF_UNIX)
|
if (s && sock->ops && sock->ops->family == PF_UNIX)
|
||||||
u_sock = s;
|
u_sock = s;
|
||||||
} else {
|
|
||||||
/* Could be an io_uring instance */
|
|
||||||
u_sock = io_uring_get_socket(filp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return u_sock;
|
return u_sock;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(unix_get_socket);
|
EXPORT_SYMBOL(unix_get_socket);
|
||||||
|
|
Loading…
Reference in New Issue