From patchwork Mon Feb 26 11:30:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 206579 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2010411dyb; Mon, 26 Feb 2024 03:35:39 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW0tULF45mKPADguquISEt21r6UvoQUk8J4LgDSwjjtmOpxbkPhKiPVOekCbflyaT5I9K2QJ0dahhbabu3a5oUQe2lJmw== X-Google-Smtp-Source: AGHT+IFrUjzqjnLn4pUYbVOT0tXnV7mDudrDCqEX0Co3ETPTN3NThqiEqY78Pi0p4oi/KCibMJAW X-Received: by 2002:a05:6102:3d06:b0:471:fb9f:443c with SMTP id i6-20020a0561023d0600b00471fb9f443cmr576541vsv.20.1708947339646; Mon, 26 Feb 2024 03:35:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708947339; cv=pass; d=google.com; s=arc-20160816; b=mEpw26LXif86HSeJBY40hxUU5blWjbl0hLzrMXQhmPcyziARBuNyOyqoNs1y1B4rm7 Z4HlpvHfCbcnaIT3DSGuz2ihZKKE70YkaDv23VIfYqHqhSu6lxULivupv4TGkFN4cVY9 UwgY3MIJAKuA+1Vx1N2h9crBZXQVlma1LhICWE3S9TX/T5cGH0/B18igLV8cQptLd2i1 ablE2Vhu83bNEgjKAA0zj0bo0UQt8Er7BnQpDzsQhUgtxVJwIMw9lLQqCXiIT1qvC5Qr pX9Tk7PHL4XOBasFIzsGyRWWmQKIWuMAkaB3VQsy28Q0Dw/uoxwaWlithJFU/SIPLTJN P7cQ== 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=q7ykGumoLUweLcAWPd7txRSrxwA99phTh2n1Tda0mWA=; fh=dSNmkKLmDKSkcKlDM1M71dF0j1A12eZKKoBBOJr1L2Y=; b=iEu9lK8LyQjj2aTI9jxpNuNC9YAzRR0dBxi+segImVZOZhrNA2M8mV/Y2CZNdlDird mlqpeNkGsigh9/IRm7NVCs/heDGkzJDP03uuquMINjbKN7TOGc8xh56mB8rLaheqp7UQ cRgHSLPPRnbX2rB69lHeMwq80ysYPZDbpvEeYdaTqNZPQSPVKmvD9qPiRCEacUGa1btM pDYgawK5pjGLYZGIevn27FWWmeDCiSoilmaQE/FBw+rOcvp/z+UbBcNM0FWUa/OQEcXA ibAFv2PzO5/SlU/pcyd9Pmo1Q7QqQXOk19ilB5NUd0aLUts3ai17DcEeJEk1FyiT4/8w WKwA==; 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-81272-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81272-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id y23-20020ac85257000000b0042e4cfe8d9csi4775612qtn.199.2024.02.26.03.35.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 03:35:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-81272-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; 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-81272-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81272-ouuuleilei=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 A5A1B1C2204B for ; Mon, 26 Feb 2024 11:35:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DD16D3D971; Mon, 26 Feb 2024 11:34:09 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 736561DA3F for ; Mon, 26 Feb 2024 11:34:06 +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=1708947248; cv=none; b=mu+1lEBUUSn1CdihQnW76tIjFinvge1irIVRj4lezE1W1mOSI2tTNBLTPoPiwInnxVOAuS01dG/f064OrXLI6OUVd8MlY/ERD9YJFFsY/gv2kXxJfrPHHcEYf7ZcioWEeXNHtuRtArbHzrfstfqjIQKDSZMJ8ZAw/DQAViSc9e8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708947248; c=relaxed/simple; bh=HmUHt2eCyNcA0mVAomAcSpEcUF9JxEw4xAHbzsyB72E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fSCutGL9SSnfVq6jidXIcQgnOMAGWV5AEBqXorNaDpEsL2ksS5HsYeOQPOGRwNTjUmrPiHv2gaJ6OTeqF9urmnqcUqJmUTBSX+Y4mNxTPcXd+NJ/E5qfua09OBuGbWVoDqMJvWsgeWWNi8uHMRL2Yxzwla+modpy+1hQRLFVNQw= 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 91C7BDA7; Mon, 26 Feb 2024 03:34:44 -0800 (PST) Received: from e127643.broadband (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 73DD43F6C4; Mon, 26 Feb 2024 03:34:02 -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 , Mark Rutland , Greg Kroah-Hartman , Arnd Bergmann , Kalesh Singh , Vincent Donnefort , Ryan Roberts , Fuad Tabba , Jing Zhang , linux-kernel@vger.kernel.org Subject: [PATCH v6 6/8] arm64: KVM: Add interface to set guest value for TRFCR register Date: Mon, 26 Feb 2024 11:30:34 +0000 Message-Id: <20240226113044.228403-7-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240226113044.228403-1-james.clark@arm.com> References: <20240226113044.228403-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791961165327384072 X-GMAIL-MSGID: 1791961165327384072 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 | 29 +++++++++++++++++++++++++++++ 3 files changed, 33 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 31daa1da191c..fe9e2bd7f43a 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..fe90bc7d6dd4 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,31 @@ 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; + + /* Warn in invalid use of smp_processor_id() */ + WARN_ON_ONCE(preemptible()); + + 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);