History

Merge tag 'for-5.19/io_uring-socket-2022-05-22' of git://git.kernel.dk/linux-block

Pull io_uring socket() support from Jens Axboe: "This adds support for socket(2) for io_uring. This is handy when using direct / registered file descriptors with io_uring. Outside of those two patches, a small series from Dylan on top that improves the tracing by providing a text representation of the opcode rather than needing to decode this by reading the header file every time. That sits in this branch as it was the last opcode added (until it wasn't...)" * tag 'for-5.19/io_uring-socket-2022-05-22' of git://git.kernel.dk/linux-block: io_uring: use the text representation of ops in trace io_uring: rename op -> opcode io_uring: add io_uring_get_opcode io_uring: add type to op enum io_uring: add socket(2) support net: add __sys_socket_file()

Linus Torvalds committed 4 years ago

Commit 368da432 parents 09beaff 033b87d6 files · +248 −26Browse files

Showing the changes to include/uapi (1 of 6 files). Show all

Unified · Split

include/uapi/linux/io_uring.h+2−1
@@ -128,7 +128,7 @@ enum { · 127 unmodified lines
128 */128 */
129#define IORING_SETUP_TASKRUN_FLAG (1U << 9)129#define IORING_SETUP_TASKRUN_FLAG (1U << 9)
130 130
131enum {131enum io_uring_op {
132 IORING_OP_NOP,132 IORING_OP_NOP,
133 IORING_OP_READV,133 IORING_OP_READV,
134 IORING_OP_WRITEV,134 IORING_OP_WRITEV,
@@ -174,6 +174,7 @@ enum { · 39 unmodified lines
174 IORING_OP_SETXATTR,174 IORING_OP_SETXATTR,
175 IORING_OP_FGETXATTR,175 IORING_OP_FGETXATTR,
176 IORING_OP_GETXATTR,176 IORING_OP_GETXATTR,
177 IORING_OP_SOCKET,
177 178
178 /* this goes last, obviously */179 /* this goes last, obviously */
179 IORING_OP_LAST,180 IORING_OP_LAST,