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=-10.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 7FE97C10F27 for ; Mon, 9 Mar 2020 14:25:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 54A9120873 for ; Mon, 9 Mar 2020 14:25:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="p9JtU6Dr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54A9120873 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QaL+JD462fo23zn5/E+0eiFcyB6awdlQYjK5O2OeV7I=; b=p9JtU6Dr0cIRiU 7nJ0aMLYx8TMi/lVm8/Y3jTQZBGXJeyb4laU81qFw692lKnp+DvVhVRTOC94B2LpHpH32ek2Irgiy fNdvUAUp1e/nSxWw+AHEG6jdE5drV5yCfKgioWoY+tNh+mqk9E+EDPySQ2Na8BaFS3xnwYipqpl9S IoMyCoo6cCBCNgf2MMVeaXLtzHqH8vEDGVQCwj04+oawuX2BgynDdJ/oIOuTAXJbBtI9+6syVdjWW 33cuhm9rXYRzqKxIy7/vcduBTjgdntAIDSyOrVmzYHmbYOQYe5T+L1/D3E5StACRv2VfSfXcmDG25 C5v9aYJpZn2r9+QQo41g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jBJLc-0007mJ-FW; Mon, 09 Mar 2020 14:25:36 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jBJLZ-0007lZ-EL for linux-arm-kernel@lists.infradead.org; Mon, 09 Mar 2020 14:25:35 +0000 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 C805B11D4; Mon, 9 Mar 2020 07:25:30 -0700 (PDT) Received: from localhost (e108754-lin.cambridge.arm.com [10.1.198.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6AC3C3F67D; Mon, 9 Mar 2020 07:25:30 -0700 (PDT) Date: Mon, 9 Mar 2020 14:25:29 +0000 From: Ionela Voinescu To: Marc Zyngier Subject: Re: [PATCH v5 3/7] arm64/kvm: disable access to AMU registers from kvm guests Message-ID: <20200309142529.GB13343@arm.com> References: <20200226132947.29738-1-ionela.voinescu@arm.com> <20200226132947.29738-4-ionela.voinescu@arm.com> <46b89d0c9704e0a0fb7a4ac2a1fb5b7a@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <46b89d0c9704e0a0fb7a4ac2a1fb5b7a@kernel.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200309_072533_530768_25A798C9 X-CRM114-Status: GOOD ( 16.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, suzuki.poulose@arm.com, pkondeti@codeaurora.org, catalin.marinas@arm.com, linux-pm@vger.kernel.org, linux-doc@vger.kernel.org, rjw@rjwysocki.net, linux-kernel@vger.kernel.org, dietmar.eggemann@arm.com, peterz@infradead.org, mingo@redhat.com, viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org, sudeep.holla@arm.com, James Morse , Julien Thierry , will@kernel.org, valentin.schneider@arm.com, lukasz.luba@arm.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Marc, On Thursday 27 Feb 2020 at 19:58:32 (+0000), Marc Zyngier wrote: [..] > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > > index 3e909b117f0c..44354c812783 100644 > > --- a/arch/arm64/kvm/sys_regs.c > > +++ b/arch/arm64/kvm/sys_regs.c > > @@ -1003,6 +1003,20 @@ static bool access_pmuserenr(struct kvm_vcpu > > *vcpu, struct sys_reg_params *p, > > { SYS_DESC(SYS_PMEVTYPERn_EL0(n)), \ > > access_pmu_evtyper, reset_unknown, (PMEVTYPER0_EL0 + n), } > > > > +static bool access_amu(struct kvm_vcpu *vcpu, struct sys_reg_params *p, > > + const struct sys_reg_desc *r) > > +{ > > + kvm_inject_undefined(vcpu); > > + > > + return false; > > +} > > + > > +/* Macro to expand the AMU counter and type registers*/ > > +#define AMU_AMEVCNTR0_EL0(n) { SYS_DESC(SYS_AMEVCNTR0_EL0(n)), > > access_amu } > > +#define AMU_AMEVTYPE0_EL0(n) { SYS_DESC(SYS_AMEVTYPE0_EL0(n)), > > access_amu } > > +#define AMU_AMEVCNTR1_EL0(n) { SYS_DESC(SYS_AMEVCNTR1_EL0(n)), > > access_amu } > > +#define AMU_AMEVTYPE1_EL0(n) { SYS_DESC(SYS_AMEVTYPE1_EL0(n)), > > access_amu } > > + > > static bool trap_ptrauth(struct kvm_vcpu *vcpu, > > struct sys_reg_params *p, > > const struct sys_reg_desc *rd) > > @@ -1078,8 +1092,10 @@ static u64 read_id_reg(const struct kvm_vcpu > > *vcpu, > > (u32)r->CRn, (u32)r->CRm, (u32)r->Op2); > > u64 val = raz ? 0 : read_sanitised_ftr_reg(id); > > > > - if (id == SYS_ID_AA64PFR0_EL1 && !vcpu_has_sve(vcpu)) { > > - val &= ~(0xfUL << ID_AA64PFR0_SVE_SHIFT); > > + if (id == SYS_ID_AA64PFR0_EL1) { > > + if (!vcpu_has_sve(vcpu)) > > + val &= ~(0xfUL << ID_AA64PFR0_SVE_SHIFT); > > + val &= ~(0xfUL << ID_AA64PFR0_AMU_SHIFT); > > This will definitely conflict with some of the ongoing rework I have[1]. > I'm happy to provide this as a stable branch for you to rebase on top, > or use an arm64 provided branch to rebase my stoff on top. > > Just let me know how you want to proceed. > Catalin added the AMU patches on top of 5.6-rc3 at [1]. Is this okay as a base branch for your patches? Thanks, Ionela. [1] https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=for-next/amu > Thanks, > > M. > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/commit/?h=kvm-arm64/debug-fixes-5.6&id=454fb7398d3626328f7f771c07d21e894e4e1a3b > -- > Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel