From: Will Deacon <will@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-arch@vger.kernel.org, Will Deacon <will@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Marc Zyngier <maz@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Peter Zijlstra <peterz@infradead.org>,
Morten Rasmussen <morten.rasmussen@arm.com>,
Qais Yousef <qais.yousef@arm.com>,
Suren Baghdasaryan <surenb@google.com>,
kernel-team@android.com
Subject: [PATCH 3/6] KVM: arm64: Kill 32-bit vCPUs on systems with mismatched EL0 support
Date: Tue, 27 Oct 2020 21:51:15 +0000 [thread overview]
Message-ID: <20201027215118.27003-4-will@kernel.org> (raw)
In-Reply-To: <20201027215118.27003-1-will@kernel.org>
If a vCPU tries to run 32-bit code on a system with mismatched support
at EL0, then we should kill it.
Signed-off-by: Will Deacon <will@kernel.org>
---
arch/arm64/kvm/arm.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index a3b32df1afb0..7150dd996e1d 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -633,6 +633,14 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu)
}
}
+static bool vcpu_mode_is_bad_32bit(struct kvm_vcpu *vcpu)
+{
+ if (likely(!vcpu_mode_is_32bit(vcpu)))
+ return false;
+
+ return !system_supports_32bit_el0() || system_has_mismatched_32bit_el0();
+}
+
/**
* kvm_arch_vcpu_ioctl_run - the main VCPU run function to execute guest code
* @vcpu: The VCPU pointer
@@ -816,7 +824,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
* with the asymmetric AArch32 case), return to userspace with
* a fatal error.
*/
- if (!system_supports_32bit_el0() && vcpu_mode_is_32bit(vcpu)) {
+ if (vcpu_mode_is_bad_32bit(vcpu)) {
/*
* As we have caught the guest red-handed, decide that
* it isn't fit for purpose anymore by making the vcpu
--
2.29.0.rc2.309.g374f81d7ae-goog
next prev parent reply other threads:[~2020-10-27 21:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 21:51 [PATCH 0/6] An alternative series for asymmetric AArch32 systems Will Deacon
2020-10-27 21:51 ` [PATCH 1/6] KVM: arm64: Handle Asymmetric " Will Deacon
2020-10-27 21:51 ` [PATCH 2/6] arm64: Allow mismatched 32-bit EL0 support Will Deacon
2020-10-28 11:12 ` Catalin Marinas
2020-10-28 11:17 ` Will Deacon
2020-10-28 11:22 ` Catalin Marinas
2020-10-28 11:23 ` Will Deacon
2020-10-28 11:49 ` Catalin Marinas
2020-10-28 12:40 ` Will Deacon
2020-10-28 18:56 ` Catalin Marinas
2020-10-29 22:20 ` Will Deacon
2020-10-30 11:18 ` Catalin Marinas
2020-10-30 16:13 ` Will Deacon
2020-11-02 11:44 ` Catalin Marinas
2020-11-05 21:38 ` Will Deacon
2020-11-06 12:54 ` Qais Yousef
2020-11-06 13:00 ` Will Deacon
2020-11-06 14:48 ` Qais Yousef
2020-11-09 13:52 ` Will Deacon
2020-11-11 16:27 ` Qais Yousef
2020-11-12 10:24 ` Will Deacon
2020-11-12 11:55 ` Qais Yousef
2020-11-12 16:49 ` Qais Yousef
2020-11-12 17:06 ` Marc Zyngier
2020-11-12 17:36 ` Qais Yousef
2020-11-12 17:44 ` Will Deacon
2020-11-12 17:36 ` Will Deacon
2020-11-13 10:45 ` Qais Yousef
2020-11-06 14:30 ` Catalin Marinas
2020-10-28 11:18 ` Catalin Marinas
2020-10-28 11:21 ` Will Deacon
2020-10-27 21:51 ` Will Deacon [this message]
2020-10-27 21:51 ` [PATCH 4/6] arm64: Kill 32-bit applications scheduled on 64-bit-only CPUs Will Deacon
2020-10-28 12:10 ` Catalin Marinas
2020-10-28 12:36 ` Will Deacon
2020-10-27 21:51 ` [PATCH 5/6] arm64: Advertise CPUs capable of running 32-bit applcations in sysfs Will Deacon
2020-10-28 8:37 ` Greg Kroah-Hartman
2020-10-28 9:51 ` Will Deacon
2020-10-28 12:15 ` Catalin Marinas
2020-10-28 12:27 ` Will Deacon
2020-10-28 15:14 ` Catalin Marinas
2020-10-28 15:35 ` Will Deacon
2020-10-27 21:51 ` [PATCH 6/6] arm64: Hook up cmdline parameter to allow mismatched 32-bit EL0 Will Deacon
2020-10-29 18:42 ` [PATCH 0/6] An alternative series for asymmetric AArch32 systems Suren Baghdasaryan
2020-10-29 22:17 ` Will Deacon
2020-10-30 16:16 ` Marc Zyngier
2020-10-30 16:24 ` Will Deacon
2020-10-30 17:04 ` 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=20201027215118.27003-4-will@kernel.org \
--to=will@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-team@android.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=morten.rasmussen@arm.com \
--cc=peterz@infradead.org \
--cc=qais.yousef@arm.com \
--cc=surenb@google.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).