From patchwork Mon Nov 7 17:52:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 13035005 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 1A8D3C43217 for ; Mon, 7 Nov 2022 17:54:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232469AbiKGRy3 (ORCPT ); Mon, 7 Nov 2022 12:54:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230527AbiKGRyF (ORCPT ); Mon, 7 Nov 2022 12:54:05 -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 77C7E248D3 for ; Mon, 7 Nov 2022 09:53:03 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 22071F6B5E5; Mon, 7 Nov 2022 09:52:50 -0800 (PST) From: Stefan Roesch To: kernel-team@fb.com Cc: shr@devkernel.io, axboe@kernel.dk, olivier@trillion01.com, netdev@vger.kernel.org, io-uring@vger.kernel.org, kuba@kernel.org Subject: [RFC PATCH v2 2/2] io_uring: add api to set napi busy poll timeout. Date: Mon, 7 Nov 2022 09:52:40 -0800 Message-Id: <20221107175240.2725952-3-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221107175240.2725952-1-shr@devkernel.io> References: <20221107175240.2725952-1-shr@devkernel.io> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org This adds an api to register and unregister the busy poll timeout from liburing. To be able to use this functionality, the corresponding liburing patch is needed. Signed-off-by: Stefan Roesch --- include/uapi/linux/io_uring.h | 4 ++++ io_uring/io_uring.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index ab7458033ee3..48670074e1fc 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -490,6 +490,10 @@ enum { /* register a range of fixed file slots for automatic slot allocation */ IORING_REGISTER_FILE_ALLOC_RANGE = 25, + /* set/clear busy poll timeout */ + IORING_REGISTER_NAPI_BUSY_POLL_TIMEOUT = 26, + IORING_UNREGISTER_NAPI_BUSY_POLL_TIMEOUT= 27, + /* this goes last */ IORING_REGISTER_LAST }; diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index b02bba4ebcbf..b685af668641 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -4111,6 +4111,16 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx, return ret; } +static int io_register_napi_busy_poll_timeout(struct io_ring_ctx *ctx, unsigned int to) +{ +#ifdef CONFIG_NET_RX_BUSY_POLL + WRITE_ONCE(ctx->napi_busy_poll_to, to); + return 0; +#else + return -EINVAL; +#endif +} + static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, void __user *arg, unsigned nr_args) __releases(ctx->uring_lock) @@ -4271,6 +4281,18 @@ 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_BUSY_POLL_TIMEOUT: + ret = -EINVAL; + if (arg || !nr_args) + break; + ret = io_register_napi_busy_poll_timeout(ctx, nr_args); + break; + case IORING_UNREGISTER_NAPI_BUSY_POLL_TIMEOUT: + ret = -EINVAL; + if (arg || nr_args) + break; + ret = io_register_napi_busy_poll_timeout(ctx, nr_args); + break; default: ret = -EINVAL; break;