Commit 91db6edc authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/cmd: move net cmd into a separate file 



We keep socket io_uring command implementation in io_uring/uring_cmd.c.
Separate it from generic command code into a separate file.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/747d0519a2255bd055ae76b691d38d2b4c311001.1745843119.git.asml.silence@gmail.com


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

io_uring/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ obj-$(CONFIG_IO_WQ) += io-wq.o 
obj-$(CONFIG_FUTEX)		+= futex.o

obj-$(CONFIG_EPOLL)		+= epoll.o

obj-$(CONFIG_NET_RX_BUSY_POLL)	+= napi.o

obj-$(CONFIG_NET) += cmd_net.o

io_uring/cmd_net.c

0 → 100644
+83 −0
Original line number Diff line number Diff line 
#include <asm/ioctls.h>

#include <linux/io_uring/net.h>

#include <net/sock.h>



#include "uring_cmd.h"



static inline int io_uring_cmd_getsockopt(struct socket *sock,

					  struct io_uring_cmd *cmd,

					  unsigned int issue_flags)

{

	const struct io_uring_sqe *sqe = cmd->sqe;

	bool compat = !!(issue_flags & IO_URING_F_COMPAT);

	int optlen, optname, level, err;

	void __user *optval;



	level = READ_ONCE(sqe->level);

	if (level != SOL_SOCKET)

		return -EOPNOTSUPP;



	optval = u64_to_user_ptr(READ_ONCE(sqe->optval));

	optname = READ_ONCE(sqe->optname);

	optlen = READ_ONCE(sqe->optlen);



	err = do_sock_getsockopt(sock, compat, level, optname,

				 USER_SOCKPTR(optval),

				 KERNEL_SOCKPTR(&optlen));

	if (err)

		return err;



	/* On success, return optlen */

	return optlen;

}



static inline int io_uring_cmd_setsockopt(struct socket *sock,

					  struct io_uring_cmd *cmd,

					  unsigned int issue_flags)

{

	const struct io_uring_sqe *sqe = cmd->sqe;

	bool compat = !!(issue_flags & IO_URING_F_COMPAT);

	int optname, optlen, level;

	void __user *optval;

	sockptr_t optval_s;



	optval = u64_to_user_ptr(READ_ONCE(sqe->optval));

	optname = READ_ONCE(sqe->optname);

	optlen = READ_ONCE(sqe->optlen);

	level = READ_ONCE(sqe->level);

	optval_s = USER_SOCKPTR(optval);



	return do_sock_setsockopt(sock, compat, level, optname, optval_s,

				  optlen);

}



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

{

	struct socket *sock = cmd->file->private_data;

	struct sock *sk = sock->sk;

	struct proto *prot = READ_ONCE(sk->sk_prot);

	int ret, arg = 0;



	if (!prot || !prot->ioctl)

		return -EOPNOTSUPP;



	switch (cmd->cmd_op) {

	case SOCKET_URING_OP_SIOCINQ:

		ret = prot->ioctl(sk, SIOCINQ, &arg);

		if (ret)

			return ret;

		return arg;

	case SOCKET_URING_OP_SIOCOUTQ:

		ret = prot->ioctl(sk, SIOCOUTQ, &arg);

		if (ret)

			return ret;

		return arg;

	case SOCKET_URING_OP_GETSOCKOPT:

		return io_uring_cmd_getsockopt(sock, cmd, issue_flags);

	case SOCKET_URING_OP_SETSOCKOPT:

		return io_uring_cmd_setsockopt(sock, cmd, issue_flags);

	default:

		return -EOPNOTSUPP;

	}

}

EXPORT_SYMBOL_GPL(io_uring_cmd_sock);

io_uring/uring_cmd.c

+0 −83
Original line number Diff line number Diff line
@@ -3,13 +3,10 @@ 
#include <linux/errno.h>

#include <linux/file.h>

#include <linux/io_uring/cmd.h>

#include <linux/io_uring/net.h>

#include <linux/security.h>

#include <linux/nospec.h>

#include <net/sock.h>



#include <uapi/linux/io_uring.h>

#include <asm/ioctls.h>



#include "io_uring.h"

#include "alloc_cache.h"
@@ -302,83 +299,3 @@ void io_uring_cmd_issue_blocking(struct io_uring_cmd *ioucmd) 


	io_req_queue_iowq(req);

}
 


static inline int io_uring_cmd_getsockopt(struct socket *sock,

					  struct io_uring_cmd *cmd,

					  unsigned int issue_flags)

{

	const struct io_uring_sqe *sqe = cmd->sqe;

	bool compat = !!(issue_flags & IO_URING_F_COMPAT);

	int optlen, optname, level, err;

	void __user *optval;



	level = READ_ONCE(sqe->level);

	if (level != SOL_SOCKET)

		return -EOPNOTSUPP;



	optval = u64_to_user_ptr(READ_ONCE(sqe->optval));

	optname = READ_ONCE(sqe->optname);

	optlen = READ_ONCE(sqe->optlen);



	err = do_sock_getsockopt(sock, compat, level, optname,

				 USER_SOCKPTR(optval),

				 KERNEL_SOCKPTR(&optlen));

	if (err)

		return err;



	/* On success, return optlen */

	return optlen;

}



static inline int io_uring_cmd_setsockopt(struct socket *sock,

					  struct io_uring_cmd *cmd,

					  unsigned int issue_flags)

{

	const struct io_uring_sqe *sqe = cmd->sqe;

	bool compat = !!(issue_flags & IO_URING_F_COMPAT);

	int optname, optlen, level;

	void __user *optval;

	sockptr_t optval_s;



	optval = u64_to_user_ptr(READ_ONCE(sqe->optval));

	optname = READ_ONCE(sqe->optname);

	optlen = READ_ONCE(sqe->optlen);

	level = READ_ONCE(sqe->level);

	optval_s = USER_SOCKPTR(optval);



	return do_sock_setsockopt(sock, compat, level, optname, optval_s,

				  optlen);

}



#if defined(CONFIG_NET)

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

{

	struct socket *sock = cmd->file->private_data;

	struct sock *sk = sock->sk;

	struct proto *prot = READ_ONCE(sk->sk_prot);

	int ret, arg = 0;



	if (!prot || !prot->ioctl)

		return -EOPNOTSUPP;



	switch (cmd->cmd_op) {

	case SOCKET_URING_OP_SIOCINQ:

		ret = prot->ioctl(sk, SIOCINQ, &arg);

		if (ret)

			return ret;

		return arg;

	case SOCKET_URING_OP_SIOCOUTQ:

		ret = prot->ioctl(sk, SIOCOUTQ, &arg);

		if (ret)

			return ret;

		return arg;

	case SOCKET_URING_OP_GETSOCKOPT:

		return io_uring_cmd_getsockopt(sock, cmd, issue_flags);

	case SOCKET_URING_OP_SETSOCKOPT:

		return io_uring_cmd_setsockopt(sock, cmd, issue_flags);

	default:

		return -EOPNOTSUPP;

	}

}

EXPORT_SYMBOL_GPL(io_uring_cmd_sock);

#endif