On 2020-10-08 19:16, Qais Yousef wrote:
On a system without uniform support for AArch32 at EL0, it is possible
for the guest to force run AArch32 at EL0 and potentially cause an
illegal exception if running on the wrong core.
Add an extra check to catch if the guest ever does that and prevent it
from running again, treating it as ARM_EXCEPTION_IL.
We try to catch this misbehavior as early as possible and not rely on
PSTATE.IL to occur.
nit: PSTATE.IL doesn't "occur". It is an "Illegal Exception Return" that
can happen.
Tested on Juno by instrumenting the host to:
* Fake asym aarch32.
* Comment out hiding of ID registers from the guest.
Any attempt to run 32bit app in the guest will produce such error on
qemu:
# ./test
error: kvm run failed Invalid argument
R00=ffff0fff R01=ffffffff R02=00000000 R03=00087968
R04=000874b8 R05=ffd70b24 R06=ffd70b2c R07=00000055
R08=00000000 R09=00000000 R10=00000000 R11=00000000
R12=0000001c R13=ffd6f974 R14=0001ff64 R15=ffff0fe0
PSR=a0000010 N-C- A usr32
Signed-off-by: Qais Yousef <qais.yousef@xxxxxxx>
---
arch/arm64/kvm/arm.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index b588c3b5c2f0..22ff3373d855 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -644,6 +644,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
struct kvm_run *run = vcpu->run;
int ret;
+ if (!system_supports_32bit_el0() && vcpu_mode_is_32bit(vcpu)) {
+ kvm_err("Illegal AArch32 mode at EL0, can't run.");
No, we don't scream on the console in an uncontrolled way based on
illegal user input (yes, the VM *is* userspace).
Furthermore, you seem to deal with the same problem *twice*. See below.
+ return -ENOEXEC;
+ }
+
if (unlikely(!kvm_vcpu_initialized(vcpu)))
return -ENOEXEC;
@@ -804,6 +809,17 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
preempt_enable();
+ /*
+ * For asym aarch32 systems we present a 64bit only system to
+ * the guest. But in case it managed somehow to escape that and
+ * enter 32bit mode, catch that and prevent it from running
+ * again.
The guest didn't *escape* anything. It merely used the CPU as designed.
The fact that the hypervisor cannot prevent the guest from using AArch32
is an architectural defect.
+ */
+ if (!system_supports_32bit_el0() && vcpu_mode_is_32bit(vcpu)) {
+ kvm_err("Detected illegal AArch32 mode at EL0, exiting.");
Same remark as above. Userspace has access to PSTATE and can work out
the issue by itself.
+ ret = ARM_EXCEPTION_IL;
This will cause the thread to return to userspace after having done a
vcpu_put(). So why don't you just mark the vcpu as uninitialized before
returning to userspace? It already is in an illegal state, and the only
reasonable thing userspace can do is to reset it.
This way, we keep the horror in a single place, and force userspace to
take action if it really wants to recover the guest.
M.
--
Jazz is not dead. It just smells funny...
