History

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

* for-6.15/io_uring: (80 commits) io_uring: introduce io_cache_free() helper io_uring/rsrc: skip NULL file/buffer checks in io_free_rsrc_node() io_uring/rsrc: avoid NULL node check on io_sqe_buffer_register() failure io_uring/rsrc: call io_free_node() on io_sqe_buffer_register() failure io_uring/rsrc: free io_rsrc_node using kfree() io_uring/rsrc: split out io_free_node() helper io_uring/rsrc: include io_uring_types.h in rsrc.h ublk: don't cast registered buffer index to int io_uring/nop: use io_find_buf_node() io_uring/rsrc: declare io_find_buf_node() in header file io_uring/ublk: report error when unregister operation fails io_uring: convert cmd_to_io_kiocb() macro to function io_uring/uring_cmd: specify io_uring_cmd_import_fixed() pointer type io_uring/rsrc: use rq_data_dir() to compute bvec dir selftests: ublk: add ublk zero copy test selftests: ublk: add file backed ublk selftests: ublk: add kernel selftests for ublk io_uring: cache nodes and mapped buffers ublk: zc register/unregister bvec io_uring: add support for kernel registered bvecs ...

Jens Axboe committed 1 year ago

Commit 94765d72 parents 7eb1721 0d83b8a47 files · +2982 −841Browse files

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

Unified · Split

include/uapi/linux/ublk_cmd.h+4−0
@@ -94,6 +94,10 @@ · 93 unmodified lines
9494 _IOWR('u', UBLK_IO_COMMIT_AND_FETCH_REQ, struct ublksrv_io_cmd)
9595 #define UBLK_U_IO_NEED_GET_DATA \
9696 _IOWR('u', UBLK_IO_NEED_GET_DATA, struct ublksrv_io_cmd)
97+#define UBLK_U_IO_REGISTER_IO_BUF \
98+ _IOWR('u', 0x23, struct ublksrv_io_cmd)
99+#define UBLK_U_IO_UNREGISTER_IO_BUF \
100+ _IOWR('u', 0x24, struct ublksrv_io_cmd)
97101
98102 /* only ABORT means that no re-fetch */
99103 #define UBLK_IO_RES_OK 0

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t