Add support IORING_SETUP_SQE_MIXED
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Jens Axboe
maintainer(Adding right list)
Quoted 4 lines · Keith Busch
(quoted diff) +4
-0+/* + * Return a 128B sqe to fill. Applications must later call io_uring_submit() + * when it's ready to tell the kernel about it. The caller may call this + * function multiple times before calling io_uring_submit().
Review
Quoted 10 lines
(quoted diff) +10
-0+ * + * Returns a vacant 128B sqe, or NULL if we're full. If the current tail is the + * last entry in the ring, this function will insert a nop + skip complete such + * that the 128b entry wraps back to the beginning of the queue for a + * contiguous big sq entry. It's up to the caller to use a 128b opcode in order + * for the kernel to know how to advance its sq head pointer. + */ +IOURINGINLINE struct io_uring_sqe *io_uring_get_sqe128_mixed(struct io_uring *ring) + LIBURING_NOEXCEPT +{
I would probably just name this io_uring_get_sqe128() and have it work for both MIXED and SQE128. That would make for a cleaner API for the application.
Quoted 15 lines
(quoted diff) +15
-0+ struct io_uring_sq *sq = &ring->sq; + unsigned head = io_uring_load_sq_head(ring), tail = sq->sqe_tail; + struct io_uring_sqe *sqe; + + if (!(ring->flags & IORING_SETUP_SQE_MIXED)) + return NULL; + + if (((tail + 1) & sq->ring_mask) == 0) { + if ((tail + 2) - head >= sq->ring_entries) + return NULL; + + sqe = _io_uring_get_sqe(ring); + io_uring_prep_nop(sqe); + sqe->flags |= IOSQE_CQE_SKIP_SUCCESS; + tail = sq->sqe_tail;
Review
Quoted 10 lines
(quoted diff) +10
-0+ } else if ((tail + 1) - head >= sq->ring_entries) { + return NULL; + } + + sqe = &sq->sqes[tail & sq->ring_mask]; + sq->sqe_tail = tail + 2; + io_uring_initialize_sqe(sqe); + + return sqe; +}
Spurious newline before turn, just group them.
Signature · 1 line
Jens Axboe
A message that is not in the archive (sent off-list or not yet received): [email protected]
Jens Axboe
maintainerRe: [PATCHv5 4/4] Add mixed sqe test for uring commands
Review
Quoted 10 lines
(quoted diff) +10
-0+ ret = io_uring_wait_cqe(ring, &cqe); + if (ret < 0) + fprintf(stderr, "wait completion %d\n", ret); + else if (cqe->user_data != seq) + fprintf(stderr, "Unexpected user_data: %ld\n", (long) cqe->user_data); + else { + io_uring_cqe_seen(ring, cqe); + return T_EXIT_PASS; + } + return T_EXIT_FAIL;
All braces if one has braces. In a few different spots.
Outside of those little nits and the previous comment, I think this is looking fine.
Signature · 1 line
Jens Axboe