This adds an api to register and unregister the napi prefer busy poll
setting from liburing. To be able to use this functionality, the
corresponding liburing patch is needed.
Signed-off-by: Stefan Roesch <shr@xxxxxxxxxxxx>
Acked-by: Jakub Kicinski <kuba@xxxxxxxxxx>
---
include/uapi/linux/io_uring.h | 3 ++-
io_uring/io_uring.c | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index fce4533c81c3..e166bbe5bad8 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -645,7 +645,8 @@ struct io_uring_buf_reg {
/* argument for IORING_(UN)REGISTER_NAPI */
struct io_uring_napi {
__u32 busy_poll_to;
- __u32 pad;
+ __u8 prefer_busy_poll;
+ __u8 pad[3];
__u64 resv;
};
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index f2509f0afc7b..90dac6c001ac 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -4251,15 +4251,17 @@ static int io_register_napi(struct io_ring_ctx *ctx, void __user *arg)
#ifdef CONFIG_NET_RX_BUSY_POLL
const struct io_uring_napi curr = {
.busy_poll_to = ctx->napi_busy_poll_to,
+ .prefer_busy_poll = ctx->napi_prefer_busy_poll
};
struct io_uring_napi napi;
if (copy_from_user(&napi, arg, sizeof(napi)))
return -EFAULT;
- if (napi.pad || napi.resv)
+ if (napi.pad[0] || napi.pad[1] || napi.pad[2] || napi.resv)
return -EINVAL;
WRITE_ONCE(ctx->napi_busy_poll_to, napi.busy_poll_to);
+ WRITE_ONCE(ctx->napi_prefer_busy_poll, !!napi.prefer_busy_poll);
if (copy_to_user(arg, &curr, sizeof(curr)))
return -EFAULT;
@@ -4275,6 +4277,7 @@ static int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg)
#ifdef CONFIG_NET_RX_BUSY_POLL
const struct io_uring_napi curr = {
.busy_poll_to = ctx->napi_busy_poll_to,
+ .prefer_busy_poll = ctx->napi_prefer_busy_poll
};
if (arg) {
@@ -4283,6 +4286,7 @@ static int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg)
}
WRITE_ONCE(ctx->napi_busy_poll_to, 0);
+ WRITE_ONCE(ctx->napi_prefer_busy_poll, false);
return 0;
#else
return -EINVAL;
--
2.30.2
