From: Steven Price <steven.price@arm.com>
To: kvm@vger.kernel.org, kvmarm@lists.linux.dev
Cc: Steven Price <steven.price@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Marc Zyngier <maz@kernel.org>, Will Deacon <will@kernel.org>,
James Morse <james.morse@arm.com>,
Oliver Upton <oliver.upton@linux.dev>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Joey Gouly <joey.gouly@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Christoffer Dall <christoffer.dall@arm.com>,
Fuad Tabba <tabba@google.com>,
linux-coco@lists.linux.dev,
Ganapatrao Kulkarni <gankulkarni@os.amperecomputing.com>
Subject: [PATCH v3 16/43] KVM: arm64: Support timers in realm RECs
Date: Mon, 10 Jun 2024 14:41:35 +0100 [thread overview]
Message-ID: <20240610134202.54893-17-steven.price@arm.com> (raw)
In-Reply-To: <20240610134202.54893-1-steven.price@arm.com>
The RMM keeps track of the timer while the realm REC is running, but on
exit to the normal world KVM is responsible for handling the timers.
A later patch adds the support for propagating the timer values from the
exit data structure and calling kvm_realm_timers_update().
Signed-off-by: Steven Price <steven.price@arm.com>
---
arch/arm64/kvm/arch_timer.c | 45 ++++++++++++++++++++++++++++++++----
include/kvm/arm_arch_timer.h | 2 ++
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c
index 879982b1cc73..0b2be34a9ba3 100644
--- a/arch/arm64/kvm/arch_timer.c
+++ b/arch/arm64/kvm/arch_timer.c
@@ -162,6 +162,13 @@ static void timer_set_cval(struct arch_timer_context *ctxt, u64 cval)
static void timer_set_offset(struct arch_timer_context *ctxt, u64 offset)
{
+ struct kvm_vcpu *vcpu = ctxt->vcpu;
+
+ if (kvm_is_realm(vcpu->kvm)) {
+ WARN_ON(offset);
+ return;
+ }
+
if (!ctxt->offset.vm_offset) {
WARN(offset, "timer %ld\n", arch_timer_ctx_index(ctxt));
return;
@@ -460,6 +467,21 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level,
}
}
+void kvm_realm_timers_update(struct kvm_vcpu *vcpu)
+{
+ struct arch_timer_cpu *arch_timer = &vcpu->arch.timer_cpu;
+ int i;
+
+ for (i = 0; i < NR_KVM_EL0_TIMERS; i++) {
+ struct arch_timer_context *timer = &arch_timer->timers[i];
+ bool status = timer_get_ctl(timer) & ARCH_TIMER_CTRL_IT_STAT;
+ bool level = kvm_timer_irq_can_fire(timer) && status;
+
+ if (level != timer->irq.level)
+ kvm_timer_update_irq(vcpu, level, timer);
+ }
+}
+
/* Only called for a fully emulated timer */
static void timer_emulate(struct arch_timer_context *ctx)
{
@@ -831,6 +853,8 @@ void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu)
if (unlikely(!timer->enabled))
return;
+ kvm_timer_unblocking(vcpu);
+
get_timer_map(vcpu, &map);
if (static_branch_likely(&has_gic_active_state)) {
@@ -844,8 +868,6 @@ void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu)
kvm_timer_vcpu_load_nogic(vcpu);
}
- kvm_timer_unblocking(vcpu);
-
timer_restore_state(map.direct_vtimer);
if (map.direct_ptimer)
timer_restore_state(map.direct_ptimer);
@@ -988,7 +1010,9 @@ static void timer_context_init(struct kvm_vcpu *vcpu, int timerid)
ctxt->vcpu = vcpu;
- if (timerid == TIMER_VTIMER)
+ if (kvm_is_realm(vcpu->kvm))
+ ctxt->offset.vm_offset = NULL;
+ else if (timerid == TIMER_VTIMER)
ctxt->offset.vm_offset = &kvm->arch.timer_data.voffset;
else
ctxt->offset.vm_offset = &kvm->arch.timer_data.poffset;
@@ -1011,13 +1035,19 @@ static void timer_context_init(struct kvm_vcpu *vcpu, int timerid)
void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
{
struct arch_timer_cpu *timer = vcpu_timer(vcpu);
+ u64 cntvoff;
for (int i = 0; i < NR_KVM_TIMERS; i++)
timer_context_init(vcpu, i);
+ if (kvm_is_realm(vcpu->kvm))
+ cntvoff = 0;
+ else
+ cntvoff = kvm_phys_timer_read();
+
/* Synchronize offsets across timers of a VM if not already provided */
if (!test_bit(KVM_ARCH_FLAG_VM_COUNTER_OFFSET, &vcpu->kvm->arch.flags)) {
- timer_set_offset(vcpu_vtimer(vcpu), kvm_phys_timer_read());
+ timer_set_offset(vcpu_vtimer(vcpu), cntvoff);
timer_set_offset(vcpu_ptimer(vcpu), 0);
}
@@ -1525,6 +1555,13 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu)
return -EINVAL;
}
+ /*
+ * We don't use mapped IRQs for Realms because the RMI doesn't allow
+ * us setting the LR.HW bit in the VGIC.
+ */
+ if (vcpu_is_rec(vcpu))
+ return 0;
+
get_timer_map(vcpu, &map);
ret = kvm_vgic_map_phys_irq(vcpu,
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index c819c5d16613..d8ab297560d0 100644
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -112,6 +112,8 @@ int kvm_arm_timer_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);
int kvm_arm_timer_get_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);
int kvm_arm_timer_has_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);
+void kvm_realm_timers_update(struct kvm_vcpu *vcpu);
+
u64 kvm_phys_timer_read(void);
void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu);
--
2.34.1
next prev parent reply other threads:[~2024-06-10 13:43 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-10 13:41 [PATCH v3 00/43] arm64: Support for Arm CCA in KVM Steven Price
2024-06-10 13:41 ` [PATCH v3 01/43] KVM: Prepare for handling only shared mappings in mmu_notifier events Steven Price
2024-06-10 13:41 ` [PATCH v3 02/43] kvm: arm64: pgtable: Track the number of pages in the entry level Steven Price
2024-06-10 13:41 ` [PATCH v3 03/43] kvm: arm64: Include kvm_emulate.h in kvm/arm_psci.h Steven Price
2024-06-10 13:41 ` [PATCH v3 04/43] arm64: RME: Handle Granule Protection Faults (GPFs) Steven Price
2024-06-10 13:41 ` [PATCH v3 05/43] arm64: RME: Add SMC definitions for calling the RMM Steven Price
2024-06-10 13:41 ` [PATCH v3 06/43] arm64: RME: Add wrappers for RMI calls Steven Price
2024-06-10 13:41 ` [PATCH v3 07/43] arm64: RME: Check for RME support at KVM init Steven Price
2024-06-10 13:41 ` [PATCH v3 08/43] arm64: RME: Define the user ABI Steven Price
2024-06-10 13:41 ` [PATCH v3 09/43] arm64: RME: ioctls to create and configure realms Steven Price
2024-06-10 13:41 ` [PATCH v3 10/43] kvm: arm64: Expose debug HW register numbers for Realm Steven Price
2024-06-10 13:41 ` [PATCH v3 11/43] arm64: kvm: Allow passing machine type in KVM creation Steven Price
2024-06-10 13:41 ` [PATCH v3 12/43] arm64: RME: Keep a spare page delegated to the RMM Steven Price
2024-06-10 13:41 ` [PATCH v3 13/43] arm64: RME: RTT tear down Steven Price
2024-06-10 13:41 ` [PATCH v3 14/43] arm64: RME: Allocate/free RECs to match vCPUs Steven Price
2024-06-10 13:41 ` [PATCH v3 15/43] arm64: RME: Support for the VGIC in realms Steven Price
2024-06-10 13:41 ` Steven Price [this message]
2024-06-10 13:41 ` [PATCH v3 17/43] arm64: RME: Allow VMM to set RIPAS Steven Price
2024-06-10 13:41 ` [PATCH v3 18/43] arm64: RME: Handle realm enter/exit Steven Price
2024-06-10 13:41 ` [PATCH v3 19/43] KVM: arm64: Handle realm MMIO emulation Steven Price
2024-06-10 13:41 ` [PATCH v3 20/43] arm64: RME: Allow populating initial contents Steven Price
2024-06-10 13:41 ` [PATCH v3 21/43] arm64: RME: Runtime faulting of memory Steven Price
2024-06-10 13:41 ` [PATCH v3 22/43] KVM: arm64: Handle realm VCPU load Steven Price
2024-06-10 13:41 ` [PATCH v3 23/43] KVM: arm64: Validate register access for a Realm VM Steven Price
2024-06-10 13:41 ` [PATCH v3 24/43] KVM: arm64: Handle Realm PSCI requests Steven Price
2024-06-10 13:41 ` [PATCH v3 25/43] KVM: arm64: WARN on injected undef exceptions Steven Price
2024-06-10 13:41 ` [PATCH v3 26/43] arm64: Don't expose stolen time for realm guests Steven Price
2024-06-10 13:41 ` [PATCH v3 27/43] arm64: rme: allow userspace to inject aborts Steven Price
2024-06-10 13:41 ` [PATCH v3 28/43] arm64: rme: support RSI_HOST_CALL Steven Price
2024-06-10 13:41 ` [PATCH v3 29/43] arm64: rme: Allow checking SVE on VM instance Steven Price
2024-06-10 13:41 ` [PATCH v3 30/43] arm64: RME: Always use 4k pages for realms Steven Price
2024-06-10 13:41 ` [PATCH v3 31/43] arm64: rme: Prevent Device mappings for Realms Steven Price
2024-06-10 13:41 ` [PATCH v3 32/43] arm_pmu: Provide a mechanism for disabling the physical IRQ Steven Price
2024-06-10 13:41 ` [PATCH v3 33/43] arm64: rme: Enable PMU support with a realm guest Steven Price
2024-06-10 13:41 ` [PATCH v3 34/43] kvm: rme: Hide KVM_CAP_READONLY_MEM for realm guests Steven Price
2024-06-10 13:41 ` [PATCH v3 35/43] arm64: RME: Propagate number of breakpoints and watchpoints to userspace Steven Price
2024-06-10 13:41 ` [PATCH v3 36/43] arm64: RME: Set breakpoint parameters through SET_ONE_REG Steven Price
2024-06-10 13:41 ` [PATCH v3 37/43] arm64: RME: Initialize PMCR.N with number counter supported by RMM Steven Price
2024-06-10 13:41 ` [PATCH v3 38/43] arm64: RME: Propagate max SVE vector length from RMM Steven Price
2024-06-10 13:41 ` [PATCH v3 39/43] arm64: RME: Configure max SVE vector length for a Realm Steven Price
2024-06-10 13:41 ` [PATCH v3 40/43] arm64: RME: Provide register list for unfinalized RME RECs Steven Price
2024-06-10 13:42 ` [PATCH v3 41/43] arm64: RME: Provide accurate register list Steven Price
2024-06-10 13:42 ` [PATCH v3 42/43] arm64: kvm: Expose support for private memory Steven Price
2024-06-10 13:42 ` [PATCH v3 43/43] KVM: arm64: Allow activating realms Steven Price
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=20240610134202.54893-17-steven.price@arm.com \
--to=steven.price@arm.com \
--cc=alexandru.elisei@arm.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@arm.com \
--cc=gankulkarni@os.amperecomputing.com \
--cc=james.morse@arm.com \
--cc=joey.gouly@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=suzuki.poulose@arm.com \
--cc=tabba@google.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®