zig

commit 95def89c232acc53c926731fe5143ea093128d73 (tree)
parent 5f99d2c2407a057e0b239c19189c9e1a36fb1c0f
Author: Joran Dirk Greef <joran@ronomon.com>
Date:   Sat,  3 Oct 2020 14:34:01 +0200

Handle EBADFD (ring fd in bad state) in enter()

Diffstat:
M
lib/std/os/linux/io_uring.zig
 | 
11
+++++++----

1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/std/os/linux/io_uring.zig b/lib/std/os/linux/io_uring.zig
@@ -192,17 +192,20 @@ pub const IO_Uring = struct {
             // The kernel was unable to allocate memory or ran out of resources for the request.
             // The application should wait for some completions and try again:
             linux.EAGAIN => return error.SystemResources,
+            // The SQE `fd` is invalid, or IOSQE_FIXED_FILE was set but no files were registered:
+            linux.EBADF => return error.FileDescriptorInvalid,
+            // The file descriptor is valid, but the ring is not in the right state.
+            // See io_uring_register(2) for how to enable the ring.
+            linux.EBADFD => return error.FileDescriptorInBadState,
             // The application attempted to overcommit the number of requests it can have pending.
             // The application should wait for some completions and try again:
             linux.EBUSY => return error.CompletionQueueOvercommitted,
-            // The SQE `fd` is invalid, or IOSQE_FIXED_FILE was set but no files were registered:
-            linux.EBADF => return error.FileDescriptorInvalid,
+            // The SQE is invalid, or valid but the ring was setup with IORING_SETUP_IOPOLL:
+            linux.EINVAL => return error.SubmissionQueueEntryInvalid,
             // The buffer is outside the process' accessible address space, or IORING_OP_READ_FIXED
             // or IORING_OP_WRITE_FIXED was specified but no buffers were registered, or the range
             // described by `addr` and `len` is not within the buffer registered at `buf_index`:
             linux.EFAULT => return error.BufferInvalid,
-            // The SQE is invalid, or valid but the ring was setup with IORING_SETUP_IOPOLL:
-            linux.EINVAL => return error.SubmissionQueueEntryInvalid,
             linux.ENXIO => return error.RingShuttingDown,
             // The kernel believes our `self.fd` does not refer to an io_uring instance,
             // or the opcode is valid but not supported by this kernel (more likely):