KVM: arm64: Additional 32bit fixes
Subsystems (4)
Marc Zyngier
maintainercover KVM: arm64: Additional 32bit fixes
Here's a couple of patches that address the issues that James mentionned in [1], affecting 32bit guests.
I lack a BE-capable host to properly test the first patch, but it is obviously correct (ha! ;-).
[1] https://lore.kernel.org/r/[email protected]
Marc Zyngier (2):
KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts
KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception
arch/arm64/include/asm/kvm_host.h | 10 ++++++++-- arch/arm64/kvm/aarch32.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-)
Signature · 1 line
2.26.2
Marc Zyngier
maintainerPATCH 1/2 KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts
AArch32 CP1x registers are overlayed on their AArch64 counterparts in the vcpu struct. This leads to an interesting problem as they are stored in their CPU-local format, and thus a CP1x register doesn't "hit" the lower 32bit portion of the AArch64 register on a BE host.
To workaround this unfortunate situation, introduce a bias trick in the vcpu_cp1x() accessors which picks the correct half of the 64bit register.
--- arch/arm64/include/asm/kvm_host.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/arm64/include/asm/kvm_host.h +8 -2
@@ -404,8 +404,14 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg);* CP14 and CP15 live in the same array, as they are backed by the * same system registers. */ -#define vcpu_cp14 (v,r) ((v)->arch.ctxt.copro[(r)]) -#define vcpu_cp15 (v,r) ((v)->arch.ctxt.copro[(r)]) +#ifdef CPU_BIG_ENDIAN +#define CPx_OFFSET 1 +#else +#define CPx_OFFSET 0 +#endif + +#define vcpu_cp14 (v,r) ((v)->arch.ctxt.copro[(r) ^ CPx_OFFSET]) +#define vcpu_cp15 (v,r) ((v)->arch.ctxt.copro[(r) ^ CPx_OFFSET])struct kvm_vm_stat {ulong remote_tlb_flush;
Signature · 1 line
2.26.2
Re: [PATCH 1/2] KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts
Quoted 22 lines · Marc Zyngier
AArch32 CP1x registers are overlayed on their AArch64 counterparts in the vcpu struct. This leads to an interesting problem as they are stored in their CPU-local format, and thus a CP1x register doesn't "hit" the lower 32bit portion of the AArch64 register on a BE host.
To workaround this unfortunate situation, introduce a bias trick in the
vcpu_cp1x()accessors which picks the correct half of the 64bit register.Reported-by James Morse <[email protected]>Signed-off-by Marc Zyngier <[email protected]>--- arch/arm64/include/asm/kvm_host.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)arch/arm64/include/asm/kvm_host.h +0
-0
arch/arm64/include/asm/kvm_host.h void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg); · line 407
Quoted 6 lines
arch/arm64/include/asm/kvm_host.h +1
-2@@ -404,8 +404,14 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg);* CP14 and CP15 live in the same array, as they are backed by the * same system registers. */ -#define vcpu_cp14 (v,r) ((v)->arch.ctxt.copro[(r)]) -#define vcpu_cp15 (v,r) ((v)->arch.ctxt.copro[(r)]) +#ifdef CPU_BIG_ENDIAN
Ahem... I think you're missing a "CONFIG_" there ;)
Bonus trickery - for a 0 or 1 value you can simply use IS_ENABLED().
Robin.
Quoted 11 lines
arch/arm64/include/asm/kvm_host.h +7
-0+#define CPx_OFFSET 1 +#else +#define CPx_OFFSET 0 +#endif + +#define vcpu_cp14 (v,r) ((v)->arch.ctxt.copro[(r) ^ CPx_OFFSET]) +#define vcpu_cp15 (v,r) ((v)->arch.ctxt.copro[(r) ^ CPx_OFFSET])struct kvm_vm_stat {ulong remote_tlb_flush;
Marc Zyngier
maintainerRe: [PATCH 1/2] KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts
Hi Robin,
Quoted 18 lines · Robin Murphy
Quoted 17 lines · Marc Zyngier
AArch32 CP1x registers are overlayed on their AArch64 counterparts in the vcpu struct. This leads to an interesting problem as they are stored in their CPU-local format, and thus a CP1x register doesn't "hit" the lower 32bit portion of the AArch64 register on a BE host.
To workaround this unfortunate situation, introduce a bias trick in the
vcpu_cp1x()accessors which picks the correct half of the 64bit register.Reported-by James Morse <[email protected]>Signed-off-by Marc Zyngier <[email protected]>--- arch/arm64/include/asm/kvm_host.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Quoted 14 lines
arch/arm64/include/asm/kvm_host.h void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, · line 408
Quoted 12 lines
arch/arm64/include/asm/kvm_host.h +1
-2@@ -404,8 +404,14 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu,u64 val, int reg); * CP14 and CP15 live in the same array, as they are backed by the * same system registers. */ -#define vcpu_cp14 (v,r) ((v)->arch.ctxt.copro[(r)]) -#define vcpu_cp15 (v,r) ((v)->arch.ctxt.copro[(r)]) +#ifdef CPU_BIG_ENDIAN Ahem... I think you're missing a "
CONFIG_" there ;)
Duh! As I said, I didn't test the thing at all! ;-)
Quoted 1 line
Bonus trickery - for a 0 or 1 value you can simply use
IS_ENABLED().
Beautiful! Definitely a must! :D
Thanks,
M.
Signature · 5 lines
Jazz is not dead. It just smells funny... _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH 1/2] KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts
Hi Marc, Robin,
Quoted 26 lines · Marc Zyngier
Quoted 11 lines · Robin Murphy
Quoted 9 lines · Marc Zyngier
AArch32 CP1x registers are overlayed on their AArch64 counterparts in the vcpu struct. This leads to an interesting problem as they are stored in their CPU-local format, and thus a CP1x register doesn't "hit" the lower 32bit portion of the AArch64 register on a BE host.
To workaround this unfortunate situation, introduce a bias trick in the
vcpu_cp1x()accessors which picks the correct half of the 64bit register.Quoted 13 lines
arch/arm64/include/asm/kvm_host.h void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg); · line 407
Quoted 11 lines
arch/arm64/include/asm/kvm_host.h +1
-2@@ -404,8 +404,14 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg);* CP14 and CP15 live in the same array, as they are backed by the * same system registers. */ -#define vcpu_cp14 (v,r) ((v)->arch.ctxt.copro[(r)]) -#define vcpu_cp15 (v,r) ((v)->arch.ctxt.copro[(r)]) +#ifdef CPU_BIG_ENDIAN Ahem... I think you're missing a "
CONFIG_" there ;)
Quoted 5 lines
Duh! As I said, I didn't test the thing at all! ;-)
Quoted 1 line
Bonus trickery - for a 0 or 1 value you can simply use
IS_ENABLED().Beautiful! Definitely a must! :D
With Robin's suggestion of:
---------------%<---------------
arch/arm64/include/asm/kvm_host.h +1 -5
@@ -405,11 +405,7 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg);* CP14 and CP15 live in the same array, as they are backed by the * same system registers. */ -#ifdef CPU_BIG_ENDIAN -#define CPx_OFFSET 1 -#else -#define CPx_OFFSET 0 -#endif +#define CPx_OFFSET IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)#define vcpu_cp14 (v,r) ((v)->arch.ctxt.copro[(r) ^ CPx_OFFSET])#define vcpu_cp15 (v,r) ((v)->arch.ctxt.copro[(r) ^ CPx_OFFSET])
---------------%<---------------
Thanks,
James
-----
Before this patch, an aarch32 guest of a BE host reading sysregs KVM is trap-and-undeffing gets:
| Bad mode in prefetch abort handler detected | Internal error: Oops - bad mode: 0 [#1] SMP THUMB2 | Modules linked in: | CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.7.0+ #260 | Hardware name: Generic DT based system | PC is at 0x4 | LR is at smp_cpus_done+0x85/0x98 | pc : [<00000004>] lr : [<808035cb>] psr: 6000009b | sp : 9f4a1f08 ip : 00000003 fp : 00000000 | r10: 00000000 r9 : 00000000 r8 : 00000000 | r7 : 80904ea8 r6 : 80904f6c r5 : 00000002 r4 : 000f4240 | r3 : bc605c12 r2 : bc605c12 r1 : 1f38c000 r0 : 0000c348 | Flags: nZCv IRQs off FIQs on Mode UND_32 ISA ARM Segment none | Control: 50c5383d Table: 8000406a DAC: bc605c12 | Process swapper/0 (pid: 1, stack limit = 0x(ptrval)) [...] | [<808035cb>] (smp_cpus_done) from [<00000002>] (0x2) | Code: bad PC value | ---[ end trace b37275bf489ca225 ]---
instead of the undef it so richly deserved:
| Internal error: Oops - undefined instruction: 0 [#1] SMP THUMB2 | Modules linked in: | CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.7.0+ #260 | Hardware name: Generic DT based system | PC is at smp_cpus_done+0x88/0x98 | LR is at smp_cpus_done+0x85/0x98 | pc : [<808035ce>] lr : [<808035cb>] psr: 60000073 | sp : 9f495f50 ip : 00000001 fp : 00000000 | r10: 00000000 r9 : 00000000 r8 : 00000000 | r7 : 80904ea8 r6 : 80904f6c r5 : 00000001 r4 : 0007a120 | r3 : 7f3828d2 r2 : 7f3828d2 r1 : 1f39f000 r0 : 0000c348 | Flags: nZCv IRQs on FIQs off Mode SVC_32 ISA Thumb Segment none | Control: 50c5383d Table: 8000406a DAC: 00000051 | Process swapper/0 (pid: 1, stack limit = 0x(ptrval)) [...] | [<808035ce>] (smp_cpus_done) from [<80800f73>] (kernel_init_freeable+0xdf/0x204) | [<80800f73>] (kernel_init_freeable) from [<805aa2a7>] (kernel_init+0x7/0xc8) | [<805aa2a7>] (kernel_init) from [<80100159>] (ret_from_fork+0x11/0x38) | Code: f7ff f8b9 f24c 3048 (ee11) 1f30 | ---[ end trace 4c78dcd8460e6041 ]---
Marc Zyngier
maintainerPATCH 2/2 KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception
In reply to Marc ZyngierOn a VHE system, the EL1 state is left in the CPU most of the time, and only syncronized back to memory when vcpu_put() is called (most of the time on preemption).
Which means that when injecting an exception, we'd better have a way to either:
(1) write directly to the EL1 sysregs
(2) synchronize the state back to memory, and do the changes there
For an AArch64, we already do (1), so we are safe. Unfortunately, doing the same thing for AArch32 would be pretty invasive. Instead, we can easily implement (2) by calling the put/load architectural backends, and keep preemption disabled. We can then reload the state back into EL1.
--- arch/arm64/kvm/aarch32.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/arm64/kvm/aarch32.c +28 -0
@@ -33,6 +33,26 @@ static const u8 return_offsets[8][2] = { [7] = { 4, 4 }, /* FIQ, unused */ }; +static bool pre_fault_synchronize (struct kvm_vcpu *vcpu) +{ +preempt_disable (); +if (vcpu->arch.sysregs_loaded_on_cpu) { +kvm_arch_vcpu_put (vcpu); +return true; + } + +preempt_enable (); +return false; +} + +static void post_fault_synchronize (struct kvm_vcpu *vcpu,bool loaded) +{ +if (loaded) { +kvm_arch_vcpu_load (vcpu,smp_processor_id ()); +preempt_enable (); + } +} +/* * When an exception is taken, most CPSR fields are left unchanged in the * handler. However, some are explicitly overridden (e.g. M[4:0]).
@@ -155,7 +175,10 @@ static void prepare_fault32(struct kvm_vcpu *vcpu, u32 mode, u32 vect_offset)void kvm_inject_undef32 (struct kvm_vcpu *vcpu) { +bool loaded =pre_fault_synchronize (vcpu); +prepare_fault32 (vcpu,PSR_AA32_MODE_UND ,4 ); +post_fault_synchronize (vcpu, loaded); }/*
@@ -168,6 +191,9 @@ static void inject_abt32(struct kvm_vcpu *vcpu, bool is_pabt,u32 vect_offset;u32 *far, *fsr;bool is_lpae; +bool loaded; + + loaded =pre_fault_synchronize (vcpu);if (is_pabt) { vect_offset =12 ;
@@ -191,6 +217,8 @@ static void inject_abt32(struct kvm_vcpu *vcpu, bool is_pabt,/* no need to shuffle FS[4] into DFSR[10] as its 0 */ *fsr = DFSR_FSC_EXTABT_nLPAE; } + +post_fault_synchronize (vcpu, loaded); }void kvm_inject_dabt32 (struct kvm_vcpu *vcpu,unsigned long addr)
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm