From: Dave Martin <Dave.Martin@arm.com>
To: kvmarm@lists.cs.columbia.edu
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Okamoto Takayuki" <tokamoto@jp.fujitsu.com>,
"Christoffer Dall" <cdall@kernel.org>,
"Ard Biesheuvel" <ard.biesheuvel@linaro.org>,
"Marc Zyngier" <marc.zyngier@arm.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will.deacon@arm.com>,
"Julien Grall" <Julien.Grall@arm.com>,
"Andre Przywara" <andre.przywara@arm.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 06/12] arm64: [HACK] Pull in kvm UAPI header updates from SVE development branch
Date: Fri, 18 Jan 2019 16:14:15 +0000 [thread overview]
Message-ID: <1547828061-20462-7-git-send-email-Dave.Martin@arm.com> (raw)
In-Reply-To: <1547828061-20462-1-git-send-email-Dave.Martin@arm.com>
This patch pulls in SVE-related declarations from my kernel SVE
development branch, so that kvmtool can make use of them.
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
arm/aarch64/include/asm/kvm.h | 13 +++++++++++++
include/linux/kvm.h | 2 ++
2 files changed, 15 insertions(+)
diff --git a/arm/aarch64/include/asm/kvm.h b/arm/aarch64/include/asm/kvm.h
index 97c3478..fc613af 100644
--- a/arm/aarch64/include/asm/kvm.h
+++ b/arm/aarch64/include/asm/kvm.h
@@ -102,6 +102,7 @@ struct kvm_regs {
#define KVM_ARM_VCPU_EL1_32BIT 1 /* CPU running a 32bit VM */
#define KVM_ARM_VCPU_PSCI_0_2 2 /* CPU uses PSCI v0.2 */
#define KVM_ARM_VCPU_PMU_V3 3 /* Support guest PMUv3 */
+#define KVM_ARM_VCPU_SVE 4 /* enable SVE for this CPU */
struct kvm_vcpu_init {
__u32 target;
@@ -226,6 +227,18 @@ struct kvm_vcpu_events {
KVM_REG_ARM_FW | ((r) & 0xffff))
#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0)
+/* SVE registers */
+#define KVM_REG_ARM64_SVE (0x15 << KVM_REG_ARM_COPROC_SHIFT)
+#define KVM_REG_ARM64_SVE_ZREG(n, i) (KVM_REG_ARM64 | KVM_REG_ARM64_SVE | \
+ KVM_REG_SIZE_U2048 | \
+ ((n) << 5) | (i))
+#define KVM_REG_ARM64_SVE_PREG(n, i) (KVM_REG_ARM64 | KVM_REG_ARM64_SVE | \
+ KVM_REG_SIZE_U256 | \
+ ((n) << 5) | (i) | 0x400)
+#define KVM_REG_ARM64_SVE_FFR(i) KVM_REG_ARM64_SVE_PREG(16, i)
+#define KVM_REG_ARM64_SVE_VLS (KVM_REG_ARM64 | KVM_REG_ARM64_SVE | \
+ KVM_REG_SIZE_U512 | 0xffff)
+
/* Device Control API: ARM VGIC */
#define KVM_DEV_ARM_VGIC_GRP_ADDR 0
#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 6d4ea4b..4ea0d92 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -988,6 +988,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_ARM_VM_IPA_SIZE 165
#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166
#define KVM_CAP_HYPERV_CPUID 167
+#define KVM_CAP_ARM_SVE 168
#ifdef KVM_CAP_IRQ_ROUTING
@@ -1145,6 +1146,7 @@ struct kvm_dirty_tlb {
#define KVM_REG_SIZE_U256 0x0050000000000000ULL
#define KVM_REG_SIZE_U512 0x0060000000000000ULL
#define KVM_REG_SIZE_U1024 0x0070000000000000ULL
+#define KVM_REG_SIZE_U2048 0x0080000000000000ULL
struct kvm_reg_list {
__u64 n; /* number of regs */
--
2.1.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-01-18 16:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 16:14 [RFC PATCH 00/12] arm64: SVE guest support test hacks Dave Martin
2019-01-18 16:14 ` [RFC PATCH 01/12] guest: Add generated file guest/guest_init.c to .gitignore Dave Martin
2019-01-18 16:14 ` [RFC PATCH 02/12] update_headers: Sync kvm UAPI headers with linux v5.0-rc2 Dave Martin
2019-01-18 16:14 ` [RFC PATCH 03/12] Makefile: [HACK] Work around GCC 8 warnings :( Dave Martin
2019-01-18 16:14 ` [RFC PATCH 04/12] Makefile: [HACK] Pass relevant flags when checking for libfdt Dave Martin
2019-01-18 16:14 ` [RFC PATCH 05/12] arm64: Correct ARM64_CORE_REG() size encodings for all core registers Dave Martin
2019-01-18 16:14 ` Dave Martin [this message]
2019-01-18 16:14 ` [RFC PATCH 07/12] arm64: [HACK] Add option to show the kernel's KVM register ID list Dave Martin
2019-01-18 16:14 ` [RFC PATCH 08/12] arm64: [HACK] Basic SVE support Dave Martin
2019-01-18 16:14 ` [RFC PATCH 09/12] arm64: [HACK] Show extra info about SVE with --show-reg-list Dave Martin
2019-01-18 16:14 ` [RFC PATCH 10/12] arm64: [HACK] Allow configuration of the guest's set of SVE vector lengths Dave Martin
2019-01-18 16:14 ` [RFC PATCH 11/12] arm64: [HACK] FPSIMD/SVE register dumping for lkvm debug Dave Martin
2019-01-18 16:14 ` [RFC PATCH 12/12] arm64: [HACK] Check that out-of-range SVE register IDs can't be dumped 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=1547828061-20462-7-git-send-email-Dave.Martin@arm.com \
--to=dave.martin@arm.com \
--cc=Julien.Grall@arm.com \
--cc=alex.bennee@linaro.org \
--cc=andre.przywara@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=cdall@kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marc.zyngier@arm.com \
--cc=peter.maydell@linaro.org \
--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).