torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

KVM: arm64: Simplify sysreg access on exception delivery

Browse Source 
Distinguishing between NV and VHE is slightly pointless, and only
serves as an extra complication, or a way to introduce bugs, such
as the way SPSR_EL1 gets written without checking for the state
being resident.

Get rid if this silly distinction, and fix the bug in one go.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20250817121926.217900-3-maz@kernel.org
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
This commit is contained in:
Marc Zyngier 2025-08-17 13:19:24 +01:00 committed by Oliver Upton
parent b720269334
commit e3f6836a63
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm64/kvm/hyp/exception.c
View File

@ -22,36 +22,28 @@
static inline u64 __vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, int reg) static inline u64 __vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, int reg)
{ {
u64 val; if (has_vhe())
if (unlikely(vcpu_has_nv(vcpu)))
return vcpu_read_sys_reg(vcpu, reg); return vcpu_read_sys_reg(vcpu, reg);
else if (vcpu_get_flag(vcpu, SYSREGS_ON_CPU) &&
__vcpu_read_sys_reg_from_cpu(reg, &val))
return val;
return __vcpu_sys_reg(vcpu, reg); return __vcpu_sys_reg(vcpu, reg);
} }
static inline void __vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg) static inline void __vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg)
{ {
if (unlikely(vcpu_has_nv(vcpu))) if (has_vhe())
vcpu_write_sys_reg(vcpu, val, reg); vcpu_write_sys_reg(vcpu, val, reg);
else if (!vcpu_get_flag(vcpu, SYSREGS_ON_CPU) || else
!__vcpu_write_sys_reg_to_cpu(val, reg))
__vcpu_assign_sys_reg(vcpu, reg, val); __vcpu_assign_sys_reg(vcpu, reg, val);
} }
static void __vcpu_write_spsr(struct kvm_vcpu *vcpu, unsigned long target_mode, static void __vcpu_write_spsr(struct kvm_vcpu *vcpu, unsigned long target_mode,
u64 val) u64 val)
{ {
if (unlikely(vcpu_has_nv(vcpu))) { if (has_vhe()) {
if (target_mode == PSR_MODE_EL1h) if (target_mode == PSR_MODE_EL1h)
vcpu_write_sys_reg(vcpu, val, SPSR_EL1); vcpu_write_sys_reg(vcpu, val, SPSR_EL1);
else else
vcpu_write_sys_reg(vcpu, val, SPSR_EL2); vcpu_write_sys_reg(vcpu, val, SPSR_EL2);
} else if (has_vhe()) {
write_sysreg_el1(val, SYS_SPSR);
} else { } else {
__vcpu_assign_sys_reg(vcpu, SPSR_EL1, val); __vcpu_assign_sys_reg(vcpu, SPSR_EL1, val);
} }