Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp7814615rdb; Thu, 4 Jan 2024 08:29:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IHNmg82UpGjUz5/+/rDs5uOXgl0CXPvKNUs0xIUmF4ZNn9LhzSxJHRTDoFjPbnb75G3zxjY X-Received: by 2002:a05:620a:2954:b0:781:80e8:c5ea with SMTP id n20-20020a05620a295400b0078180e8c5eamr987180qkp.75.1704385759317; Thu, 04 Jan 2024 08:29:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704385759; cv=none; d=google.com; s=arc-20160816; b=JJylgu/nVcNXJmf6B5Nfb35PcRQcys70DAIGrOrJ6BSNdYx/JVg2+DPOPmh/rsPzKa FvzrwUPVT8SRLV12h/dnoAdE9bVIiwAgAVuTuGX3M3sl1yMvoTLP1sE/LDCoXoAOTRQE SMeigAu4+Hox43VQ4GdBwYxQMjJWSfuuggl7zmRfyLZCa/oHvXtTxhIenRGC6ailB7Ym vj2fBZDsA30/n3/NZaX0Bq1dV5LyTtLAWBgu8WwfYtffJsw0MILawfPJtYw7dwg2uUZI 9UuV1WOipKiBkYVz5nv/yBSLV3gtJkqYf1NsdWvmSQKiTGJLqasrW5Z222zsYzCThskP HLeg== ARC-Message-Signature: i=1; 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=oUBXFsw6wOkXEO+Ih+VuEvcy0/evtw0rCo00NEVSnZI=; fh=rO8CKSMk5K34mj0Un77Por9mhGHYm6fpUWUI/LDFKqI=; b=0c1zvBGywSRmuRJNM7WrrkZz0mCs9l11ep8FWBIZez47FoCeSv2RVzKV0O3SkpkuuD rJ1Kw5mfgZeCxC3sSP9Is214wLgGCwsErViFaW4KfeTyiCNGiQGRhwO8Tmm70zKtvg9Q ZldVzYTOiJjktGFK7crfCdlZ2RbUTr/UQ+x+z+X4Oche+OsuaX3GRBJke1crv4nBS11g KRAhmLx5FoyIoLS5d+/62eUJVbh4W6Yh+D35XUdQNo25KjX+I4r0+zLBWjJ/gL0ZJ9mh YoFMAlFrlN9+WqTPvmESqpzFb77Cd3ydLYsVCkH/uLeEJZ4nZgOTTpiIQc4zorcwkccR H6gQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-16930-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-16930-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 v13-20020ae9e30d000000b00781205837efsi28377175qkf.4.2024.01.04.08.29.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 08:29:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-16930-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; spf=pass (google.com: domain of linux-kernel+bounces-16930-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-16930-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 E672C1C22317 for ; Thu, 4 Jan 2024 16:29:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F1912556A; Thu, 4 Jan 2024 16:28:50 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4DD2625562 for ; Thu, 4 Jan 2024 16:28:48 +0000 (UTC) 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 962E11007; Thu, 4 Jan 2024 08:29:33 -0800 (PST) Received: from e127643.. (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2026E3F5A1; Thu, 4 Jan 2024 08:28:38 -0800 (PST) From: James Clark To: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, broonie@kernel.org, maz@kernel.org, suzuki.poulose@arm.com, acme@kernel.org Cc: James Clark , Oliver Upton , James Morse , Zenghui Yu , Catalin Marinas , Will Deacon , Mike Leach , Leo Yan , Alexander Shishkin , Anshuman Khandual , Rob Herring , Miguel Luis , Jintack Lim , Ard Biesheuvel , Mark Rutland , Arnd Bergmann , Kalesh Singh , Quentin Perret , Vincent Donnefort , Fuad Tabba , Kristina Martsenko , Akihiko Odaki , Joey Gouly , Jing Zhang , linux-kernel@vger.kernel.org Subject: [PATCH v4 5/7] arm64: KVM: Add interface to set guest value for TRFCR register Date: Thu, 4 Jan 2024 16:27:05 +0000 Message-Id: <20240104162714.1062610-6-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104162714.1062610-1-james.clark@arm.com> References: <20240104162714.1062610-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. Signed-off-by: James Clark --- arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kvm/debug.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 4864a1fcdf89..ee6cba7ee6ee 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -471,6 +471,7 @@ struct kvm_host_global_state { u32 events_host; u32 events_guest; } pmu_events; + u64 guest_trfcr_el1; } ____cacheline_aligned; extern struct kvm_host_global_state kvm_host_global_state[NR_CPUS]; @@ -1145,6 +1146,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) {} @@ -1152,6 +1154,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/kvm/debug.c b/arch/arm64/kvm/debug.c index f86cbfae60f3..d69a0b9d9575 100644 --- a/arch/arm64/kvm/debug.c +++ b/arch/arm64/kvm/debug.c @@ -358,3 +358,27 @@ 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. + */ +void kvm_etm_set_guest_trfcr(u64 trfcr_guest) +{ + if (!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 + kvm_host_global_state[smp_processor_id()].guest_trfcr_el1 = trfcr_guest; +} +EXPORT_SYMBOL_GPL(kvm_etm_set_guest_trfcr); -- 2.34.1