diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-18 14:59:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-18 14:59:53 -0800 |
| commit | a66e4cbf7a29fe555ebb995b130b2e059fc26d89 (patch) | |
| tree | 9af87daf0815b364b406f37337ea3f27ea73ff9f /include/linux | |
| parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (diff) | |
| parent | io_uring: disallow self-propelled ring polling (diff) | |
| download | wireguard-linux-a66e4cbf7a29fe555ebb995b130b2e059fc26d89.tar.xz wireguard-linux-a66e4cbf7a29fe555ebb995b130b2e059fc26d89.zip | |
Merge tag 'io_uring-6.1-2022-11-18' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe:
"This is mostly fixing issues around the poll rework, but also two
tweaks for the multishot handling for accept and receive.
All stable material"
* tag 'io_uring-6.1-2022-11-18' of git://git.kernel.dk/linux:
io_uring: disallow self-propelled ring polling
io_uring: fix multishot recv request leaks
io_uring: fix multishot accept request leaks
io_uring: fix tw losing poll events
io_uring: update res mask in io_poll_check_events
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/io_uring.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h index 43bc8a2edccf..0ded9e271523 100644 --- a/include/linux/io_uring.h +++ b/include/linux/io_uring.h @@ -16,6 +16,9 @@ enum io_uring_cmd_flags { IO_URING_F_SQE128 = 4, IO_URING_F_CQE32 = 8, IO_URING_F_IOPOLL = 16, + + /* the request is executed from poll, it should not be freed */ + IO_URING_F_MULTISHOT = 32, }; struct io_uring_cmd { |