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 C7C04C77B61 for ; Tue, 25 Apr 2023 18:19:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234462AbjDYSTJ (ORCPT ); Tue, 25 Apr 2023 14:19:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231200AbjDYSTI (ORCPT ); Tue, 25 Apr 2023 14:19: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 F37731545B for ; Tue, 25 Apr 2023 11:19:04 -0700 (PDT) Received: by devbig1114.prn1.facebook.com (Postfix, from userid 425415) id 400EF442E9C6; Tue, 25 Apr 2023 11:18:52 -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, Olivier Langlois Subject: [PATCH v10 3/5] io-uring: add sqpoll support for napi busy poll Date: Tue, 25 Apr 2023 11:18:43 -0700 Message-Id: <20230425181845.2813854-4-shr@devkernel.io> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230425181845.2813854-1-shr@devkernel.io> References: <20230425181845.2813854-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 sqpoll support to the io-uring napi. Signed-off-by: Stefan Roesch Suggested-by: Olivier Langlois --- io_uring/napi.c | 25 +++++++++++++++++++++++++ io_uring/napi.h | 2 ++ io_uring/sqpoll.c | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/io_uring/napi.c b/io_uring/napi.c index bb7d2b6b7e90..0fbdfe5eea06 100644 --- a/io_uring/napi.c +++ b/io_uring/napi.c @@ -240,4 +240,29 @@ void io_napi_busy_loop(struct io_ring_ctx *ctx, stru= ct io_wait_queue *iowq) } } =20 +/* + * io_napi_sqpoll_busy_poll() - busy poll loop for sqpoll + * @ctx: pointer to io-uring context structure + * + * Splice of the napi list and execute the napi busy poll loop. + */ +int io_napi_sqpoll_busy_poll(struct io_ring_ctx *ctx) +{ + int ret =3D 0; + LIST_HEAD(napi_list); + + if (!READ_ONCE(ctx->napi_busy_poll_to)) + return 0; + + spin_lock(&ctx->napi_lock); + list_splice_init(&ctx->napi_list, &napi_list); + spin_unlock(&ctx->napi_lock); + + if (__io_napi_busy_loop(&napi_list, ctx->napi_prefer_busy_poll)) + ret =3D 1; + + io_napi_merge_lists(ctx, &napi_list); + return ret; +} + #endif diff --git a/io_uring/napi.h b/io_uring/napi.h index 49322a16b6e5..b3455e52170c 100644 --- a/io_uring/napi.h +++ b/io_uring/napi.h @@ -17,6 +17,7 @@ void __io_napi_add(struct io_ring_ctx *ctx, struct file= *file); void io_napi_adjust_timeout(struct io_ring_ctx *ctx, struct io_wait_queue *iowq, struct timespec64 *ts); void io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *io= wq); +int io_napi_sqpoll_busy_poll(struct io_ring_ctx *ctx); =20 static inline bool io_napi(struct io_ring_ctx *ctx) { @@ -60,6 +61,7 @@ static inline void io_napi_add(struct io_kiocb *req) =20 #define io_napi_adjust_timeout(ctx, iowq, ts) do {} while (0) #define io_napi_busy_loop(ctx, iowq) do {} while (0) +#define io_napi_sqpoll_busy_poll(ctx) (0) =20 #endif =20 diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c index 9db4bc1f521a..0c8d53ef134a 100644 --- a/io_uring/sqpoll.c +++ b/io_uring/sqpoll.c @@ -15,6 +15,7 @@ #include =20 #include "io_uring.h" +#include "napi.h" #include "sqpoll.h" =20 #define IORING_SQPOLL_CAP_ENTRIES_VALUE 8 @@ -193,6 +194,9 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, bo= ol cap_entries) ret =3D io_submit_sqes(ctx, to_submit); mutex_unlock(&ctx->uring_lock); =20 + if (io_napi(ctx)) + ret +=3D io_napi_sqpoll_busy_poll(ctx); + if (to_submit && wq_has_sleeper(&ctx->sqo_sq_wait)) wake_up(&ctx->sqo_sq_wait); if (creds) --=20 2.39.1