From nobody Fri Apr 4 04:22:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1741711810; cv=none; d=zohomail.com; s=zohoarc; b=Dad++aISNb9hL7B0RiPxWe7DGsEta6/Q6qxza6HugKf2Ou+GDVTUai5Ogk770pT2NYZozogpdUYWJTaFfkXrePT8sDZHSeZWIa8H6wGkthJ+tqdswv1vEk/ty8CqMEMcPXZqTd84tOPvAkHvS/BUThfp6ppMYjVsiCKqgt1R5Bg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741711810; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AEHUeb7rP3pziRM5M1M5vXuLC6X6GpTgsDjSzUiJWqg=; b=jryCfsLJu3ZdvzcfXGLTObhx1qm7bScHWxMJh9iuLOTsAD6D5A15n+AOatYbv4W+wpIAVHdMhluIvdoD1E7R9794Bus901ryHYarYASBgD0IDpY9UutnVv1oOYVGCkmTaoOtAIxXLB5IGhzECcoSQDqTCMavMlo9OkKGvomIkag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741711810978417.4046847195533; Tue, 11 Mar 2025 09:50:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts26X-0000NV-O4; Tue, 11 Mar 2025 12:05:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ts226-0003zR-63 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 12:00:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ts223-0005hI-Ol for qemu-devel@nongnu.org; Tue, 11 Mar 2025 12:00:41 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-f2R_OsgWMsCoG6vfiraPMA-1; Tue, 11 Mar 2025 12:00:37 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5E3D319560AF; Tue, 11 Mar 2025 16:00:36 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.44.33.18]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D46EA180AF7B; Tue, 11 Mar 2025 16:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741708838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AEHUeb7rP3pziRM5M1M5vXuLC6X6GpTgsDjSzUiJWqg=; b=Sz4Xf2RdLAqy+mmkP8lWI44dCY97N8wGhqXVU5AE5AtY33JKfD9TaMtKtkNjejBU9SrmrB YedEKEZPd8gTGCEkAb1aR64C6msD2oszArtdaPyfjFTrkLPS2+tRuDcW97ZmeFbMD4moRF BM7m58d5OaPxgu6f1AqQk/Yi0huIa2w= X-MC-Unique: f2R_OsgWMsCoG6vfiraPMA-1 X-Mimecast-MFC-AGG-ID: f2R_OsgWMsCoG6vfiraPMA_1741708836 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org Subject: [PULL 05/22] aio: Create AioPolledEvent Date: Tue, 11 Mar 2025 17:00:04 +0100 Message-ID: <20250311160021.349761-6-kwolf@redhat.com> In-Reply-To: <20250311160021.349761-1-kwolf@redhat.com> References: <20250311160021.349761-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1741711812064019000 Content-Type: text/plain; charset="utf-8" As a preparation for having multiple adaptive polling states per AioContext, move the 'ns' field into a separate struct. Signed-off-by: Kevin Wolf Message-ID: <20250307221634.71951-4-kwolf@redhat.com> Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- include/block/aio.h | 6 +++++- util/aio-posix.c | 31 ++++++++++++++++--------------- util/async.c | 3 ++- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/include/block/aio.h b/include/block/aio.h index b2ab3514de..c9fcfe7ccf 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -123,6 +123,10 @@ struct BHListSlice { =20 typedef QSLIST_HEAD(, AioHandler) AioHandlerSList; =20 +typedef struct AioPolledEvent { + int64_t ns; /* current polling time in nanoseconds */ +} AioPolledEvent; + struct AioContext { GSource source; =20 @@ -229,7 +233,7 @@ struct AioContext { int poll_disable_cnt; =20 /* Polling mode parameters */ - int64_t poll_ns; /* current polling time in nanoseconds */ + AioPolledEvent poll; int64_t poll_max_ns; /* maximum polling time in nanoseconds */ int64_t poll_grow; /* polling time growth factor */ int64_t poll_shrink; /* polling time shrink factor */ diff --git a/util/aio-posix.c b/util/aio-posix.c index 06bf9f456c..95bddb9e4b 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -585,7 +585,7 @@ static bool try_poll_mode(AioContext *ctx, AioHandlerLi= st *ready_list, return false; } =20 - max_ns =3D qemu_soonest_timeout(*timeout, ctx->poll_ns); + max_ns =3D qemu_soonest_timeout(*timeout, ctx->poll.ns); if (max_ns && !ctx->fdmon_ops->need_wait(ctx)) { /* * Enable poll mode. It pairs with the poll_set_started() in @@ -683,40 +683,40 @@ bool aio_poll(AioContext *ctx, bool blocking) if (ctx->poll_max_ns) { int64_t block_ns =3D qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - star= t; =20 - if (block_ns <=3D ctx->poll_ns) { + if (block_ns <=3D ctx->poll.ns) { /* This is the sweet spot, no adjustment needed */ } else if (block_ns > ctx->poll_max_ns) { /* We'd have to poll for too long, poll less */ - int64_t old =3D ctx->poll_ns; + int64_t old =3D ctx->poll.ns; =20 if (ctx->poll_shrink) { - ctx->poll_ns /=3D ctx->poll_shrink; + ctx->poll.ns /=3D ctx->poll_shrink; } else { - ctx->poll_ns =3D 0; + ctx->poll.ns =3D 0; } =20 - trace_poll_shrink(ctx, old, ctx->poll_ns); - } else if (ctx->poll_ns < ctx->poll_max_ns && + trace_poll_shrink(ctx, old, ctx->poll.ns); + } else if (ctx->poll.ns < ctx->poll_max_ns && block_ns < ctx->poll_max_ns) { /* There is room to grow, poll longer */ - int64_t old =3D ctx->poll_ns; + int64_t old =3D ctx->poll.ns; int64_t grow =3D ctx->poll_grow; =20 if (grow =3D=3D 0) { grow =3D 2; } =20 - if (ctx->poll_ns) { - ctx->poll_ns *=3D grow; + if (ctx->poll.ns) { + ctx->poll.ns *=3D grow; } else { - ctx->poll_ns =3D 4000; /* start polling at 4 microseconds = */ + ctx->poll.ns =3D 4000; /* start polling at 4 microseconds = */ } =20 - if (ctx->poll_ns > ctx->poll_max_ns) { - ctx->poll_ns =3D ctx->poll_max_ns; + if (ctx->poll.ns > ctx->poll_max_ns) { + ctx->poll.ns =3D ctx->poll_max_ns; } =20 - trace_poll_grow(ctx, old, ctx->poll_ns); + trace_poll_grow(ctx, old, ctx->poll.ns); } } =20 @@ -770,8 +770,9 @@ void aio_context_set_poll_params(AioContext *ctx, int64= _t max_ns, /* No thread synchronization here, it doesn't matter if an incorrect v= alue * is used once. */ + ctx->poll.ns =3D 0; + ctx->poll_max_ns =3D max_ns; - ctx->poll_ns =3D 0; ctx->poll_grow =3D grow; ctx->poll_shrink =3D shrink; =20 diff --git a/util/async.c b/util/async.c index 47e3d35a26..fc8a78aa79 100644 --- a/util/async.c +++ b/util/async.c @@ -609,7 +609,8 @@ AioContext *aio_context_new(Error **errp) qemu_rec_mutex_init(&ctx->lock); timerlistgroup_init(&ctx->tlg, aio_timerlist_notify, ctx); =20 - ctx->poll_ns =3D 0; + ctx->poll.ns =3D 0; + ctx->poll_max_ns =3D 0; ctx->poll_grow =3D 0; ctx->poll_shrink =3D 0; --=20 2.48.1