[PATCH v9 4/5] io_uring: add register/unregister napi function

Stefan Roesch
2023-02-15T17:45:28Z

This adds an api to register and unregister the napi for io-uring. If
the arg value is specified when unregistering, the current napi setting
for the busy poll timeout is copied into the user structure. If this is
not required, NULL can be passed as the arg value.

Signed-off-by: Stefan Roesch <shr@devkernel.io>
Acked-by: Jakub Kicinski <kuba@kernel.org>
---
include/uapi/linux/io_uring.h | 11 ++++++++
io_uring/io_uring.c | 9 +++++++
io_uring/napi.c | 50 +++++++++++++++++++++++++++++++++++
io_uring/napi.h | 13 +++++++++
4 files changed, 83 insertions(+)

diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 636a4c2c1294..fe25ae92744d 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -518,6 +518,10 @@ enum {
/* register a range of fixed file slots for automatic slot allocation */
IORING_REGISTER_FILE_ALLOC_RANGE = 25,

+ /* set/clear busy poll settings */
+ IORING_REGISTER_NAPI = 26,
+ IORING_UNREGISTER_NAPI = 27,
+
/* this goes last */
IORING_REGISTER_LAST
};
@@ -640,6 +644,13 @@ struct io_uring_buf_reg {
__u64 resv[3];
};

+/* argument for IORING_(UN)REGISTER_NAPI */
+struct io_uring_napi {
+ __u32 busy_poll_to;
+ __u32 pad;
+ __u64 resv;
+};
+
/*
* io_uring_restriction->opcode values
*/
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 556da2de369f..23d7f1d64b23 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -4291,6 +4291,15 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,
break;
ret = io_register_file_alloc_range(ctx, arg);
break;
+ case IORING_REGISTER_NAPI:
+ ret = -EINVAL;
+ if (!arg)
+ break;
+ ret = io_register_napi(ctx, arg);
+ break;
+ case IORING_UNREGISTER_NAPI:
+ ret = io_unregister_napi(ctx, arg);
+ break;
default:
ret = -EINVAL;
break;
diff --git a/io_uring/napi.c b/io_uring/napi.c
index 0fbdfe5eea06..56a4754efcfb 100644
--- a/io_uring/napi.c
+++ b/io_uring/napi.c
@@ -196,6 +196,56 @@ void io_napi_free(struct io_ring_ctx *ctx)
spin_unlock(&ctx->napi_lock);
}

+/*
+ * io_napi_register() - Register napi with io-uring
+ * @ctx: pointer to io-uring context structure
+ * @arg: pointer to io_uring_napi structure
+ *
+ * Register napi in the io-uring context.
+ */
+int io_register_napi(struct io_ring_ctx *ctx, void __user *arg)
+{
+ const struct io_uring_napi curr = {
+ .busy_poll_to = ctx->napi_busy_poll_to,
+ };
+ struct io_uring_napi napi;
+
+ if (copy_from_user(&napi, arg, sizeof(napi)))
+ return -EFAULT;
+ if (napi.pad || napi.resv)
+ return -EINVAL;
+
+ WRITE_ONCE(ctx->napi_busy_poll_to, napi.busy_poll_to);
+
+ if (copy_to_user(arg, &curr, sizeof(curr)))
+ return -EFAULT;
+
+ return 0;
+}
+
+/*
+ * io_napi_unregister() - Unregister napi with io-uring
+ * @ctx: pointer to io-uring context structure
+ * @arg: pointer to io_uring_napi structure
+ *
+ * Unregister napi. If arg has been specified copy the busy poll timeout and
+ * prefer busy poll setting to the passed in structure.
+ */
+int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg)
+{
+ const struct io_uring_napi curr = {
+ .busy_poll_to = ctx->napi_busy_poll_to,
+ };
+
+ if (arg) {
+ if (copy_to_user(arg, &curr, sizeof(curr)))
+ return -EFAULT;
+ }
+
+ WRITE_ONCE(ctx->napi_busy_poll_to, 0);
+ return 0;
+}
+
/*
* io_napi_adjust_timeout() - Add napi id to the busy poll list
* @ctx: pointer to io-uring context structure
diff --git a/io_uring/napi.h b/io_uring/napi.h
index b3455e52170c..8da8f032a441 100644
--- a/io_uring/napi.h
+++ b/io_uring/napi.h
@@ -12,6 +12,9 @@
void io_napi_init(struct io_ring_ctx *ctx);
void io_napi_free(struct io_ring_ctx *ctx);

+int io_register_napi(struct io_ring_ctx *ctx, void __user *arg);
+int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg);
+
void __io_napi_add(struct io_ring_ctx *ctx, struct file *file);

void io_napi_adjust_timeout(struct io_ring_ctx *ctx,
@@ -50,6 +53,16 @@ static inline void io_napi_free(struct io_ring_ctx *ctx)
{
}

+static inline int io_register_napi(struct io_ring_ctx *ctx, void __user *arg)
+{
+ return -EOPNOTSUPP;
+}
+
+static inline int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg)
+{
+ return -EOPNOTSUPP;
+}
+
static inline bool io_napi(struct io_ring_ctx *ctx)
{
return false;
--
2.30.2