From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org,
mike.leach@linaro.org, anshuman.khandual@arm.com,
leo.yan@linaro.org, Suzuki K Poulose <suzuki.poulose@arm.com>,
Marc Zyngier <maz@kernel.org>, Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>
Subject: [PATCH v4 05/19] kvm: arm64: Disable guest access to trace filter controls
Date: Thu, 25 Feb 2021 19:35:29 +0000 [thread overview]
Message-ID: <20210225193543.2920532-6-suzuki.poulose@arm.com> (raw)
In-Reply-To: <20210225193543.2920532-1-suzuki.poulose@arm.com>
Disable guest access to the Trace Filter control registers.
We do not advertise the Trace filter feature to the guest
(ID_AA64DFR0_EL1: TRACE_FILT is cleared) already, but the guest
can still access the TRFCR_EL1 unless we trap it.
This will also make sure that the guest cannot fiddle with
the filtering controls set by a nvhe host.
Cc: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
New patch
---
arch/arm64/include/asm/kvm_arm.h | 1 +
arch/arm64/kvm/debug.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index 4e90c2debf70..94d4025acc0b 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -278,6 +278,7 @@
#define CPTR_EL2_DEFAULT CPTR_EL2_RES1
/* Hyp Debug Configuration Register bits */
+#define MDCR_EL2_TTRF (1 << 19)
#define MDCR_EL2_TPMS (1 << 14)
#define MDCR_EL2_E2PB_MASK (UL(0x3))
#define MDCR_EL2_E2PB_SHIFT (UL(12))
diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c
index 7a7e425616b5..dbc890511631 100644
--- a/arch/arm64/kvm/debug.c
+++ b/arch/arm64/kvm/debug.c
@@ -89,6 +89,7 @@ void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu)
* - Debug ROM Address (MDCR_EL2_TDRA)
* - OS related registers (MDCR_EL2_TDOSA)
* - Statistical profiler (MDCR_EL2_TPMS/MDCR_EL2_E2PB)
+ * - Self-hosted Trace Filter controls (MDCR_EL2_TTRF)
*
* Additionally, KVM only traps guest accesses to the debug registers if
* the guest is not actively using them (see the KVM_ARM64_DEBUG_DIRTY
@@ -112,6 +113,7 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
vcpu->arch.mdcr_el2 = __this_cpu_read(mdcr_el2) & MDCR_EL2_HPMN_MASK;
vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM |
MDCR_EL2_TPMS |
+ MDCR_EL2_TTRF |
MDCR_EL2_TPMCR |
MDCR_EL2_TDRA |
MDCR_EL2_TDOSA);
--
2.24.1
WARNING: multiple messages have this Message-ID (diff)
From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
mathieu.poirier@linaro.org, anshuman.khandual@arm.com,
Marc Zyngier <maz@kernel.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
linux-kernel@vger.kernel.org, leo.yan@linaro.org,
Will Deacon <will@kernel.org>,
mike.leach@linaro.org
Subject: [PATCH v4 05/19] kvm: arm64: Disable guest access to trace filter controls
Date: Thu, 25 Feb 2021 19:35:29 +0000 [thread overview]
Message-ID: <20210225193543.2920532-6-suzuki.poulose@arm.com> (raw)
In-Reply-To: <20210225193543.2920532-1-suzuki.poulose@arm.com>
Disable guest access to the Trace Filter control registers.
We do not advertise the Trace filter feature to the guest
(ID_AA64DFR0_EL1: TRACE_FILT is cleared) already, but the guest
can still access the TRFCR_EL1 unless we trap it.
This will also make sure that the guest cannot fiddle with
the filtering controls set by a nvhe host.
Cc: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
New patch
---
arch/arm64/include/asm/kvm_arm.h | 1 +
arch/arm64/kvm/debug.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index 4e90c2debf70..94d4025acc0b 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -278,6 +278,7 @@
#define CPTR_EL2_DEFAULT CPTR_EL2_RES1
/* Hyp Debug Configuration Register bits */
+#define MDCR_EL2_TTRF (1 << 19)
#define MDCR_EL2_TPMS (1 << 14)
#define MDCR_EL2_E2PB_MASK (UL(0x3))
#define MDCR_EL2_E2PB_SHIFT (UL(12))
diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c
index 7a7e425616b5..dbc890511631 100644
--- a/arch/arm64/kvm/debug.c
+++ b/arch/arm64/kvm/debug.c
@@ -89,6 +89,7 @@ void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu)
* - Debug ROM Address (MDCR_EL2_TDRA)
* - OS related registers (MDCR_EL2_TDOSA)
* - Statistical profiler (MDCR_EL2_TPMS/MDCR_EL2_E2PB)
+ * - Self-hosted Trace Filter controls (MDCR_EL2_TTRF)
*
* Additionally, KVM only traps guest accesses to the debug registers if
* the guest is not actively using them (see the KVM_ARM64_DEBUG_DIRTY
@@ -112,6 +113,7 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
vcpu->arch.mdcr_el2 = __this_cpu_read(mdcr_el2) & MDCR_EL2_HPMN_MASK;
vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM |
MDCR_EL2_TPMS |
+ MDCR_EL2_TTRF |
MDCR_EL2_TPMCR |
MDCR_EL2_TDRA |
MDCR_EL2_TDOSA);
--
2.24.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-25 19:46 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 19:35 [PATCH v4 00/19] arm64: coresight: Add support for ETE and TRBE Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 01/19] perf: aux: Add flags for the buffer format Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 02/19] perf: aux: Add CoreSight PMU buffer formats Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-16 17:04 ` Mathieu Poirier
2021-03-16 17:04 ` Mathieu Poirier
2021-03-22 12:29 ` Suzuki K Poulose
2021-03-22 12:29 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 03/19] kvm: arm64: Hide system instruction access to Trace registers Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-22 22:21 ` Suzuki K Poulose
2021-03-22 22:21 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 04/19] kvm: arm64: nvhe: Save the SPE context early Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-01 16:32 ` Alexandru Elisei
2021-03-01 16:32 ` Alexandru Elisei
2021-03-02 10:01 ` Suzuki K Poulose
2021-03-02 10:01 ` Suzuki K Poulose
2021-03-02 10:13 ` Marc Zyngier
2021-03-02 10:13 ` Marc Zyngier
2021-03-02 11:00 ` Alexandru Elisei
2021-03-02 11:00 ` Alexandru Elisei
2021-02-25 19:35 ` Suzuki K Poulose [this message]
2021-02-25 19:35 ` [PATCH v4 05/19] kvm: arm64: Disable guest access to trace filter controls Suzuki K Poulose
2021-03-22 22:24 ` Suzuki K Poulose
2021-03-22 22:24 ` Suzuki K Poulose
2021-03-23 9:16 ` Marc Zyngier
2021-03-23 9:16 ` Marc Zyngier
2021-03-23 9:44 ` Suzuki K Poulose
2021-03-23 9:44 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 06/19] arm64: Add support for trace synchronization barrier Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 07/19] arm64: Add TRBE definitions Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-16 17:46 ` Mathieu Poirier
2021-03-16 17:46 ` Mathieu Poirier
2021-02-25 19:35 ` [PATCH v4 08/19] arm64: kvm: Enable access to TRBE support for host Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-16 17:49 ` Mathieu Poirier
2021-03-16 17:49 ` Mathieu Poirier
2021-02-25 19:35 ` [PATCH v4 09/19] coresight: etm4x: Move ETM to prohibited region for disable Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-08 17:25 ` Mike Leach
2021-03-08 17:25 ` Mike Leach
2021-03-16 19:30 ` Mathieu Poirier
2021-03-16 19:30 ` Mathieu Poirier
2021-03-17 10:44 ` Suzuki K Poulose
2021-03-17 10:44 ` Suzuki K Poulose
2021-03-17 17:09 ` Mathieu Poirier
2021-03-17 17:09 ` Mathieu Poirier
2021-03-22 21:28 ` Mathieu Poirier
2021-03-22 21:28 ` Mathieu Poirier
2021-02-25 19:35 ` [PATCH v4 10/19] coresight: etm-perf: Allow an event to use different sinks Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-08 17:25 ` Mike Leach
2021-03-08 17:25 ` Mike Leach
2021-03-16 20:23 ` Mathieu Poirier
2021-03-16 20:23 ` Mathieu Poirier
2021-03-17 10:47 ` Suzuki K Poulose
2021-03-17 10:47 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 11/19] coresight: Do not scan for graph if none is present Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 12/19] coresight: etm4x: Add support for PE OS lock Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 13/19] coresight: ete: Add support for ETE sysreg access Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-25 22:33 ` kernel test robot
2021-02-25 22:33 ` kernel test robot
2021-02-25 22:33 ` kernel test robot
2021-02-26 6:25 ` kernel test robot
2021-02-26 6:25 ` kernel test robot
2021-02-25 19:35 ` [PATCH v4 14/19] coresight: ete: Add support for ETE tracing Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 15/19] dts: bindings: Document device tree bindings for ETE Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-06 21:06 ` Rob Herring
2021-03-06 21:06 ` Rob Herring
2021-03-08 17:25 ` Mike Leach
2021-03-08 17:25 ` Mike Leach
2021-03-22 16:53 ` Suzuki K Poulose
2021-03-22 16:53 ` Suzuki K Poulose
2021-03-22 17:28 ` Rob Herring
2021-03-22 17:28 ` Rob Herring
2021-03-22 22:49 ` Suzuki K Poulose
2021-03-22 22:49 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 16/19] coresight: etm-perf: Handle stale output handles Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-25 19:35 ` [PATCH v4 17/19] coresight: core: Add support for dedicated percpu sinks Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-02-26 6:34 ` kernel test robot
2021-02-26 6:34 ` kernel test robot
2021-02-26 6:34 ` kernel test robot
2021-03-01 13:54 ` Suzuki K Poulose
2021-03-01 13:54 ` Suzuki K Poulose
2021-03-01 13:54 ` Suzuki K Poulose
2021-03-02 10:21 ` Anshuman Khandual
2021-03-02 10:21 ` Anshuman Khandual
2021-03-02 10:21 ` Anshuman Khandual
2021-03-01 14:08 ` [PATCH v4.1 " Suzuki K Poulose
2021-03-01 14:08 ` Suzuki K Poulose
2021-03-08 17:26 ` [PATCH v4 " Mike Leach
2021-03-08 17:26 ` Mike Leach
2021-03-22 16:57 ` Suzuki K Poulose
2021-03-22 16:57 ` Suzuki K Poulose
2021-03-17 19:31 ` Mathieu Poirier
2021-03-17 19:31 ` Mathieu Poirier
2021-02-25 19:35 ` [PATCH v4 18/19] coresight: sink: Add TRBE driver Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
2021-03-08 17:26 ` Mike Leach
2021-03-08 17:26 ` Mike Leach
2021-03-19 10:30 ` Suzuki K Poulose
2021-03-19 10:30 ` Suzuki K Poulose
2021-03-19 11:55 ` Mike Leach
2021-03-19 11:55 ` Mike Leach
2021-03-22 21:24 ` Mathieu Poirier
2021-03-22 21:24 ` Mathieu Poirier
2021-03-22 23:00 ` Suzuki K Poulose
2021-03-22 23:00 ` Suzuki K Poulose
2021-03-18 18:08 ` Mathieu Poirier
2021-03-18 18:08 ` Mathieu Poirier
2021-03-19 10:34 ` Suzuki K Poulose
2021-03-19 10:34 ` Suzuki K Poulose
2021-03-19 14:47 ` Mathieu Poirier
2021-03-19 14:47 ` Mathieu Poirier
2021-03-19 17:58 ` Mathieu Poirier
2021-03-19 17:58 ` Mathieu Poirier
2021-03-22 21:20 ` Mathieu Poirier
2021-03-22 21:20 ` Mathieu Poirier
2021-02-25 19:35 ` [PATCH v4 19/19] dts: bindings: Document device tree bindings for Arm TRBE Suzuki K Poulose
2021-02-25 19:35 ` Suzuki K Poulose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210225193543.2920532-6-suzuki.poulose@arm.com \
--to=suzuki.poulose@arm.com \
--cc=anshuman.khandual@arm.com \
--cc=catalin.marinas@arm.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=maz@kernel.org \
--cc=mike.leach@linaro.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.