Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752438AbdFLIWz (ORCPT ); Mon, 12 Jun 2017 04:22:55 -0400 Received: from mail-wr0-f169.google.com ([209.85.128.169]:36609 "EHLO mail-wr0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751796AbdFLIWx (ORCPT ); Mon, 12 Jun 2017 04:22:53 -0400 Date: Mon, 12 Jun 2017 10:22:52 +0200 From: Christoffer Dall To: Hu Huajun Cc: christoffer.dall@linaro.org, marc.zyngier@arm.com, rkrcmar@redhat.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, songwenjun@huawei.com, gengdongjiu@huawei.com Subject: Re: [PATCH v2] KVM: ARM64: fix phy counter access failure in guest. Message-ID: <20170612082252.GA14808@cbox> References: <20170612143748.37278-1-huhuajun@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170612143748.37278-1-huhuajun@huawei.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1775 Lines: 60 Hi, On Mon, Jun 12, 2017 at 10:37:48PM +0800, Hu Huajun wrote: > When reading the cntpct_el0 in guest with VHE (Virtual Host Extension) > enabled in host, the "Unsupported guest sys_reg access" error reported. > The reason is cnthctl_el2.EL1PCTEN is not enabled, which is expected > to be done in kvm_timer_init_vhe(). The problem is kvm_timer_init_vhe > is called by cpu_init_hyp_mode, and which is called when VHE is disabled. > This patch remove the incorrect call to kvm_timer_init_vhe() from > cpu_init_hyp_mode(), and calls kvm_timer_init_vhe() to enable > cnthctl_el2.EL1PCTEN in cpu_hyp_reinit(). > > Changes from v1: > * According to Christoffer Dall's comment, remove the incocrrect call > to kvm_timer_init_vhe() in cpu_init_hyp_mode(). In the future please put the changelog after the '---' delimeter, because it doesn't have to be part of the commit log. I can fix this up when applying though. > > Signed-off-by: Hu Huajun Reviewed-by: Christoffer Dall Applied. Thanks, -Christoffer > --- > virt/kvm/arm/arm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > index 3417e18..a430125 100644 > --- a/virt/kvm/arm/arm.c > +++ b/virt/kvm/arm/arm.c > @@ -1115,9 +1115,6 @@ static void cpu_init_hyp_mode(void *dummy) > __cpu_init_hyp_mode(pgd_ptr, hyp_stack_ptr, vector_ptr); > __cpu_init_stage2(); > > - if (is_kernel_in_hyp_mode()) > - kvm_timer_init_vhe(); > - > kvm_arm_init_debug(); > } > > @@ -1137,6 +1134,7 @@ static void cpu_hyp_reinit(void) > * event was cancelled before the CPU was reset. > */ > __cpu_init_stage2(); > + kvm_timer_init_vhe(); > } else { > cpu_init_hyp_mode(NULL); > } > -- > 2.10.1 >