linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: kvmarm@lists.linux.dev, kvm@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Cc: Alexandru Elisei <alexandru.elisei@arm.com>,
	Andre Przywara <andre.przywara@arm.com>,
	Chase Conklin <chase.conklin@arm.com>,
	Christoffer Dall <christoffer.dall@arm.com>,
	Ganapatrao Kulkarni <gankulkarni@os.amperecomputing.com>,
	Darren Hart <darren@os.amperecomputing.com>,
	Jintack Lim <jintack@cs.columbia.edu>,
	Russell King <rmk+kernel@armlinux.org.uk>,
	Miguel Luis <miguel.luis@oracle.com>,
	James Morse <james.morse@arm.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Oliver Upton <oliver.upton@linux.dev>,
	Zenghui Yu <yuzenghui@huawei.com>
Subject: [PATCH v9 26/50] KVM: arm64: nv: Forward timer traps to nested EL2
Date: Wed,  5 Apr 2023 16:39:44 +0100	[thread overview]
Message-ID: <20230405154008.3552854-27-maz@kernel.org> (raw)
In-Reply-To: <20230405154008.3552854-1-maz@kernel.org>

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/kvm/sys_regs.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 96fee2a39859..9bd852d16f70 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -1459,6 +1459,35 @@ static bool access_arch_timer(struct kvm_vcpu *vcpu,
 		return false;
 	}
 
+	if (vcpu_has_nv(vcpu) && !is_hyp_ctxt(vcpu) && tmr == TIMER_PTIMER) {
+		u64 val = __vcpu_sys_reg(vcpu, CNTHCTL_EL2);
+		bool trap;
+
+		if (!vcpu_el2_e2h_is_set(vcpu))
+			val = (val & (CNTHCTL_EL1PCEN | CNTHCTL_EL1PCTEN)) << 10;
+
+		switch (treg) {
+		case TIMER_REG_CVAL:
+		case TIMER_REG_CTL:
+		case TIMER_REG_TVAL:
+			trap = !(val & (CNTHCTL_EL1PCEN << 10));
+			break;
+
+		case TIMER_REG_CNT:
+			trap = !(val & (CNTHCTL_EL1PCTEN << 10));
+			break;
+
+		default:
+			trap = false;
+			break;
+		}
+
+		if (trap) {
+			kvm_inject_nested_sync(vcpu, kvm_vcpu_get_esr(vcpu));
+			return false;
+		}
+	}
+
 	if (p->is_write)
 		kvm_arm_timer_write_sysreg(vcpu, tmr, treg, p->regval);
 	else
