io_uring: separate header for exported net bits
Subsystems (3)
PATCH 1/1 io_uring: separate header for exported net bits
From: Pavel Begunkov <[email protected]>
From: Pavel Begunkov <[email protected]>
We're exporting some io_uring bits to networking, e.g. for implementing a net callback for io_uring cmds, but we don't want to expose more than needed. Add a separate header for networking.
---
David: This has been pulled out from ZC Rx patchset as it can be merged separately.
--- include/linux/io_uring.h | 6 ------ include/linux/io_uring/net.h | 18 ++++++++++++++++++ io_uring/uring_cmd.c | 1 + net/socket.c | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 include/linux/io_uring/net.h
include/linux/io_uring.h +0 -6
@@ -11,7 +11,6 @@ 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 )
@@ -45,11 +44,6 @@ static inline const char *io_uring_get_opcode(u8 opcode) {return "" ; } -static inline int io_uring_cmd_sock (struct io_uring_cmd *cmd, -unsigned int issue_flags) -{ -return -EOPNOTSUPP ; -}static inline bool io_is_uring_fops (struct file *file) {return false;
include/linux/io_uring/net.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _LINUX_IO_URING_NET_H +#define _LINUX_IO_URING_NET_H + +struct io_uring_cmd ; + +#if defined(CONFIG_IO_URING ) +int io_uring_cmd_sock (struct io_uring_cmd *cmd,unsigned int issue_flags); + +#else +static inline int io_uring_cmd_sock (struct io_uring_cmd *cmd, +unsigned int issue_flags) +{ +return -EOPNOTSUPP ; +} +#endif + +#endif
io_uring/uring_cmd.c +1 -0
@@ -3,6 +3,7 @@#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>
net/socket.c +1 -1
@@ -88,7 +88,7 @@#include <linux/xattr.h> #include <linux/nospec.h> #include <linux/indirect_call_wrapper.h> -#include <linux/io_uring.h> +#include <linux/io_uring/net.h> #include <linux/uaccess.h> #include <asm/unistd.h>
Signature · 1 line
2.43.0
Jens Axboe
maintainerQuoted 1 line · David Wei
(cherry picked from commit
9218ba39c2bf0e7bb44e88968801cdc4e6e9fb3e)
This one doesn't make any sense for the commit message, as it's some sha from a tree that nobody knows about. Not a big deal, I axed it from the commit message, just mentioning it for future patches.
Signature · 1 line
Jens Axboe
Quoted 9 lines · David Wei
From: Pavel Begunkov <[email protected]>
We're exporting some
io_uringbits to networking, e.g. for implementing a net callback forio_uringcmds, but we don't want to expose more than needed. Add a separate header for networking.(cherry picked from commit
9218ba39c2bf0e7bb44e88968801cdc4e6e9fb3e)[...]
Applied, thanks!
[1/1] io_uring: separate header for exported net bits
commit: fb34c62057a7d040dedb3169f5fab9b9d341a561
Best regards,
Signature · 1 line
Jens Axboe