From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D277C77B7E for ; Tue, 2 May 2023 16:54:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233923AbjEBQyM (ORCPT ); Tue, 2 May 2023 12:54:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234100AbjEBQyI (ORCPT ); Tue, 2 May 2023 12:54:08 -0400 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B65BF273A for ; Tue, 2 May 2023 09:53:59 -0700 (PDT) Received: by devbig1114.prn1.facebook.com (Postfix, from userid 425415) id 3F6994CF6CC9; Tue, 2 May 2023 09:53:47 -0700 (PDT) From: Stefan Roesch To: io-uring@vger.kernel.org, kernel-team@fb.com Cc: shr@devkernel.io, axboe@kernel.dk, ammarfaizi2@gnuweeb.org, Jakub Kicinski Subject: [PATCH v12 5/5] io_uring: add prefer busy poll to register and unregister napi api Date: Tue, 2 May 2023 09:53:32 -0700 Message-Id: <20230502165332.2075091-6-shr@devkernel.io> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230502165332.2075091-1-shr@devkernel.io> References: <20230502165332.2075091-1-shr@devkernel.io> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org This adds the napi prefer busy poll setting to the register and unregister napi api. When napi is unregistered and arg is specified, both napi settings: busy poll timeout and the prefer busy poll setting are copied into the user structure. Signed-off-by: Stefan Roesch Acked-by: Jakub Kicinski --- include/uapi/linux/io_uring.h | 3 ++- io_uring/napi.c | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.= h index 278c1a9de78c..16d17d6ab7f7 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -656,7 +656,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; }; =20 diff --git a/io_uring/napi.c b/io_uring/napi.c index fa531949fc6f..8b5df89fbb2c 100644 --- a/io_uring/napi.c +++ b/io_uring/napi.c @@ -222,16 +222,18 @@ void io_napi_free(struct io_ring_ctx *ctx) int io_register_napi(struct io_ring_ctx *ctx, void __user *arg) { const struct io_uring_napi curr =3D { - .busy_poll_to =3D ctx->napi_busy_poll_to, + .busy_poll_to =3D ctx->napi_busy_poll_to, + .prefer_busy_poll =3D ctx->napi_prefer_busy_poll }; struct io_uring_napi napi; =20 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; =20 WRITE_ONCE(ctx->napi_busy_poll_to, napi.busy_poll_to); + WRITE_ONCE(ctx->napi_prefer_busy_poll, !!napi.prefer_busy_poll); =20 if (copy_to_user(arg, &curr, sizeof(curr))) return -EFAULT; @@ -250,13 +252,15 @@ int io_register_napi(struct io_ring_ctx *ctx, void = __user *arg) int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg) { const struct io_uring_napi curr =3D { - .busy_poll_to =3D ctx->napi_busy_poll_to, + .busy_poll_to =3D ctx->napi_busy_poll_to, + .prefer_busy_poll =3D ctx->napi_prefer_busy_poll }; =20 if (arg && copy_to_user(arg, &curr, sizeof(curr))) return -EFAULT; =20 WRITE_ONCE(ctx->napi_busy_poll_to, 0); + WRITE_ONCE(ctx->napi_prefer_busy_poll, false); return 0; } =20 --=20 2.39.1