From nobody Sat May 4 19:34:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656554157896932.5733023070416; Wed, 29 Jun 2022 18:55:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.358121.587137 (Exim 4.92) (envelope-from ) id 1o6jP1-0001Jv-7D; Thu, 30 Jun 2022 01:55:31 +0000 Received: by outflank-mailman (output) from mailman id 358121.587137; Thu, 30 Jun 2022 01:55:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o6jP1-0001Jn-28; Thu, 30 Jun 2022 01:55:31 +0000 Received: by outflank-mailman (input) for mailman id 358121; Thu, 30 Jun 2022 01:55:29 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o6jOz-0001Jh-ME for xen-devel@lists.xenproject.org; Thu, 30 Jun 2022 01:55:29 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-flk1.inumbo.com (Halon) with ESMTP id b67370fe-f817-11ec-bdce-3d151da133c5; Thu, 30 Jun 2022 03:55:27 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D89261480; Wed, 29 Jun 2022 18:55:26 -0700 (PDT) Received: from a015971.shanghai.arm.com (unknown [10.169.188.104]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3DCE73F5A1; Wed, 29 Jun 2022 18:55:23 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b67370fe-f817-11ec-bdce-3d151da133c5 From: Jiamei Xie To: xen-devel@lists.xenproject.org Cc: Jiamei Xie , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Wei Chen Subject: [PATCH v3] xen/arm: avoid overflow when setting vtimer in context switch Date: Thu, 30 Jun 2022 09:53:37 +0800 Message-Id: <20220630015336.3040355-1-jiamei.xie@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1656554160704100001 Content-Type: text/plain; charset="utf-8" virt_vtimer_save is calculating the new time for the vtimer in: "v->arch.virt_timer.cval + v->domain->arch.virt_timer_base.offset - boot_count". In this formula, "cval + offset" might cause uint64_t overflow. Changing it to "ticks_to_ns(v->domain->arch.virt_timer_base.offset - boot_count) + ticks_to_ns(v->arch.virt_timer.cval)" can avoid overflow, and "ticks_to_ns(arch.virt_timer_base.offset - boot_count)" will be always the same, which has been caculated in domain_vtimer_init. Introduce a new field virt_timer_base.nanoseconds to store this value for arm in struct arch_domain, so we can use it directly. Signed-off-by: Jiamei Xie Change-Id: Ib80cee51eaf844661e6f92154a0339ad2a652f9b --- was "xen/arm: avoid vtimer flip-flop transition in context switch". v3 changes: -re-write commit message -store nanoseconds in virt_timer_base instead of adding a new structure -assign to nanoseconds first, then seconds --- xen/arch/arm/include/asm/domain.h | 1 + xen/arch/arm/vtimer.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/d= omain.h index ed63c2b6f9..cd9ce19b4b 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -71,6 +71,7 @@ struct arch_domain =20 struct { uint64_t offset; + s_time_t nanoseconds; } virt_timer_base; =20 struct vgic_dist vgic; diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 6b78fea77d..aeaea78e4c 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -63,7 +63,9 @@ static void virt_timer_expired(void *data) int domain_vtimer_init(struct domain *d, struct xen_arch_domainconfig *con= fig) { d->arch.virt_timer_base.offset =3D get_cycles(); - d->time_offset.seconds =3D ticks_to_ns(d->arch.virt_timer_base.offset = - boot_count); + d->arch.virt_timer_base.nanoseconds =3D + ticks_to_ns(d->arch.virt_timer_base.offset - boot_count); + d->time_offset.seconds =3D d->arch.virt_timer_base.nanoseconds; do_div(d->time_offset.seconds, 1000000000); =20 config->clock_frequency =3D timer_dt_clock_frequency; @@ -144,8 +146,9 @@ void virt_timer_save(struct vcpu *v) if ( (v->arch.virt_timer.ctl & CNTx_CTL_ENABLE) && !(v->arch.virt_timer.ctl & CNTx_CTL_MASK)) { - set_timer(&v->arch.virt_timer.timer, ticks_to_ns(v->arch.virt_time= r.cval + - v->domain->arch.virt_timer_base.offset - boot_count)); + set_timer(&v->arch.virt_timer.timer, + v->domain->arch.virt_timer_base.nanoseconds + + ticks_to_ns(v->arch.virt_timer.cval)); } } =20 --=20 2.25.1