Commit a4104821 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/unix: drop usage of io_uring socket 



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: default avatarJens Axboe <axboe@kernel.dk>
parent c4320315

include/linux/io_uring.h

+5 −5
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 
#include <uapi/linux/io_uring.h>



#if defined(CONFIG_IO_URING)

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);

int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags);

bool io_is_uring_fops(struct file *file);



static inline void io_uring_files_cancel(void)

{
@@ -32,10 +32,6 @@ static inline void io_uring_free(struct task_struct *tsk) 
		__io_uring_free(tsk);

}

#else

static inline struct sock *io_uring_get_socket(struct file *file)

{

	return NULL;

}

static inline void io_uring_task_cancel(void)

{

}
@@ -54,6 +50,10 @@ static inline int io_uring_cmd_sock(struct io_uring_cmd *cmd, 
{

	return -EOPNOTSUPP;

}

static inline bool io_is_uring_fops(struct file *file)

{

	return false;

}

#endif



#endif

io_uring/io_uring.c

+0 −13
Original line number Diff line number Diff line
@@ -171,19 +171,6 @@ static struct ctl_table kernel_io_uring_disabled_table[] = { 
};

#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)

{

	if (!wq_list_empty(&ctx->submit_state.compl_reqs) ||

io_uring/io_uring.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct file *io_file_get_fixed(struct io_kiocb *req, int fd, 
			       unsigned issue_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);

void io_req_task_queue(struct io_kiocb *req);

void io_queue_iowq(struct io_kiocb *req, struct io_tw_state *ts_dont_use);

net/core/scm.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp) 
		if (fd < 0 || !(file = fget_raw(fd)))

			return -EBADF;

		/* don't allow io_uring files */

		if (io_uring_get_socket(file)) {

		if (io_is_uring_fops(file)) {

			fput(file);

			return -EINVAL;

		}

net/unix/scm.c

+1 −3
Original line number Diff line number Diff line
@@ -35,10 +35,8 @@ struct sock *unix_get_socket(struct file *filp) 
		/* PF_UNIX ? */

		if (s && ops && ops->family == PF_UNIX)

			u_sock = s;

	} else {

		/* Could be an io_uring instance */

		u_sock = io_uring_get_socket(filp);

	}



	return u_sock;

}

EXPORT_SYMBOL(unix_get_socket);