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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDC84C433E0 for ; Mon, 1 Mar 2021 09:58:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 24FAA64E41 for ; Mon, 1 Mar 2021 09:58:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24FAA64E41 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGfK4-0004zk-UG for qemu-devel@archiver.kernel.org; Mon, 01 Mar 2021 04:58:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGfJK-0004Tt-5M; Mon, 01 Mar 2021 04:57:54 -0500 Received: from smtpout1.mo529.mail-out.ovh.net ([178.32.125.2]:39647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGfJH-0004En-VT; Mon, 01 Mar 2021 04:57:53 -0500 Received: from mxplan5.mail.ovh.net (unknown [10.109.143.210]) by mo529.mail-out.ovh.net (Postfix) with ESMTPS id 505868BFE692; Mon, 1 Mar 2021 10:57:40 +0100 (CET) Received: from kaod.org (37.59.142.95) by DAG8EX1.mxp5.local (172.16.2.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 1 Mar 2021 10:57:38 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-95G00198da9973-a254-42e9-b991-e50043e81002, 479CA1392526D135F52AAC0E93683906E8F354F3) smtp.auth=groug@kaod.org X-OVh-ClientIp: 78.197.208.248 Date: Mon, 1 Mar 2021 10:57:36 +0100 From: Greg Kurz To: Daniel Henrique Barboza Subject: Re: [PATCH 1/1] qemu_timer.c: add timer_deadline_ms() helper Message-ID: <20210301105736.794f4c87@bahia.lan> In-Reply-To: <20210225212914.366462-1-danielhb413@gmail.com> References: <20210225212914.366462-1-danielhb413@gmail.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [37.59.142.95] X-ClientProxiedBy: DAG2EX2.mxp5.local (172.16.2.12) To DAG8EX1.mxp5.local (172.16.2.71) X-Ovh-Tracer-GUID: aa89fa0b-568f-4051-b51a-9129a3b7a4d8 X-Ovh-Tracer-Id: 13444089313879234979 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduledrleekgddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvuffkjghfofggtgfgihesthejredtredtvdenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnhepfedutdeijeejveehkeeileetgfelteekteehtedtieefffevhffflefftdefleejnecukfhppedtrddtrddtrddtpdefjedrheelrddugedvrdelheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehmgihplhgrnhehrdhmrghilhdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepghhrohhugheskhgrohgurdhorhhgpdhrtghpthhtohepphgsohhniihinhhisehrvgguhhgrthdrtghomh Received-SPF: pass client-ip=178.32.125.2; envelope-from=groug@kaod.org; helo=smtpout1.mo529.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 25 Feb 2021 18:29:14 -0300 Daniel Henrique Barboza wrote: > The pSeries machine is using QEMUTimer internals to return the timeout > in seconds for a timer object, in hw/ppc/spapr.c, function > spapr_drc_unplug_timeout_remaining_sec(). > > Create a helper in qemu-timer.c to retrieve the deadline for a QEMUTimer > object, in ms, to avoid exposing timer internals to the PPC code. > > CC: Paolo Bonzini > Signed-off-by: Daniel Henrique Barboza > --- > > This patch is applicable on top of David's ppc-for-6.0. > > hw/ppc/spapr_drc.c | 5 ++--- > include/qemu/timer.h | 8 ++++++++ > util/qemu-timer.c | 13 +++++++++++++ > 3 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c > index 8c4997d795..98b626acf9 100644 > --- a/hw/ppc/spapr_drc.c > +++ b/hw/ppc/spapr_drc.c > @@ -421,9 +421,8 @@ void spapr_drc_unplug_request(SpaprDrc *drc) > > int spapr_drc_unplug_timeout_remaining_sec(SpaprDrc *drc) > { > - if (drc->unplug_requested && timer_pending(drc->unplug_timeout_timer)) { > - return (qemu_timeout_ns_to_ms(drc->unplug_timeout_timer->expire_time) - > - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL)) / 1000; > + if (drc->unplug_requested) { > + return timer_deadline_ms(drc->unplug_timeout_timer) / 1000; > } Nice improvement. This also removes a dependency on QEMU_CLOCK_VIRTUAL that we shouldn't need since we've already passed it to timer_new_ms() during realize. It seems that spapr_drc_start_unplug_timeout_timer() ... static void spapr_drc_start_unplug_timeout_timer(SpaprDrc *drc) { SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); if (drck->unplug_timeout_seconds != 0) { timer_mod(drc->unplug_timeout_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + drck->unplug_timeout_seconds * 1000); } } ... could be simplified as well with a timer_mod_deadline_ms() helper, but this can go to another patch. > > return 0; > diff --git a/include/qemu/timer.h b/include/qemu/timer.h > index 1678238384..5e76e3f8c2 100644 > --- a/include/qemu/timer.h > +++ b/include/qemu/timer.h > @@ -795,6 +795,14 @@ static inline int64_t get_max_clock_jump(void) > return 60 * NANOSECONDS_PER_SECOND; > } > > +/** > + * timer_deadline_ms: > + * > + * Returns the remaining miliseconds for @timer to expire, or zero > + * if the timer is no longer pending. > + */ > +int64_t timer_deadline_ms(QEMUTimer *timer); > + > /* > * Low level clock functions > */ > diff --git a/util/qemu-timer.c b/util/qemu-timer.c > index 81c28af517..3a03a63daa 100644 > --- a/util/qemu-timer.c > +++ b/util/qemu-timer.c > @@ -243,6 +243,19 @@ int64_t timerlist_deadline_ns(QEMUTimerList *timer_list) > return delta; > } > > +/* > + * Returns the time remaining for the deadline, in ms. > + */ > +int64_t timer_deadline_ms(QEMUTimer *timer) > +{ > + if (timer_pending(timer)) { > + return qemu_timeout_ns_to_ms(timer->expire_time) - > + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL); This is assuming that the timer belongs to the QEMU_CLOCK_VIRTUAL clock, which looks awkward for a presumably generic function. Correct clock type can be accessed through ->timer_list : qemu_clock_get_ms(timer->timer_list->clock->type) > + } > + > + return 0; > +} > + > /* Calculate the soonest deadline across all timerlists attached > * to the clock. This is used for the icount timeout so we > * ignore whether or not the clock should be used in deadline