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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 2A276C3F2D2 for ; Mon, 2 Mar 2020 10:50:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 019112465E for ; Mon, 2 Mar 2020 10:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583146220; bh=QKkxS8WJjpnmKv55PdXHGXEQzRWU0qw/v6LjAUUYwkc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=I5Q+92ubuPsrGs6hclTs2b3638jeNbWctffjvu0VUDCmbx4eLiyshD3BTk45FQKA6 XMvue3Tj1B3YcO7GD2jvrA81mg4maRNOiZMicikp1iC5NoE28JasgVdK5PA/Qarb+l jwVfh+RJ1qELNfK9qDPbZ1tWKFwzDcf3Hf6Bi3ug= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727505AbgCBKuT (ORCPT ); Mon, 2 Mar 2020 05:50:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:38580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726874AbgCBKuS (ORCPT ); Mon, 2 Mar 2020 05:50:18 -0500 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C040621D56; Mon, 2 Mar 2020 10:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583146217; bh=QKkxS8WJjpnmKv55PdXHGXEQzRWU0qw/v6LjAUUYwkc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=apw35yfzM2zjjkMW9To2es0BRLYBHJkMuR74KOS1gavu46sF8VomI0v9ERJ1AdxEf z9cq7bbSp3IHagBY9cF40MsPOULuh8Mk25sHzsBUSkltrEu1cL3xhZH8r0au7VoJkD MS0xUlrCLV7UOzug/UkAQCqFyQ7Vqggwt3QOllK0= Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1j8ieO-009M1L-3I; Mon, 02 Mar 2020 10:50:16 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 02 Mar 2020 10:50:16 +0000 From: Marc Zyngier To: Eric Auger Cc: eric.auger.pro@gmail.com, stable@vger.kernel.org, linux-kernel@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: Re: [PATCH v2] KVM: arm64: pmu: Don't increment SW_INCR if PMCR.E is unset In-Reply-To: <20200302104830.5593-1-eric.auger@redhat.com> References: <20200302104830.5593-1-eric.auger@redhat.com> Message-ID: <50e04eb9bcd607c6729919d70ae7e82f@kernel.org> X-Sender: maz@kernel.org User-Agent: Roundcube Webmail/1.3.10 X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: eric.auger@redhat.com, eric.auger.pro@gmail.com, stable@vger.kernel.org, linux-kernel@vger.kernel.org, kvmarm@lists.cs.columbia.edu X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-03-02 10:48, Eric Auger wrote: > commit 3837407c1aa1 upstream. > > The specification says PMSWINC increments PMEVCNTR_EL1 by 1 > if PMEVCNTR_EL0 is enabled and configured to count SW_INCR. > > For PMEVCNTR_EL0 to be enabled, we need both PMCNTENSET to > be set for the corresponding event counter but we also need > the PMCR.E bit to be set. > > Fixes: 7a0adc7064b8 ("arm64: KVM: Add access handler for PMSWINC > register") > Signed-off-by: Eric Auger > Cc: # 4.9 and 4.14 only Reviewed-by: Marc Zyngier > > --- > > This is a backport of 3837407c1aa1 ("KVM: arm64: pmu: Don't > increment SW_INCR if PMCR.E is unset") which did not apply on > 4.9-stable and 4.14-stable trees. Compared to the original patch > __vcpu_sys_reg() is replaced by vcpu_sys_reg(). > > v1 -> v2: > - this patch also is candidate for 4.9-stable > --- > virt/kvm/arm/pmu.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c > index 69ccce308458..9a47b0cfb01d 100644 > --- a/virt/kvm/arm/pmu.c > +++ b/virt/kvm/arm/pmu.c > @@ -299,6 +299,9 @@ void kvm_pmu_software_increment(struct kvm_vcpu > *vcpu, u64 val) > if (val == 0) > return; > > + if (!(vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E)) > + return; > + > enable = vcpu_sys_reg(vcpu, PMCNTENSET_EL0); > for (i = 0; i < ARMV8_PMU_CYCLE_IDX; i++) { > if (!(val & BIT(i))) -- Jazz is not dead. It just smells funny...