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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B8AC5E732D0 for ; Fri, 29 Sep 2023 10:18:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NlsriuSjXAIznVbiNZRW8H6GHG01bcME7Im+X8bvXQk=; b=ZXkUXOvQw0IrO5 vCltNeTlo+gti7aE24U2av0gBqd+m/KevSQzjTi6h1p7qjqu8cCnCdDpg5/71/GsBvFDIydARQvAD 7PA88DS00VfSGeg5PUw7t8aiVdOK+31d8jQHnX5tdzplFB6rX0z6MB8Hf65LlUZRjPL0hp/7xw6ht X5FqVtfh7QW60tUcx9WI42llJrkGXJtrNAF4nvajFf0wi1dXwDjlS0o9MtZIiYQwZskFzxtG3nBia mclO05vXH0mArMFQaggt0vsGZwRmhE0MZV3HFWusDxbsNyBlm7lc06j50VCZ9C7SJTcEPzIbZUyn9 Cx/BPscAqielmkBJKsaA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qmAZM-007Wyx-2X; Fri, 29 Sep 2023 10:18:00 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qmAZH-007WyB-3A for linux-arm-kernel@lists.infradead.org; Fri, 29 Sep 2023 10:17:58 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 2D25861E5B; Fri, 29 Sep 2023 10:17:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA7AAC433C8; Fri, 29 Sep 2023 10:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695982674; bh=O/jIypGyxKwU2PaXQZ6VBzvqZw405EeEheox4gi/Mqw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=CXgN9g9LA/WdVpEUVE5cB99rBCQSU3bS5VpjpFZSU7g2ttN/PKxOBosPHmdO3u4oN YT9NM032T1KSAcUPWLnMVHDwGLAYWLDFGDnAiBF5GFqFQa6qqptt0YEclBvM3V9L64 pU6wvpsSaOa5IslqhL4YJ+T+x6RtG4i/rMCJfHQLcBBv5dZC6Nu4Xfdlkzg5Lajbez o30DFPFdnF5clQg67kiXq40Cea2veIAgQMX8MXX8WzUeX94xsG8VMBdyRUmmDB9A2Y f8AGXmpACBbHnlZJcGi1OhmRFGHf4mfKECmGygMrjM30fC/Ea3CUfwtvWRla/6hrEo mWHLrJ5lqbVjg== Received: from [85.255.233.37] (helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qmAZE-00HDJo-6E; Fri, 29 Sep 2023 11:17:52 +0100 Date: Fri, 29 Sep 2023 11:17:49 +0100 Message-ID: <87edihmgfm.wl-maz@kernel.org> From: Marc Zyngier To: James Clark Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, broonie@kernel.org, suzuki.poulose@arm.com, Oliver Upton , James Morse , Zenghui Yu , Catalin Marinas , Will Deacon , Mike Leach , Leo Yan , Alexander Shishkin , Anshuman Khandual , Rob Herring , Jintack Lim , Joey Gouly , linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 3/5] arm64: KVM: Add interface to set guest value for TRFCR register In-Reply-To: <20230928151611.3042443-4-james.clark@arm.com> References: <20230928151611.3042443-1-james.clark@arm.com> <20230928151611.3042443-4-james.clark@arm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 85.255.233.37 X-SA-Exim-Rcpt-To: james.clark@arm.com, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, broonie@kernel.org, suzuki.poulose@arm.com, oliver.upton@linux.dev, james.morse@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, mike.leach@linaro.org, leo.yan@linaro.org, alexander.shishkin@linux.intel.com, anshuman.khandual@arm.com, robh@kernel.org, jintack.lim@linaro.org, joey.gouly@arm.com, linux-kernel@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230929_031756_113134_FBD0739F X-CRM114-Status: GOOD ( 41.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 28 Sep 2023 16:16:07 +0100, James Clark wrote: > > Add an interface for the Coresight driver to use to set the value of the > TRFCR register for the guest. This register controls the exclude > settings for trace at different exception levels, and is used to > honor the exclude_host and exclude_guest parameters from the Perf > session. This will be used to later write TRFCR_EL1 on nVHE at guest > switch. For VHE, TRFCR_EL1 is written immediately. Because guest writes > to the register are trapped, the value will persist and can't be > modified. > > The settings must be copied to the vCPU before each run in the same > way that PMU events are because the per-cpu struct isn't accessible in > protected mode. > > Now that both guest and host values are saved, rename trfcr_el1 to > host_trfcr_el1 to make it clear that's the value that should be restored > on return to the host. > > Reviewed-by: Mark Brown (sysreg) > Signed-off-by: James Clark > --- > arch/arm64/include/asm/kvm_host.h | 6 +++++- > arch/arm64/kvm/arm.c | 1 + > arch/arm64/kvm/debug.c | 21 +++++++++++++++++++++ > arch/arm64/kvm/hyp/nvhe/debug-sr.c | 4 ++-- > arch/arm64/tools/sysreg | 4 ++++ > 5 files changed, 33 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 498f922f4f41..0e57827a0cf2 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -547,7 +547,8 @@ struct kvm_vcpu_arch { > /* Statistical profiling extension */ > u64 pmscr_el1; > /* Self-hosted trace */ > - u64 trfcr_el1; > + u64 host_trfcr_el1; > + u64 guest_trfcr_el1; > } host_debug_state; I think it is high time we stop having *guest* state in a structure that is obviously for the host, starting by moving the breakpoint and watchpoint out, and into the sysreg array. And then TRFCR_EL1 can join the fun. But it is pretty unclear whether that's actually the guest state. > > /* VGIC state */ > @@ -1097,6 +1098,8 @@ void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu); > void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr); > void kvm_clr_pmu_events(u32 clr); > bool kvm_set_pmuserenr(u64 val); > +void kvm_etm_set_guest_trfcr(u64 trfcr_guest); > +void kvm_etm_update_vcpu_events(struct kvm_vcpu *vcpu); > #else > static inline void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr) {} > static inline void kvm_clr_pmu_events(u32 clr) {} > @@ -1104,6 +1107,7 @@ static inline bool kvm_set_pmuserenr(u64 val) > { > return false; > } > +static inline void kvm_etm_set_guest_trfcr(u64 trfcr_guest) {} > #endif > > void kvm_vcpu_load_sysregs_vhe(struct kvm_vcpu *vcpu); > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index 1bfdd583b261..65e805dc1d7a 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -958,6 +958,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) > kvm_vgic_flush_hwstate(vcpu); > > kvm_pmu_update_vcpu_events(vcpu); > + kvm_etm_update_vcpu_events(vcpu); > > /* > * Ensure we set mode to IN_GUEST_MODE after we disable > diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c > index 6a1bad1a921b..379d2677961f 100644 > --- a/arch/arm64/kvm/debug.c > +++ b/arch/arm64/kvm/debug.c > @@ -22,6 +22,7 @@ > DBG_MDSCR_MDE) > > static DEFINE_PER_CPU(u64, mdcr_el2); > +static DEFINE_PER_CPU(u64, guest_trfcr); Hold on a sec. Why is that global? I'd expect the tracing to be specific to a vcpu, and not to affect *everything*. > > /** > * save/restore_guest_debug_regs > @@ -342,3 +343,23 @@ void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu) > vcpu_clear_flag(vcpu, DEBUG_STATE_SAVE_SPE); > vcpu_clear_flag(vcpu, DEBUG_STATE_SAVE_TRFCR); > } > + > +void kvm_etm_set_guest_trfcr(u64 trfcr_guest) > +{ > + if (has_vhe()) > + write_sysreg_s(trfcr_guest, SYS_TRFCR_EL12); > + else > + *this_cpu_ptr(&guest_trfcr) = trfcr_guest; > +} > +EXPORT_SYMBOL_GPL(kvm_etm_set_guest_trfcr); In what context can this be called? What if we want to expose TRFCR to guests instead? It looks to me that this ultimately precludes such use. > + > +/* > + * Updates the vcpu's view of the etm events for this cpu. Must be > + * called before every vcpu run after disabling interrupts, to ensure > + * that an interrupt cannot fire and update the structure. > + */ > +void kvm_etm_update_vcpu_events(struct kvm_vcpu *vcpu) > +{ > + if (!has_vhe() && vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRFCR)) > + vcpu->arch.host_debug_state.guest_trfcr_el1 = *this_cpu_ptr(&guest_trfcr); But what is the point of this per-vcpu field if all you care about is some per-CPU data? > +} > diff --git a/arch/arm64/kvm/hyp/nvhe/debug-sr.c b/arch/arm64/kvm/hyp/nvhe/debug-sr.c > index 89c208112eb7..55bc01e9808f 100644 > --- a/arch/arm64/kvm/hyp/nvhe/debug-sr.c > +++ b/arch/arm64/kvm/hyp/nvhe/debug-sr.c > @@ -86,7 +86,7 @@ void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu) > __debug_save_spe(&vcpu->arch.host_debug_state.pmscr_el1); > /* Disable and flush Self-Hosted Trace generation */ > if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRFCR)) > - __debug_save_trace(&vcpu->arch.host_debug_state.trfcr_el1); > + __debug_save_trace(&vcpu->arch.host_debug_state.host_trfcr_el1); > } `<> > void __debug_switch_to_guest(struct kvm_vcpu *vcpu) > @@ -99,7 +99,7 @@ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu) > if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_SPE)) > __debug_restore_spe(vcpu->arch.host_debug_state.pmscr_el1); > if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRFCR)) > - __debug_restore_trace(vcpu->arch.host_debug_state.trfcr_el1); > + __debug_restore_trace(vcpu->arch.host_debug_state.host_trfcr_el1); > } > > void __debug_switch_to_host(struct kvm_vcpu *vcpu) > diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg > index 992722c0c23b..295a4a625b8b 100644 > --- a/arch/arm64/tools/sysreg > +++ b/arch/arm64/tools/sysreg > @@ -2661,3 +2661,7 @@ EndSysreg > Sysreg TRFCR_EL2 3 4 1 2 1 > Fields TRFCR_EL2 > EndSysreg > + > +Sysreg TRFCR_EL12 3 5 1 2 1 > +Fields TRFCR_ELx > +EndSysreg Please move this to the first patch. M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel