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 682EFC64ED8 for ; Wed, 15 Feb 2023 17:45:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229920AbjBORp3 (ORCPT ); Wed, 15 Feb 2023 12:45:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229830AbjBORpZ (ORCPT ); Wed, 15 Feb 2023 12:45:25 -0500 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 815153C2A4 for ; Wed, 15 Feb 2023 09:45:21 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 375B871625B8; Wed, 15 Feb 2023 09:45:01 -0800 (PST) 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 v9 5/5] io_uring: add prefer busy poll to register and unregister napi api Date: Wed, 15 Feb 2023 09:44:52 -0800 Message-Id: <20230215174452.3373598-6-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230215174452.3373598-1-shr@devkernel.io> References: <20230215174452.3373598-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 | 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 fe25ae92744d..e14f31a4b10c 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -647,7 +647,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 56a4754efcfb..ca12ff5f5611 100644 --- a/io_uring/napi.c +++ b/io_uring/napi.c @@ -207,15 +207,17 @@ 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, + .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; @@ -235,6 +237,7 @@ 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, + .prefer_busy_poll =3D ctx->napi_prefer_busy_poll }; =20 if (arg) { @@ -243,6 +246,7 @@ int io_unregister_napi(struct io_ring_ctx *ctx, void = __user *arg) } =20 WRITE_ONCE(ctx->napi_busy_poll_to, 0); + WRITE_ONCE(ctx->napi_prefer_busy_poll, false); return 0; } =20 --=20 2.30.2