Received: by 2002:a89:413:0:b0:1fd:dba5:e537 with SMTP id m19csp887689lqs; Fri, 14 Jun 2024 08:24:38 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUgQF0zEfUKUHOexIst2e0qZgFcEjtwiaMzUr/yhNiF0YuDiEZK84/UDjUKtucTNPrGG2dTWVth5/EeZgegy0VJMKEU2wqj2ZR8W3z8NQ== X-Google-Smtp-Source: AGHT+IG2x7MNRlD7nPMJDpIdkWD7DNUfXsfl8irsiJ4Bbb+cJt0e4MIhZbf5G8dcDHGIIBgOXVcA X-Received: by 2002:a05:6214:483:b0:6b0:716d:3ca7 with SMTP id 6a1803df08f44-6b2afc9a323mr43399626d6.19.1718378678649; Fri, 14 Jun 2024 08:24:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718378678; cv=pass; d=google.com; s=arc-20160816; b=Hhul4fCx3a+14ivJ7NwPeNbKdholyDGavXhxf1HbDXmNOlUCVsC0HgrV8wy7Qp7zvc KIjHUzgM1sCjvTv9gh1nE9Qri6eH8b+bNj038OtRpleYCY4bI/x4oDSExRX4Y2DKIreF CGmWtnPeMW5FcVuudUygiU7STVBcT56jJp4VZINDZmWz4jFFI6bM6YrybhUFF868murx o5kyXvB7Z5NxP8yg3WemtJo1vFvLs3nl8HsMYnnOPpRymKrDraXEhTmjhQI+e6vSetpC bRWJKekOyR1fcVkrR0pUkvDa8p+iDWISRwbarA7zokQuvY7Ej7T47H+NPKAsYgcpxXB0 3ABw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date; bh=YUGJL0dTmMc0BTxsdYErzxktBwmdYzr69o36ZrPZkCc=; fh=wSA0j2BIV6dAC0QZM/OM3a/XPM93dZ06nH5NItg2WFk=; b=brkUXFTWl9leOLBAt8k5Cv+fWYsZJzJJjAtP3cDUaLnuDWDQoN//sZ7f1FFx4TEgMo O+3Z0GneOZjtLflIITvwKxRFDn3wamMrFoPy7F3jPd4gxdxP5+4L98yPR/BamA0ys5Xt x3+ci5l59mg8qzMPpqH9F3Hl8kE8k/SvTosoN8f0qEB15Ejk2NUVNQ8fIPEm5tz4z6gO 58m/asyTAayoZNVCaJlNAGPxWWM1A/HBW5mau34AV2WxHzp+4CPui7jICfZWKKP6g91E RUtbyYSLenMRRSBeMwFGhFsXhsHiw0PXLrT9CK7g7oCiB2sdLdAG9RS9g4Qu4b0KjcTp setA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-215140-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-215140-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id 6a1803df08f44-6b2a5afe208si42812076d6.233.2024.06.14.08.24.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jun 2024 08:24:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-215140-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-215140-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-215140-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id CD9D21C2564C for ; Fri, 14 Jun 2024 15:24:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DDCE516D9CF; Fri, 14 Jun 2024 15:23:27 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CC37315FA73; Fri, 14 Jun 2024 15:23:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718378607; cv=none; b=dqGrUL0+uhSQ9WsEBrs6S5YBkgxoxDxA7/zNtRpYjEqrLzoAKq/EzsDL3i/paWjfJGrtEF2EojlqreuMAgUt9JtK9tiFJA4PqDtTvtFbwpWo6Q7rJF79qYh+KXqQK0cJaAn4FTw+H0kZwLRVmrwHtEGqn/E1JDVZioyYKzlQIzQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718378607; c=relaxed/simple; bh=EL0yGZvLp178iwjqGXn1neHj8u1yfXcPxngFTq3rdXU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=rbbc/vUDdmFPm6alZvJ13IJYjpjTkiIEiVe0dIbNly29qBB2XaYmGU2SfGGt4z6WZe3nVu+n70V7gYNNRZ3ISjkwQB6oxMyLipMstov4QinOLzobH0LVnEqLBNhGTbu9j/3Dth619QhIuhUxEHyVxUUdavIsdshzhawn2m8y72Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 C7FF4FEC; Fri, 14 Jun 2024 08:23:48 -0700 (PDT) Received: from J2N7QTR9R3.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A5DE43F5A1; Fri, 14 Jun 2024 08:23:21 -0700 (PDT) Date: Fri, 14 Jun 2024 16:23:18 +0100 From: Mark Rutland To: Anshuman Khandual Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, will@kernel.org, catalin.marinas@arm.com, Mark Brown , James Clark , Rob Herring , Marc Zyngier , Suzuki Poulose , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , linux-perf-users@vger.kernel.org, Oliver Upton , James Morse , kvmarm@lists.linux.dev Subject: Re: [PATCH V18 6/9] KVM: arm64: nvhe: Disable branch generation in nVHE guests Message-ID: References: <20240613061731.3109448-1-anshuman.khandual@arm.com> <20240613061731.3109448-7-anshuman.khandual@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240613061731.3109448-7-anshuman.khandual@arm.com> On Thu, Jun 13, 2024 at 11:47:28AM +0530, Anshuman Khandual wrote: > Disable the BRBE before we enter the guest, saving the status and enable it > back once we get out of the guest. This avoids capturing branch records in > the guest kernel or userspace, which would be confusing the host samples. It'd be good to explain why we need to do this for nVHE, but not for VHE. I *think* that you're relying on BRBCR_EL2.EL0HBRE being ignored when HCR_EL2.TGE == 0, and BRBCR_EL1.E{1,0}BRE being initialized to 0 out-of-reset. What should a user do if they *want* samples from a guest? Is that possible to do on other architectures, or do is that always prevented? Mark. > > Cc: Marc Zyngier > Cc: Oliver Upton > Cc: James Morse > Cc: Suzuki K Poulose > Cc: Catalin Marinas > Cc: Will Deacon > Cc: kvmarm@lists.linux.dev > Cc: linux-arm-kernel@lists.infradead.org > CC: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual > ---- > Changes in V18: > > - Used host_data_ptr() to access host_debug_state.brbcr_el1 register > - Changed DEBUG_STATE_SAVE_BRBE to use BIT(7) > - Reverted back iflags as u8 > > arch/arm64/include/asm/kvm_host.h | 3 +++ > arch/arm64/kvm/debug.c | 5 +++++ > arch/arm64/kvm/hyp/nvhe/debug-sr.c | 31 ++++++++++++++++++++++++++++++ > 3 files changed, 39 insertions(+) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 36b8e97bf49e..db922c10bd2a 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -579,6 +579,7 @@ struct kvm_host_data { > u64 trfcr_el1; > /* Values of trap registers for the host before guest entry. */ > u64 mdcr_el2; > + u64 brbcr_el1; > } host_debug_state; > }; > > @@ -842,6 +843,8 @@ struct kvm_vcpu_arch { > #define DEBUG_STATE_SAVE_SPE __vcpu_single_flag(iflags, BIT(5)) > /* Save TRBE context if active */ > #define DEBUG_STATE_SAVE_TRBE __vcpu_single_flag(iflags, BIT(6)) > +/* Save BRBE context if active */ > +#define DEBUG_STATE_SAVE_BRBE __vcpu_single_flag(iflags, BIT(7)) > > /* SVE enabled for host EL0 */ > #define HOST_SVE_ENABLED __vcpu_single_flag(sflags, BIT(0)) > diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c > index ce8886122ed3..8fa648943f0f 100644 > --- a/arch/arm64/kvm/debug.c > +++ b/arch/arm64/kvm/debug.c > @@ -336,10 +336,15 @@ void kvm_arch_vcpu_load_debug_state_flags(struct kvm_vcpu *vcpu) > if (cpuid_feature_extract_unsigned_field(dfr0, ID_AA64DFR0_EL1_TraceBuffer_SHIFT) && > !(read_sysreg_s(SYS_TRBIDR_EL1) & TRBIDR_EL1_P)) > vcpu_set_flag(vcpu, DEBUG_STATE_SAVE_TRBE); > + > + /* Check if we have BRBE implemented and available at the host */ > + if (cpuid_feature_extract_unsigned_field(dfr0, ID_AA64DFR0_EL1_BRBE_SHIFT)) > + vcpu_set_flag(vcpu, DEBUG_STATE_SAVE_BRBE); > } > > 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_TRBE); > + vcpu_clear_flag(vcpu, DEBUG_STATE_SAVE_BRBE); > } > diff --git a/arch/arm64/kvm/hyp/nvhe/debug-sr.c b/arch/arm64/kvm/hyp/nvhe/debug-sr.c > index 53efda0235cf..97e861df1b45 100644 > --- a/arch/arm64/kvm/hyp/nvhe/debug-sr.c > +++ b/arch/arm64/kvm/hyp/nvhe/debug-sr.c > @@ -79,6 +79,32 @@ static void __debug_restore_trace(u64 trfcr_el1) > write_sysreg_el1(trfcr_el1, SYS_TRFCR); > } > > +static void __debug_save_brbe(u64 *brbcr_el1) > +{ > + *brbcr_el1 = 0; > + > + /* Check if the BRBE is enabled */ > + if (!(read_sysreg_el1(SYS_BRBCR) & (BRBCR_ELx_E0BRE | BRBCR_ELx_ExBRE))) > + return; > + > + /* > + * Prohibit branch record generation while we are in guest. > + * Since access to BRBCR_EL1 is trapped, the guest can't > + * modify the filtering set by the host. > + */ > + *brbcr_el1 = read_sysreg_el1(SYS_BRBCR); > + write_sysreg_el1(0, SYS_BRBCR); > +} > + > +static void __debug_restore_brbe(u64 brbcr_el1) > +{ > + if (!brbcr_el1) > + return; > + > + /* Restore BRBE controls */ > + write_sysreg_el1(brbcr_el1, SYS_BRBCR); > +} > + > void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu) > { > /* Disable and flush SPE data generation */ > @@ -87,6 +113,9 @@ void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu) > /* Disable and flush Self-Hosted Trace generation */ > if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRBE)) > __debug_save_trace(host_data_ptr(host_debug_state.trfcr_el1)); > + /* Disable BRBE branch records */ > + if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_BRBE)) > + __debug_save_brbe(host_data_ptr(host_debug_state.brbcr_el1)); > } > > void __debug_switch_to_guest(struct kvm_vcpu *vcpu) > @@ -100,6 +129,8 @@ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu) > __debug_restore_spe(*host_data_ptr(host_debug_state.pmscr_el1)); > if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRBE)) > __debug_restore_trace(*host_data_ptr(host_debug_state.trfcr_el1)); > + if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_BRBE)) > + __debug_restore_brbe(*host_data_ptr(host_debug_state.brbcr_el1)); > } > > void __debug_switch_to_host(struct kvm_vcpu *vcpu) > -- > 2.25.1 >