From nobody Sat May 4 23:47:58 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1576098842; cv=none; d=zohomail.com; s=zohoarc; b=jGA5QY/dMKinWEaw68kToEEFk4314KWHlwoUepZ0olmMgp9urJYpOiqgPk1z4iX445zpruCWQ0CunUw4GYqVvAh0LhcnLdQPnEoxnKBYYYoaTnosC0bcnEj51LvK4Y9X1hDuoa0gfltJK69O5x7XqJWwiN2IRArmvDpyVfPT7rw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576098842; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EE4m84Tzm6EUeVMDreLxocX/XeStKQgPPKE5rVjxUAA=; b=k9cT07BO7NyvSG/baLn47oRnq3P2fwCtJCdL5XEWMV5ug65W5iuR7S9Mx/l+4xlYfcifdzlbjdaBv1WSdi/u/B7nscaWddVF5XbGpZe1gw4uwSuplRPhUV6/VDMMtOLOViLmV/tLenC4QV5TOhpCYl8Dp97EVHef4l4SoCB7H5U= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1576098842126450.13465010270966; Wed, 11 Dec 2019 13:14:02 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1if9IX-0007R0-8P; Wed, 11 Dec 2019 21:13:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1if9IV-0007Qs-Uw for xen-devel@lists.xenproject.org; Wed, 11 Dec 2019 21:13:27 +0000 Received: from webmail.dornerworks.com (unknown [12.207.209.150]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 0da6944a-1c5b-11ea-b6f1-bc764e2007e4; Wed, 11 Dec 2019 21:13:19 +0000 (UTC) X-Inumbo-ID: 0da6944a-1c5b-11ea-b6f1-bc764e2007e4 From: Jeff Kubascik To: Date: Wed, 11 Dec 2019 16:13:01 -0500 Message-ID: <20191211211302.117395-2-jeff.kubascik@dornerworks.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211211302.117395-1-jeff.kubascik@dornerworks.com> References: <20191211211302.117395-1-jeff.kubascik@dornerworks.com> MIME-Version: 1.0 X-Originating-IP: [172.27.13.171] X-ClientProxiedBy: Mcbain.dw.local (172.27.1.45) To Mcbain.dw.local (172.27.1.45) X-spam-status: No, score=-2.9 required=3.5 tests=ALL_TRUSTED, BAYES_00, MAILSHELL_SCORE_0_4 X-Spam-Flag: NO Subject: [Xen-devel] [PATCH v3 1/2] xen/arm: remove physical timer offset X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stewart Hildebrand , Volodymyr Babchuk , Stefano Stabellini , Julien Grall Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The physical timer traps apply an offset so that time starts at 0 for the guest. However, this offset is not currently applied to the physical counter. Per the ARMv8 Reference Manual (ARM DDI 0487E.a), section D11.2.4 Timers, the "Offset" between the counter and timer should be zero for a physical timer. This removes the offset to make the timer and counter consistent. This also cleans up the physical timer implementation to better match the virtual timer - both cval's now hold the hardware value. Signed-off-by: Jeff Kubascik --- xen/arch/arm/vtimer.c | 34 ++++++++++++++++++---------------- xen/include/asm-arm/domain.h | 3 --- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index e6aebdac9e..21b98ec20a 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -62,7 +62,6 @@ static void virt_timer_expired(void *data) =20 int domain_vtimer_init(struct domain *d, struct xen_arch_domainconfig *con= fig) { - d->arch.phys_timer_base.offset =3D NOW(); d->arch.virt_timer_base.offset =3D READ_SYSREG64(CNTPCT_EL0); d->time_offset_seconds =3D ticks_to_ns(d->arch.virt_timer_base.offset = - boot_count); do_div(d->time_offset_seconds, 1000000000); @@ -108,7 +107,6 @@ int vcpu_vtimer_init(struct vcpu *v) =20 init_timer(&t->timer, phys_timer_expired, t, v->processor); t->ctl =3D 0; - t->cval =3D NOW(); t->irq =3D d0 ? timer_get_irq(TIMER_PHYS_NONSECURE_PPI) : GUEST_TIMER_PHYS_NS_PPI; @@ -167,6 +165,7 @@ void virt_timer_restore(struct vcpu *v) static bool vtimer_cntp_ctl(struct cpu_user_regs *regs, uint32_t *r, bool = read) { struct vcpu *v =3D current; + s_time_t expires; =20 if ( !ACCESS_ALLOWED(regs, EL0PTEN) ) return false; @@ -184,8 +183,9 @@ static bool vtimer_cntp_ctl(struct cpu_user_regs *regs,= uint32_t *r, bool read) =20 if ( v->arch.phys_timer.ctl & CNTx_CTL_ENABLE ) { - set_timer(&v->arch.phys_timer.timer, - v->arch.phys_timer.cval + v->domain->arch.phys_timer= _base.offset); + expires =3D v->arch.phys_timer.cval > boot_count + ? ticks_to_ns(v->arch.phys_timer.cval - boot_count) = : 0; + set_timer(&v->arch.phys_timer.timer, expires); } else stop_timer(&v->arch.phys_timer.timer); @@ -197,26 +197,27 @@ static bool vtimer_cntp_tval(struct cpu_user_regs *re= gs, uint32_t *r, bool read) { struct vcpu *v =3D current; - s_time_t now; + uint64_t cntpct; + s_time_t expires; =20 if ( !ACCESS_ALLOWED(regs, EL0PTEN) ) return false; =20 - now =3D NOW() - v->domain->arch.phys_timer_base.offset; + cntpct =3D get_cycles(); =20 if ( read ) { - *r =3D (uint32_t)(ns_to_ticks(v->arch.phys_timer.cval - now) & 0xf= fffffffull); + *r =3D (uint32_t)((v->arch.phys_timer.cval - cntpct) & 0xffffffffu= ll); } else { - v->arch.phys_timer.cval =3D now + ticks_to_ns(*r); + v->arch.phys_timer.cval =3D cntpct + *r; if ( v->arch.phys_timer.ctl & CNTx_CTL_ENABLE ) { v->arch.phys_timer.ctl &=3D ~CNTx_CTL_PENDING; - set_timer(&v->arch.phys_timer.timer, - v->arch.phys_timer.cval + - v->domain->arch.phys_timer_base.offset); + expires =3D v->arch.phys_timer.cval > boot_count + ? ticks_to_ns(v->arch.phys_timer.cval - boot_count) = : 0; + set_timer(&v->arch.phys_timer.timer, expires); } } return true; @@ -226,23 +227,24 @@ static bool vtimer_cntp_cval(struct cpu_user_regs *re= gs, uint64_t *r, bool read) { struct vcpu *v =3D current; + s_time_t expires; =20 if ( !ACCESS_ALLOWED(regs, EL0PTEN) ) return false; =20 if ( read ) { - *r =3D ns_to_ticks(v->arch.phys_timer.cval); + *r =3D v->arch.phys_timer.cval; } else { - v->arch.phys_timer.cval =3D ticks_to_ns(*r); + v->arch.phys_timer.cval =3D *r; if ( v->arch.phys_timer.ctl & CNTx_CTL_ENABLE ) { v->arch.phys_timer.ctl &=3D ~CNTx_CTL_PENDING; - set_timer(&v->arch.phys_timer.timer, - v->arch.phys_timer.cval + - v->domain->arch.phys_timer_base.offset); + expires =3D v->arch.phys_timer.cval > boot_count + ? ticks_to_ns(v->arch.phys_timer.cval - boot_count) = : 0; + set_timer(&v->arch.phys_timer.timer, expires); } } return true; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index f3f3fb7d7f..adc7fe7210 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -65,9 +65,6 @@ struct arch_domain RELMEM_done, } relmem; =20 - struct { - uint64_t offset; - } phys_timer_base; struct { uint64_t offset; } virt_timer_base; --=20 2.17.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sat May 4 23:47:58 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1576098845; cv=none; d=zohomail.com; s=zohoarc; b=NxzxPig5D/dsLmhcnZKyyL2x0hmNBPX4wCwGreCknSIY3YlW3v+JYeSA91lF5fRhCASWDOWsXNIMaMHEU2BS2V8T/sgieA5gDI+0KiANx6QhcD6N8aBFGlY9dYjdamKwoCn4Bp8weeii4zJ+betH5/Qh4RwvmXfHoOMYpdrzTZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576098845; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cFlPRL+sLUTuijC5NQFp6tpso4qrKYb8CmKHyRnLwhE=; b=RdeQU/xMY4EUomIuTcDqb69aLVabmv9TZu+7V/ub8IP7IVCDABHWFgX4SVtaq8rjLmOdZOBV0KvvkW7MAejKLxuz8Kybs0s2OSZNVK1VAwBxhM0Oo1InK0yfk0iMfvtwRcBRE1f6MmDCOmrOTmtsl9iqFMMuzR/bQX4hAdokz6Y= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1576098845015541.213499364092; Wed, 11 Dec 2019 13:14:05 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1if9Ie-0007SM-HQ; Wed, 11 Dec 2019 21:13:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1if9Id-0007S8-1B for xen-devel@lists.xenproject.org; Wed, 11 Dec 2019 21:13:35 +0000 Received: from webmail.dornerworks.com (unknown [12.207.209.150]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 133acc28-1c5b-11ea-b6f1-bc764e2007e4; Wed, 11 Dec 2019 21:13:28 +0000 (UTC) X-Inumbo-ID: 133acc28-1c5b-11ea-b6f1-bc764e2007e4 From: Jeff Kubascik To: Date: Wed, 11 Dec 2019 16:13:02 -0500 Message-ID: <20191211211302.117395-3-jeff.kubascik@dornerworks.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211211302.117395-1-jeff.kubascik@dornerworks.com> References: <20191211211302.117395-1-jeff.kubascik@dornerworks.com> MIME-Version: 1.0 X-Originating-IP: [172.27.13.171] X-ClientProxiedBy: Mcbain.dw.local (172.27.1.45) To Mcbain.dw.local (172.27.1.45) X-spam-status: No, score=-2.9 required=3.5 tests=ALL_TRUSTED, BAYES_00, MAILSHELL_SCORE_0_4 X-Spam-Flag: NO Subject: [Xen-devel] [PATCH v3 2/2] xen/arm: sign extend writes to TimerValue X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stewart Hildebrand , Volodymyr Babchuk , Stefano Stabellini , Julien Grall Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Per the ARMv8 Reference Manual (ARM DDI 0487E.a), section D11.2.4 specifies that the values in the TimerValue view of the timers are signed in standard two's complement form. When writing to the TimerValue register, it should be signed extended as described by the equation CompareValue =3D (Counter[63:0] + SignExtend(TimerValue))[63:0] Signed-off-by: Jeff Kubascik --- xen/arch/arm/vtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 21b98ec20a..872181d9b6 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -211,7 +211,7 @@ static bool vtimer_cntp_tval(struct cpu_user_regs *regs= , uint32_t *r, } else { - v->arch.phys_timer.cval =3D cntpct + *r; + v->arch.phys_timer.cval =3D cntpct + (uint64_t)(int32_t)*r; if ( v->arch.phys_timer.ctl & CNTx_CTL_ENABLE ) { v->arch.phys_timer.ctl &=3D ~CNTx_CTL_PENDING; --=20 2.17.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel