From: Dave.Martin@arm.com (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 15/16] KVM: arm64: Enumerate SVE register indices for KVM_GET_REG_LIST
Date: Thu, 21 Jun 2018 15:57:39 +0100 [thread overview]
Message-ID: <1529593060-542-16-git-send-email-Dave.Martin@arm.com> (raw)
In-Reply-To: <1529593060-542-1-git-send-email-Dave.Martin@arm.com>
This patch includes the SVE register IDs in the list returned by
KVM_GET_REG_LIST, as appropriate.
On a non-SVE-enabled vcpu, no extra IDs are added.
On an SVE-enabled vcpu, the appropriate number of slide IDs are
enumerated for each SVE register, depending on the maximum vector
length for the vcpu.
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
arch/arm64/kvm/guest.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 005394b..5152362 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -21,6 +21,7 @@
#include <linux/errno.h>
#include <linux/err.h>
+#include <linux/kernel.h>
#include <linux/kvm_host.h>
#include <linux/module.h>
#include <linux/uaccess.h>
@@ -253,6 +254,73 @@ static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
return err;
}
+static void copy_reg_index_to_user(u64 __user **uind, int *total, int *cerr,
+ u64 id)
+{
+ int err;
+
+ if (*cerr)
+ return;
+
+ if (uind) {
+ err = put_user(id, *uind);
+ if (err) {
+ *cerr = err;
+ return;
+ }
+ }
+
+ ++*total;
+ if (uind)
+ ++*uind;
+}
+
+static int enumerate_sve_regs(const struct kvm_vcpu *vcpu, u64 __user **uind)
+{
+ unsigned int n, i;
+ int err = 0;
+ int total = 0;
+ unsigned int slices;
+
+ if (!vcpu_has_sve(&vcpu->arch))
+ return 0;
+
+ slices = DIV_ROUND_UP(vcpu->arch.sve_max_vl,
+ KVM_REG_SIZE(KVM_REG_ARM64_SVE_ZREG(0, 0)));
+
+ for (n = 0; n < SVE_NUM_ZREGS; ++n)
+ for (i = 0; i < slices; ++i)
+ copy_reg_index_to_user(uind, &total, &err,
+ KVM_REG_ARM64_SVE_ZREG(n, i));
+
+ for (n = 0; n < SVE_NUM_PREGS; ++n)
+ for (i = 0; i < slices; ++i)
+ copy_reg_index_to_user(uind, &total, &err,
+ KVM_REG_ARM64_SVE_PREG(n, i));
+
+ for (i = 0; i < slices; ++i)
+ copy_reg_index_to_user(uind, &total, &err,
+ KVM_REG_ARM64_SVE_FFR(i));
+
+ if (err)
+ return -EFAULT;
+
+ return total;
+}
+
+static unsigned long num_sve_regs(const struct kvm_vcpu *vcpu)
+{
+ return enumerate_sve_regs(vcpu, NULL);
+}
+
+static int copy_sve_reg_indices(const struct kvm_vcpu *vcpu, u64 __user **uind)
+{
+ int err;
+
+ err = enumerate_sve_regs(vcpu, uind);
+ return err < 0 ? err : 0;
+}
+
static int sve_reg_bounds(struct reg_bounds_struct *b,
const struct kvm_vcpu *vcpu,
const struct kvm_one_reg *reg)
@@ -403,6 +471,7 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu)
unsigned long res = 0;
res += num_core_regs();
+ res += num_sve_regs(vcpu);
res += kvm_arm_num_sys_reg_descs(vcpu);
res += kvm_arm_get_fw_num_regs(vcpu);
res += NUM_TIMER_REGS;
@@ -427,6 +496,10 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)
uindices++;
}
+ ret = copy_sve_reg_indices(vcpu, &uindices);
+ if (ret)
+ return ret;
+
ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices);
if (ret)
return ret;
--
2.1.4
next prev parent reply other threads:[~2018-06-21 14:57 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-21 14:57 [RFC PATCH 00/16] KVM: arm64: Initial support for SVE guests Dave Martin
2018-06-21 14:57 ` [RFC PATCH 01/16] arm64: fpsimd: Always set TIF_FOREIGN_FPSTATE on task state flush Dave Martin
2018-07-06 9:07 ` Alex Bennée
2018-06-21 14:57 ` [RFC PATCH 02/16] KVM: arm64: Delete orphaned declaration for __fpsimd_enabled() Dave Martin
2018-07-06 9:08 ` Alex Bennée
2018-06-21 14:57 ` [RFC PATCH 03/16] KVM: arm64: Refactor kvm_arm_num_regs() for easier maintenance Dave Martin
2018-07-06 9:20 ` Alex Bennée
2018-06-21 14:57 ` [RFC PATCH 04/16] KVM: arm64: Add missing #include of <linux/bitmap.h> to kvm_host.h Dave Martin
2018-07-06 9:21 ` Alex Bennée
2018-06-21 14:57 ` [RFC PATCH 05/16] KVM: arm: Add arch init/uninit hooks Dave Martin
2018-07-06 10:02 ` Alex Bennée
2018-07-09 15:15 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 06/16] arm64/sve: Determine virtualisation-friendly vector lengths Dave Martin
2018-07-06 13:20 ` Marc Zyngier
2018-06-21 14:57 ` [RFC PATCH 07/16] arm64/sve: Enable SVE state tracking for non-task contexts Dave Martin
2018-07-25 13:58 ` Alex Bennée
2018-07-25 14:39 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 08/16] KVM: arm64: Support dynamically hideable system registers Dave Martin
2018-07-25 14:12 ` Alex Bennée
2018-07-25 14:36 ` Dave Martin
2018-07-25 15:41 ` Alex Bennée
2018-07-26 12:53 ` Dave Martin
2018-08-07 19:20 ` Christoffer Dall
2018-08-08 8:33 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 09/16] KVM: arm64: Allow ID registers to by dynamically read-as-zero Dave Martin
2018-07-25 15:46 ` Alex Bennée
2018-08-06 13:03 ` Christoffer Dall
2018-08-07 11:09 ` Dave Martin
2018-08-07 19:35 ` Christoffer Dall
2018-08-08 9:11 ` Dave Martin
2018-08-08 9:58 ` Christoffer Dall
2018-08-08 14:03 ` Peter Maydell
2018-08-09 10:19 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 10/16] KVM: arm64: Add a vcpu flag to control SVE visibility for the guest Dave Martin
2018-07-19 11:08 ` Andrew Jones
2018-07-25 11:41 ` Dave Martin
2018-07-25 13:43 ` Andrew Jones
2018-07-25 14:41 ` Dave Martin
2018-07-19 15:02 ` Andrew Jones
2018-07-25 11:48 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 11/16] KVM: arm64/sve: System register context switch and access support Dave Martin
2018-07-19 11:11 ` Andrew Jones
2018-07-25 11:45 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 12/16] KVM: arm64/sve: Context switch the SVE registers Dave Martin
2018-07-19 13:13 ` Andrew Jones
2018-07-25 11:50 ` Dave Martin
2018-07-25 13:57 ` Andrew Jones
2018-07-25 14:12 ` Dave Martin
2018-08-06 13:19 ` Christoffer Dall
2018-08-07 11:15 ` Dave Martin
2018-08-07 19:43 ` Christoffer Dall
2018-08-08 8:23 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 13/16] KVM: Allow 2048-bit register access via KVM_{GET, SET}_ONE_REG Dave Martin
2018-07-25 15:58 ` Alex Bennée
2018-07-26 12:58 ` Dave Martin
2018-07-26 13:55 ` Alex Bennée
2018-07-27 9:26 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 14/16] KVM: arm64/sve: Add SVE support to register access ioctl interface Dave Martin
2018-07-19 13:04 ` Andrew Jones
2018-07-25 14:06 ` Dave Martin
2018-07-25 17:20 ` Andrew Jones
2018-07-26 13:10 ` Dave Martin
2018-08-03 14:57 ` Dave Martin
2018-08-03 15:11 ` Andrew Jones
2018-08-03 15:38 ` Dave Martin
2018-08-06 13:25 ` Christoffer Dall
2018-08-07 11:17 ` Dave Martin
2018-06-21 14:57 ` Dave Martin [this message]
2018-07-19 14:12 ` [RFC PATCH 15/16] KVM: arm64: Enumerate SVE register indices for KVM_GET_REG_LIST Andrew Jones
2018-07-25 14:50 ` Dave Martin
2018-06-21 14:57 ` [RFC PATCH 16/16] KVM: arm64/sve: Report and enable SVE API extensions for userspace Dave Martin
2018-07-19 14:59 ` Andrew Jones
2018-07-25 15:27 ` Dave Martin
2018-07-25 16:52 ` Andrew Jones
2018-07-26 13:18 ` Dave Martin
2018-08-06 13:41 ` Christoffer Dall
2018-08-07 11:23 ` Dave Martin
2018-08-07 20:08 ` Christoffer Dall
2018-08-08 8:30 ` Dave Martin
2018-07-19 15:24 ` Andrew Jones
2018-07-26 13:23 ` Dave Martin
2018-07-06 8:22 ` [RFC PATCH 00/16] KVM: arm64: Initial support for SVE guests Alex Bennée
2018-07-06 9:05 ` Dave Martin
2018-07-06 9:20 ` Alex Bennée
2018-07-06 9:23 ` Peter Maydell
2018-07-06 10:11 ` Alex Bennée
2018-07-06 10:14 ` Peter Maydell
2018-08-06 13:05 ` Christoffer Dall
2018-08-07 11:18 ` 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=1529593060-542-16-git-send-email-Dave.Martin@arm.com \
--to=dave.martin@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).