mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
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
049f043fe8
commit
303c0a1383
5 changed files with 7 additions and 23 deletions
|
@ -46,7 +46,6 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
|
||||||
struct iov_iter *iter, void *ioucmd);
|
struct iov_iter *iter, void *ioucmd);
|
||||||
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, ssize_t res2,
|
||||||
unsigned issue_flags);
|
unsigned issue_flags);
|
||||||
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);
|
||||||
|
@ -82,6 +81,7 @@ static inline void io_uring_free(struct task_struct *tsk)
|
||||||
__io_uring_free(tsk);
|
__io_uring_free(tsk);
|
||||||
}
|
}
|
||||||
int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags);
|
int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags);
|
||||||
|
bool io_is_uring_fops(struct file *file);
|
||||||
#else
|
#else
|
||||||
static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
|
static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
|
||||||
struct iov_iter *iter, void *ioucmd)
|
struct iov_iter *iter, void *ioucmd)
|
||||||
|
@ -100,10 +100,6 @@ static inline void io_uring_cmd_do_in_task_lazy(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)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -122,6 +118,10 @@ static inline int io_uring_cmd_sock(struct io_uring_cmd *cmd,
|
||||||
{
|
{
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
}
|
}
|
||||||
|
static inline bool io_is_uring_fops(struct file *file)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -175,19 +175,6 @@ static struct ctl_table kernel_io_uring_disabled_table[] = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
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) ||
|
||||||
|
|
|
@ -61,7 +61,6 @@ struct file *io_file_get_fixed(struct io_kiocb *req, int fd,
|
||||||
unsigned issue_flags);
|
unsigned issue_flags);
|
||||||
|
|
||||||
void __io_req_task_work_add(struct io_kiocb *req, unsigned flags);
|
void __io_req_task_work_add(struct io_kiocb *req, unsigned flags);
|
||||||
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, struct io_tw_state *ts_dont_use);
|
void io_queue_iowq(struct io_kiocb *req, struct io_tw_state *ts_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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,10 +35,8 @@ struct sock *unix_get_socket(struct file *filp)
|
||||||
/* PF_UNIX ? */
|
/* PF_UNIX ? */
|
||||||
if (s && ops && ops->family == PF_UNIX)
|
if (s && ops && 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 a new issue