From: Dave Martin <Dave.Martin@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: "Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will.deacon@arm.com>,
"Ard Biesheuvel" <ard.biesheuvel@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Szabolcs Nagy" <szabolcs.nagy@arm.com>,
"Okamoto Takayuki" <tokamoto@jp.fujitsu.com>,
kvmarm@lists.cs.columbia.edu, libc-alpha@sourceware.org,
linux-arch@vger.kernel.org
Subject: [PATCH v4 24/28] arm64/sve: KVM: Hide SVE from CPU features exposed to guests
Date: Fri, 27 Oct 2017 11:51:06 +0100 [thread overview]
Message-ID: <1509101470-7881-25-git-send-email-Dave.Martin@arm.com> (raw)
In-Reply-To: <1509101470-7881-1-git-send-email-Dave.Martin@arm.com>
KVM guests cannot currently use SVE, because SVE is always
configured to trap to EL2.
However, a guest that sees SVE reported as present in
ID_AA64PFR0_EL1 may legitimately expect that SVE works and try to
use it. Instead of working, the guest will receive an injected
undef exception, which may cause the guest to oops or go into a
spin.
To avoid misleading the guest into believing that SVE will work,
this patch masks out the SVE field from ID_AA64PFR0_EL1 when a
guest attempts to read this register. No support is explicitly
added for ID_AA64ZFR0_EL1 either, so that is still emulated as
reading as zero, which is consistent with SVE not being
implemented.
This is a temporary measure, and will be removed in a later series
when full KVM support for SVE is implemented.
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm64/kvm/sys_regs.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index b1f7552..a0ee9b0 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -23,6 +23,7 @@
#include <linux/bsearch.h>
#include <linux/kvm_host.h>
#include <linux/mm.h>
+#include <linux/printk.h>
#include <linux/uaccess.h>
#include <asm/cacheflush.h>
@@ -897,8 +898,17 @@ static u64 read_id_reg(struct sys_reg_desc const *r, bool raz)
{
u32 id = sys_reg((u32)r->Op0, (u32)r->Op1,
(u32)r->CRn, (u32)r->CRm, (u32)r->Op2);
+ u64 val = raz ? 0 : read_sanitised_ftr_reg(id);
- return raz ? 0 : read_sanitised_ftr_reg(id);
+ if (id == SYS_ID_AA64PFR0_EL1) {
+ if (val & (0xfUL << ID_AA64PFR0_SVE_SHIFT))
+ pr_err_once("kvm [%i]: SVE unsupported for guests, suppressing\n",
+ task_pid_nr(current));
+
+ val &= ~(0xfUL << ID_AA64PFR0_SVE_SHIFT);
+ }
+
+ return val;
}
/* cpufeature ID register access trap handlers */
--
2.1.4
next prev parent reply other threads:[~2017-10-27 10:52 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-27 10:50 [PATCH v4 00/28] ARM Scalable Vector Extension (SVE) Dave Martin
2017-10-27 10:50 ` [PATCH v4 01/28] regset: Add support for dynamically sized regsets Dave Martin
2017-10-27 10:50 ` Dave Martin
2017-10-27 10:50 ` [PATCH v4 02/28] arm64: KVM: Hide unsupported AArch64 CPU features from guests Dave Martin
2017-10-27 10:50 ` Dave Martin
2017-10-31 10:57 ` Alex Bennée
2017-10-31 10:57 ` Alex Bennée
2017-10-27 10:50 ` [PATCH v4 03/28] arm64: efi: Add missing Kconfig dependency on KERNEL_MODE_NEON Dave Martin
2017-10-27 10:50 ` [PATCH v4 04/28] arm64: Port deprecated instruction emulation to new sysctl interface Dave Martin
2017-10-27 10:50 ` Dave Martin
2017-10-27 10:50 ` [PATCH v4 05/28] arm64: fpsimd: Simplify uses of {set, clear}_ti_thread_flag() Dave Martin
2017-10-27 10:50 ` [PATCH v4 05/28] arm64: fpsimd: Simplify uses of {set,clear}_ti_thread_flag() Dave Martin
2017-10-27 10:50 ` [PATCH v4 06/28] arm64/sve: System register and exception syndrome definitions Dave Martin
2017-10-27 10:50 ` [PATCH v4 07/28] arm64/sve: Low-level SVE architectural state manipulation functions Dave Martin
2017-10-27 10:50 ` [PATCH v4 08/28] arm64/sve: Kconfig update and conditional compilation support Dave Martin
2017-10-27 10:50 ` [PATCH v4 09/28] arm64/sve: Signal frame and context structure definition Dave Martin
2017-10-27 10:50 ` Dave Martin
2017-10-27 10:50 ` [PATCH v4 10/28] arm64/sve: Low-level CPU setup Dave Martin
2017-10-27 10:50 ` [PATCH v4 11/28] arm64/sve: Core task context handling Dave Martin
2017-10-27 10:50 ` Dave Martin
2017-10-27 12:45 ` Catalin Marinas
2017-10-27 12:45 ` Catalin Marinas
2017-10-27 10:50 ` [PATCH v4 12/28] arm64/sve: Support vector length resetting for new processes Dave Martin
2017-10-27 10:50 ` [PATCH v4 13/28] arm64/sve: Signal handling support Dave Martin
2017-10-27 10:50 ` Dave Martin
2017-10-27 12:54 ` Catalin Marinas
2017-10-27 10:50 ` [PATCH v4 14/28] arm64/sve: Backend logic for setting the vector length Dave Martin
2017-10-27 10:50 ` [PATCH v4 15/28] arm64: cpufeature: Move sys_caps_initialised declarations Dave Martin
2017-10-27 10:50 ` [PATCH v4 16/28] arm64/sve: Probe SVE capabilities and usable vector lengths Dave Martin
2017-10-27 10:50 ` Dave Martin
2017-10-27 12:56 ` Catalin Marinas
2017-10-27 12:56 ` Catalin Marinas
2017-10-27 10:50 ` [PATCH v4 17/28] arm64/sve: Preserve SVE registers around kernel-mode NEON use Dave Martin
2017-10-27 10:50 ` Dave Martin
2017-10-27 10:51 ` [PATCH v4 18/28] arm64/sve: Preserve SVE registers around EFI runtime service calls Dave Martin
2017-10-27 10:51 ` Dave Martin
2017-10-27 10:51 ` [PATCH v4 19/28] arm64/sve: ptrace and ELF coredump support Dave Martin
2017-10-27 13:04 ` Catalin Marinas
2017-10-27 13:04 ` Catalin Marinas
2017-10-27 10:51 ` [PATCH v4 20/28] arm64/sve: Add prctl controls for userspace vector length management Dave Martin
2017-10-27 10:51 ` Dave Martin
2017-10-27 17:52 ` Alex Bennée
2017-10-27 17:52 ` Alex Bennée
2017-10-28 16:05 ` Dave Martin
2017-10-30 16:12 ` Alex Bennée
2017-10-30 16:12 ` Alex Bennée
2017-10-30 16:17 ` Dave Martin
2017-10-30 16:17 ` Dave Martin
2017-10-27 10:51 ` [PATCH v4 21/28] arm64/sve: Add sysctl to set the default vector length for new processes Dave Martin
2017-10-27 10:51 ` [PATCH v4 22/28] arm64/sve: KVM: Prevent guests from using SVE Dave Martin
2017-10-27 10:51 ` [PATCH v4 23/28] arm64/sve: KVM: Treat guest SVE use as undefined instruction execution Dave Martin
2017-10-27 10:51 ` Dave Martin
2017-10-27 10:51 ` Dave Martin [this message]
2017-10-27 10:51 ` [PATCH v4 25/28] arm64/sve: Detect SVE and activate runtime support Dave Martin
2017-10-27 13:05 ` Catalin Marinas
2017-10-27 10:51 ` [PATCH v4 26/28] arm64/sve: Add documentation Dave Martin
2017-10-27 13:06 ` Catalin Marinas
2017-10-27 10:51 ` [RFC PATCH v4 27/28] arm64: signal: Report signal frame size to userspace via auxv Dave Martin
2017-10-27 10:51 ` Dave Martin
2017-10-27 10:51 ` [RFC PATCH v4 28/28] arm64/sve: signal: Include SVE when computing AT_MINSIGSTKSZ Dave Martin
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=1509101470-7881-25-git-send-email-Dave.Martin@arm.com \
--to=dave.martin@arm.com \
--cc=alex.bennee@linaro.org \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=libc-alpha@sourceware.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=szabolcs.nagy@arm.com \
--cc=tokamoto@jp.fujitsu.com \
--cc=will.deacon@arm.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).