-- 
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2023-04-05 15:43 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-05 15:39 [PATCH v9 00/50] KVM: arm64: ARMv8.3/8.4 Nested Virtualization support Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 01/50] KVM: arm64: nv: Add non-VHE-EL2->EL1 translation helpers Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 02/50] KVM: arm64: nv: Handle virtual EL2 registers in vcpu_read/write_sys_reg() Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 03/50] KVM: arm64: nv: Handle SPSR_EL2 specially Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 04/50] KVM: arm64: nv: Handle HCR_EL2.E2H specially Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 05/50] KVM: arm64: nv: Save/Restore vEL2 sysregs Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 06/50] KVM: arm64: nv: Trap EL1 VM register accesses in virtual EL2 Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 07/50] KVM: arm64: nv: Trap CPACR_EL1 access " Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 08/50] KVM: arm64: nv: Respect virtual HCR_EL2.TWX setting Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 09/50] KVM: arm64: nv: Respect virtual CPTR_EL2.{TFP,FPEN} settings Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 10/50] KVM: arm64: nv: Respect the virtual HCR_EL2.NV bit setting Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 11/50] KVM: arm64: nv: Respect virtual HCR_EL2.TVM and TRVM settings Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 12/50] KVM: arm64: nv: Respect the virtual HCR_EL2.NV1 bit setting Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 13/50] KVM: arm64: nv: Forward debug traps to the nested guest Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 14/50] KVM: arm64: nv: Configure HCR_EL2 for nested virtualization Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 15/50] KVM: arm64: nv: Support multiple nested Stage-2 mmu structures Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 16/50] KVM: arm64: nv: Implement nested Stage-2 page table walk logic Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 17/50] KVM: arm64: nv: Handle shadow stage 2 page faults Marc Zyngier
2023-05-02  9:35   ` Ganapatrao Kulkarni
2023-04-05 15:39 ` [PATCH v9 18/50] KVM: arm64: nv: Restrict S2 RD/WR permissions to match the guest's Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 19/50] KVM: arm64: nv: Unmap/flush shadow stage 2 page tables Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 20/50] KVM: arm64: nv: Set a handler for the system instruction traps Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 21/50] KVM: arm64: nv: Trap and emulate AT instructions from virtual EL2 Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 22/50] KVM: arm64: nv: Trap and emulate TLBI " Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 23/50] KVM: arm64: nv: Fold guest's HCR_EL2 configuration into the host's Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 24/50] KVM: arm64: nv: Hide RAS from nested guests Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 25/50] KVM: arm64: nv: Add handling of EL2-specific timer registers Marc Zyngier
2023-04-05 15:39 ` Marc Zyngier [this message]
2023-04-05 15:39 ` [PATCH v9 27/50] KVM: arm64: nv: Load timer before the GIC Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 28/50] KVM: arm64: nv: Nested GICv3 Support Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 29/50] KVM: arm64: nv: Don't load the GICv4 context on entering a nested guest Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 30/50] KVM: arm64: nv: vgic: Emulate the HW bit in software Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 31/50] KVM: arm64: nv: vgic: Allow userland to set VGIC maintenance IRQ Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 32/50] KVM: arm64: nv: Implement maintenance interrupt forwarding Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 33/50] KVM: arm64: nv: Deal with broken VGIC on maintenance interrupt delivery Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 34/50] KVM: arm64: nv: Allow userspace to request KVM_ARM_VCPU_NESTED_VIRT Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 35/50] KVM: arm64: nv: Add handling of FEAT_TTL TLB invalidation Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 36/50] KVM: arm64: nv: Invalidate TLBs based on shadow S2 TTL-like information Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 37/50] KVM: arm64: nv: Tag shadow S2 entries with nested level Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 38/50] KVM: arm64: nv: Add include containing the VNCR_EL2 offsets Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 39/50] KVM: arm64: nv: Map VNCR-capable registers to a separate page Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 40/50] KVM: arm64: nv: Move nested vgic state into the sysreg file Marc Zyngier
2023-04-05 15:39 ` [PATCH v9 41/50] KVM: arm64: Add FEAT_NV2 cpu feature Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 42/50] KVM: arm64: nv: Sync nested timer state with FEAT_NV2 Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 43/50] KVM: arm64: nv: Fold GICv3 host trapping requirements into guest setup Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 44/50] KVM: arm64: nv: Publish emulated timer interrupt state in the in-memory state Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 45/50] KVM: arm64: nv: Allocate VNCR page when required Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 46/50] KVM: arm64: nv: Enable ARMv8.4-NV support Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 47/50] KVM: arm64: nv: Fast-track 'InHost' exception returns Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 48/50] KVM: arm64: nv: Fast-track EL1 TLBIs for VHE guests Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 49/50] KVM: arm64: nv: Use FEAT_ECV to trap access to EL0 timers Marc Zyngier
2023-04-05 15:40 ` [PATCH v9 50/50] KVM: arm64: nv: Accelerate EL0 timer read accesses when FEAT_ECV is on Marc Zyngier

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=20230405154008.3552854-27-maz@kernel.org \
    --to=maz@kernel.org \
    --cc=alexandru.elisei@arm.com \
    --cc=andre.przywara@arm.com \
    --cc=chase.conklin@arm.com \
    --cc=christoffer.dall@arm.com \
    --cc=darren@os.amperecomputing.com \
    --cc=gankulkarni@os.amperecomputing.com \
    --cc=james.morse@arm.com \
    --cc=jintack@cs.columbia.edu \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.linux.dev \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=miguel.luis@oracle.com \
    --cc=oliver.upton@linux.dev \
    --cc=rmk+kernel@armlinux.org.uk \
    --cc=suzuki.poulose@arm.com \
    --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;
as well as URLs for NNTP newsgroup(s).