bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-6.15/io_uring-epoll-wait' into for-6.15/io_uring-reg-vec

Browse Source 
* for-6.15/io_uring-epoll-wait:
  io_uring/epoll: add support for IORING_OP_EPOLL_WAIT
  io_uring/epoll: remove CONFIG_EPOLL guards
  eventpoll: add epoll_sendevents() helper
  eventpoll: abstract out ep_try_send_events() helper
  eventpoll: abstract out parameter sanity checking
This commit is contained in:
Jens Axboe
2025-03-07 09:07:19 -07:00
parent 78b6f6e9bf 19f7e94273
commit 6e3da40ed6
7 changed files with 122 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
io_uring/opdef.c
View File

@@ -527,6 +527,17 @@ const struct io_issue_def io_issue_defs[] = {
.issue = io_recvzc,
#else
.prep = io_eopnotsupp_prep,
#endif
},
[IORING_OP_EPOLL_WAIT] = {
.needs_file = 1,
.audit_skip = 1,
.pollin = 1,
#if defined(CONFIG_EPOLL)
.prep = io_epoll_wait_prep,
.issue = io_epoll_wait,
#else
.prep = io_eopnotsupp_prep,
#endif
},
};
@@ -761,6 +772,9 @@ const struct io_cold_def io_cold_defs[] = {
[IORING_OP_RECV_ZC] = {
.name = "RECV_ZC",
},
[IORING_OP_EPOLL_WAIT] = {
.name = "EPOLL_WAIT",
},
};
const char *io_uring_get_opcode(u8 opcode)