Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp1635214rdb; Tue, 20 Feb 2024 02:12:25 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWXthLRFgR+Hc2vUZNPCKyura2cCyhntgEVNH4U4dHmRzcdFhFTUrCida6mWzVevR7pq86wMHEEahrJBl4pmppAuN3b+UveXkOgLIAIxw== X-Google-Smtp-Source: AGHT+IGSZPKkCMF2P1q4qtSrb6oC78/GPhumuW7xhkLT+EyoUZSRsJUW5/EVYdBmhYuUtAG8lW24 X-Received: by 2002:a17:906:2491:b0:a3e:48f2:19c2 with SMTP id e17-20020a170906249100b00a3e48f219c2mr4759747ejb.76.1708423945380; Tue, 20 Feb 2024 02:12:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708423945; cv=pass; d=google.com; s=arc-20160816; b=UTDfjrstXLbpm2bf8OMjNZJBpISTSG6SPGqqIybBMrXuhUCr1Dtufh1emoAdCme67x yqZLQXQlng+DE08rMR+0BYxQX+Msk2Za2S00LEVwF1eglNjCwn+fZkfgonk8aACKUnI3 fdbVyOygpLDQsuv7LZaIjuniyUeWpaSeiY7oXj+VenJL/b6P4SCx7E0oOiVEz/NzKODV BYWganG3qeyImf0Hw4rCf0Fymzd0MqECMd38yO1jFfFiai3h9jb6mgCoRiiNMeCYU3te bOAfI07ttLbYPM7p+wVmvLn5geJp62kXzsHubjCo2IzyzC3y4YSLZW4KrYTiVYxFhi6t pTOA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=hY+mMWMn6snKVDR8LTH2A6bDAU+yBi0Clt3OxBry9FQ=; fh=T1RJ//JNEEFrB4mxSLD1jGRRxedEP1YeCnYnFLRUOSc=; b=Mb93Uexoqwcjxno8HzW02UYWhq7w1DH7huLz+BUlx4H42fx/UNVtk+SgXqTwihkqcu oTe1VCmT8GmgDQ8esXoOlnFJCnI/+Sn8l+e0cmTlZI24Sm8nuiiB31OEK/GuIwD3rOlw Z5MDOB8ncE1vsHeMwpWfT074x48M/m9hXj6/H/MaIlfo0YiebgUJptN4uKGu1rW07R3C K4ni8wX8ssqw9D8/uhoshtkdG8rJ9LZP+u3tNPtM66R2JQ6Dq/7kz/xVszkcQxQRdeG7 C5BNSGC5sjBK1R43JUz9tCOdPgMTueLJDMlB+NE3nr+Y1KRls7vgckumlM3TNuEc8rUy NXWw==; 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-72787-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72787-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id nb30-20020a1709071c9e00b00a3f07f2f619si329022ejc.245.2024.02.20.02.12.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 02:12:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72787-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; 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-72787-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72787-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 25EF31F21A42 for ; Tue, 20 Feb 2024 10:12:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 070FD657BA; Tue, 20 Feb 2024 10:10:57 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D9EBA657AC for ; Tue, 20 Feb 2024 10:10:54 +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=1708423856; cv=none; b=ZMXbR25BJ2HRiw+eSBFF80GVDqcok5bdOgTAgkGDNepOVHAQtOST54OAB8IZbRNwRHLnOS0GcJqMZJBCMsSHlGaPxbaWYXVCVIhAItaQVJQpuKKFM/ne2QqQG3U645NdH8L4OQhACcFW5wTuwza61Gt7IHI07DLPaqsGsBBuCGU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708423856; c=relaxed/simple; bh=5KaC48hmMsOyRy4OyHf+gKTzdlX10/82H5k3TMarcvk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C+mVdEX4xyeI2lk0pZIRfxLhNfYfU2AnFyWrWKl34jtLHOLVSOTyLwzw9Hd/xuwK3lQMzmnz9QnkaZhx2ndxoGVMEPLhQFqUU8+a9H4oDNEBS9L/xgdUA3ny9NYcLPAUFoBonsI/WVcwxmOya892Sxq6lFXpNTXmQymRAEWSY3Q= 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 6BA691007; Tue, 20 Feb 2024 02:11:33 -0800 (PST) Received: from e127643.broadband (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C55D33F762; Tue, 20 Feb 2024 02:10:48 -0800 (PST) From: James Clark To: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, maz@kernel.org, suzuki.poulose@arm.com, acme@kernel.org, oliver.upton@linux.dev, broonie@kernel.org Cc: James Clark , James Morse , Zenghui Yu , Catalin Marinas , Will Deacon , Mike Leach , Alexander Shishkin , Anshuman Khandual , Miguel Luis , Joey Gouly , Ard Biesheuvel , Greg Kroah-Hartman , Arnd Bergmann , Helge Deller , Andrew Walbran , Vincent Donnefort , Ryan Roberts , Fuad Tabba , Jing Zhang , linux-kernel@vger.kernel.org Subject: [PATCH v5 5/7] arm64: KVM: Add interface to set guest value for TRFCR register Date: Tue, 20 Feb 2024 10:09:15 +0000 Message-Id: <20240220100924.2761706-6-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220100924.2761706-1-james.clark@arm.com> References: <20240220100924.2761706-1-james.clark@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, the host trace is controlled by TRFCR_EL2 and thus we can write to the TRFCR_EL1 immediately. Because guest writes to the register are trapped, the value will persist and can't be modified. Instead of adding a load of infrastructure to share the host's per-cpu offsets with the hypervisor, just define the new storage as a NR_CPUS array. Signed-off-by: James Clark --- arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kernel/image-vars.h | 1 + arch/arm64/kvm/debug.c | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 85b5477bd1b4..56b7f7eca195 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -509,6 +509,7 @@ struct kvm_host_psci_config { bool psci_0_1_cpu_off_implemented; bool psci_0_1_migrate_implemented; }; +extern u64 ____cacheline_aligned kvm_guest_trfcr[NR_CPUS]; extern struct kvm_host_psci_config kvm_nvhe_sym(kvm_host_psci_config); #define kvm_host_psci_config CHOOSE_NVHE_SYM(kvm_host_psci_config) @@ -1174,6 +1175,7 @@ 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); #else static inline void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr) {} static inline void kvm_clr_pmu_events(u32 clr) {} @@ -1181,6 +1183,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_vhe(struct kvm_vcpu *vcpu); diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index 5e4dc72ab1bd..a451e4f10804 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -59,6 +59,7 @@ KVM_NVHE_ALIAS(alt_cb_patch_nops); /* Global kernel state accessed by nVHE hyp code. */ KVM_NVHE_ALIAS(kvm_vgic_global_state); +KVM_NVHE_ALIAS(kvm_guest_trfcr); /* Kernel symbols used to call panic() from nVHE hyp code (via ERET). */ KVM_NVHE_ALIAS(nvhe_hyp_panic_handler); diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c index 49a13e72ddd2..c8d936ce6e2b 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); +u64 ____cacheline_aligned kvm_guest_trfcr[NR_CPUS]; /* * save/restore_guest_debug_regs @@ -359,3 +360,28 @@ void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu) vcpu_clear_flag(vcpu, DEBUG_STATE_SAVE_TRBE); vcpu_clear_flag(vcpu, DEBUG_STATE_SAVE_TRFCR); } + +/* + * 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, + * the host trace is controlled by TRFCR_EL2 and thus we can write to the + * TRFCR_EL1 immediately. Because guest writes to the register are trapped, the + * value will persist and can't be modified. For pKVM, kvm_guest_trfcr can't + * be read by the hypervisor, so don't bother writing it. + */ +void kvm_etm_set_guest_trfcr(u64 trfcr_guest) +{ + if (WARN_ON_ONCE(!cpuid_feature_extract_unsigned_field(read_sysreg(id_aa64dfr0_el1), + ID_AA64DFR0_EL1_TraceFilt_SHIFT))) + return; + + if (has_vhe()) + write_sysreg_s(trfcr_guest, SYS_TRFCR_EL12); + else if (!is_protected_kvm_enabled()) + kvm_guest_trfcr[smp_processor_id()] = trfcr_guest; +} +EXPORT_SYMBOL_GPL(kvm_etm_set_guest_trfcr); -- 2.34.1