| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250714225917.1396543-19-coltonlewis@google.com>
Date: Mon, 14 Jul 2025 22:59:12 +0000
From: Colton Lewis <coltonlewis@...gle.com>
To: kvm@...r.kernel.org
Cc: Paolo Bonzini <pbonzini@...hat.com>, Jonathan Corbet <corbet@....net>,
Russell King <linux@...linux.org.uk>, Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will@...nel.org>, Marc Zyngier <maz@...nel.org>, Oliver Upton <oliver.upton@...ux.dev>,
Mingwei Zhang <mizhang@...gle.com>, Joey Gouly <joey.gouly@....com>,
Suzuki K Poulose <suzuki.poulose@....com>, Zenghui Yu <yuzenghui@...wei.com>,
Mark Rutland <mark.rutland@....com>, Shuah Khan <shuah@...nel.org>, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
kvmarm@...ts.linux.dev, linux-perf-users@...r.kernel.org,
linux-kselftest@...r.kernel.org, Colton Lewis <coltonlewis@...gle.com>
Subject: [PATCH v4 18/23] KVM: arm64: Extract enum debug_owner to enum vcpu_register_owner
The concept of a register or set of registers being owned by the host,
guest, or neither and choosing how to handle traps based on that state
applies equally well to PMU registers as other debug registers.
Extract the enum debug_owner previously defined inside struct
kvm_vcpu_arch to it's own type and add a the field to struct kvm_pmu
as well.
Signed-off-by: Colton Lewis <coltonlewis@...gle.com>
---
arch/arm64/include/asm/kvm_host.h | 12 ++++--------
arch/arm64/include/asm/kvm_pmu.h | 1 +
arch/arm64/include/asm/kvm_types.h | 7 ++++++-
arch/arm64/kvm/debug.c | 8 ++++----
arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 6 +++---
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 463dbf7f0821..21e32d7fa19b 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -846,11 +846,7 @@ struct kvm_vcpu_arch {
struct kvm_guest_debug_arch external_debug_state;
u64 external_mdscr_el1;
- enum {
- VCPU_DEBUG_FREE,
- VCPU_DEBUG_HOST_OWNED,
- VCPU_DEBUG_GUEST_OWNED,
- } debug_owner;
+ enum vcpu_register_owner debug_owner;
/* VGIC state */
struct vgic_cpu vgic_cpu;
@@ -1467,11 +1463,11 @@ void kvm_debug_handle_oslar(struct kvm_vcpu *vcpu, u64 val);
(!!(__vcpu_sys_reg(vcpu, OSLSR_EL1) & OSLSR_EL1_OSLK))
#define kvm_debug_regs_in_use(vcpu) \
- ((vcpu)->arch.debug_owner != VCPU_DEBUG_FREE)
+ ((vcpu)->arch.debug_owner != VCPU_REGISTER_FREE)
#define kvm_host_owns_debug_regs(vcpu) \
- ((vcpu)->arch.debug_owner == VCPU_DEBUG_HOST_OWNED)
+ ((vcpu)->arch.debug_owner == VCPU_REGISTER_HOST_OWNED)
#define kvm_guest_owns_debug_regs(vcpu) \
- ((vcpu)->arch.debug_owner == VCPU_DEBUG_GUEST_OWNED)
+ ((vcpu)->arch.debug_owner == VCPU_REGISTER_GUEST_OWNED)
int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,
struct kvm_device_attr *attr);
diff --git a/arch/arm64/include/asm/kvm_pmu.h b/arch/arm64/include/asm/kvm_pmu.h
index 4f0741bf6779..58c1219adf54 100644
--- a/arch/arm64/include/asm/kvm_pmu.h
+++ b/arch/arm64/include/asm/kvm_pmu.h
@@ -38,6 +38,7 @@ struct kvm_pmu {
int irq_num;
bool created;
bool irq_level;
+ enum vcpu_register_owner owner;
};
struct arm_pmu_entry {
diff --git a/arch/arm64/include/asm/kvm_types.h b/arch/arm64/include/asm/kvm_types.h
index 9a126b9e2d7c..1d951fb1ad78 100644
--- a/arch/arm64/include/asm/kvm_types.h
+++ b/arch/arm64/include/asm/kvm_types.h
@@ -4,5 +4,10 @@
#define KVM_ARCH_NR_OBJS_PER_MEMORY_CACHE 40
-#endif /* _ASM_ARM64_KVM_TYPES_H */
+enum vcpu_register_owner {
+ VCPU_REGISTER_FREE,
+ VCPU_REGISTER_HOST_OWNED,
+ VCPU_REGISTER_GUEST_OWNED,
+};
+#endif /* _ASM_ARM64_KVM_TYPES_H */
diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c
index 8ae9d141cad4..fa8b4f846b68 100644
--- a/arch/arm64/kvm/debug.c
+++ b/arch/arm64/kvm/debug.c
@@ -161,7 +161,7 @@ void kvm_vcpu_load_debug(struct kvm_vcpu *vcpu)
* context needs to be loaded on the CPU.
*/
if (vcpu->guest_debug || kvm_vcpu_os_lock_enabled(vcpu)) {
- vcpu->arch.debug_owner = VCPU_DEBUG_HOST_OWNED;
+ vcpu->arch.debug_owner = VCPU_REGISTER_HOST_OWNED;
setup_external_mdscr(vcpu);
/*
@@ -183,9 +183,9 @@ void kvm_vcpu_load_debug(struct kvm_vcpu *vcpu)
mdscr = vcpu_read_sys_reg(vcpu, MDSCR_EL1);
if (mdscr & (MDSCR_EL1_KDE | MDSCR_EL1_MDE))
- vcpu->arch.debug_owner = VCPU_DEBUG_GUEST_OWNED;
+ vcpu->arch.debug_owner = VCPU_REGISTER_GUEST_OWNED;
else
- vcpu->arch.debug_owner = VCPU_DEBUG_FREE;
+ vcpu->arch.debug_owner = VCPU_REGISTER_FREE;
}
kvm_arm_setup_mdcr_el2(vcpu);
@@ -222,7 +222,7 @@ void kvm_debug_set_guest_ownership(struct kvm_vcpu *vcpu)
if (kvm_host_owns_debug_regs(vcpu))
return;
- vcpu->arch.debug_owner = VCPU_DEBUG_GUEST_OWNED;
+ vcpu->arch.debug_owner = VCPU_REGISTER_GUEST_OWNED;
kvm_arm_setup_mdcr_el2(vcpu);
}
diff --git a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h
index 502a5b73ee70..048234439a41 100644
--- a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h
+++ b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h
@@ -91,12 +91,12 @@
static struct kvm_guest_debug_arch *__vcpu_debug_regs(struct kvm_vcpu *vcpu)
{
switch (vcpu->arch.debug_owner) {
- case VCPU_DEBUG_FREE:
+ case VCPU_REGISTER_FREE:
WARN_ON_ONCE(1);
fallthrough;
- case VCPU_DEBUG_GUEST_OWNED:
+ case VCPU_REGISTER_GUEST_OWNED:
return &vcpu->arch.vcpu_debug_state;
- case VCPU_DEBUG_HOST_OWNED:
+ case VCPU_REGISTER_HOST_OWNED:
return &vcpu->arch.external_debug_state;
}
--
2.50.0.727.gbf7dc18ff4-goog
Powered by blists - more mailing lists