From: Yang Zhong <yang.zhong@intel.com>
To: x86@kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, tglx@linutronix.de,
mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com,
pbonzini@redhat.com
Cc: seanjc@google.com, jun.nakajima@intel.com, kevin.tian@intel.com,
jing2.liu@linux.intel.com, jing2.liu@intel.com,
yang.zhong@intel.com
Subject: [PATCH 16/19] kvm: x86: Introduce KVM_{G|S}ET_XSAVE2 ioctl
Date: Tue, 7 Dec 2021 19:03:56 -0500 [thread overview]
Message-ID: <20211208000359.2853257-17-yang.zhong@intel.com> (raw)
In-Reply-To: <20211208000359.2853257-1-yang.zhong@intel.com>
From: Jing Liu <jing2.liu@intel.com>
When dynamic XSTATE features are supported, the xsave states are
beyond 4KB. The current kvm_xsave structure and related
KVM_{G, S}ET_XSAVE only allows 4KB which is not enough for full
states.
Introduce a new kvm_xsave2 structure and the corresponding
KVM_GET_XSAVE2 and KVM_SET_XSAVE2 ioctls so that userspace VMM
can get and set the full xsave states.
Signed-off-by: Jing Liu <jing2.liu@intel.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
arch/x86/include/uapi/asm/kvm.h | 6 ++++
arch/x86/kvm/x86.c | 62 +++++++++++++++++++++++++++++++++
include/uapi/linux/kvm.h | 7 +++-
3 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h
index 5a776a08f78c..de42a51e20c3 100644
--- a/arch/x86/include/uapi/asm/kvm.h
+++ b/arch/x86/include/uapi/asm/kvm.h
@@ -47,6 +47,7 @@
#define __KVM_HAVE_VCPU_EVENTS
#define __KVM_HAVE_DEBUGREGS
#define __KVM_HAVE_XSAVE
+#define __KVM_HAVE_XSAVE2
#define __KVM_HAVE_XCRS
#define __KVM_HAVE_READONLY_MEM
@@ -378,6 +379,11 @@ struct kvm_xsave {
__u32 region[1024];
};
+struct kvm_xsave2 {
+ __u32 size;
+ __u8 state[0];
+};
+
#define KVM_MAX_XCRS 16
struct kvm_xcr {
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8b033c9241d6..d212f6d2d39a 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4216,6 +4216,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
case KVM_CAP_DEBUGREGS:
case KVM_CAP_X86_ROBUST_SINGLESTEP:
case KVM_CAP_XSAVE:
+ case KVM_CAP_XSAVE2:
case KVM_CAP_ASYNC_PF:
case KVM_CAP_ASYNC_PF_INT:
case KVM_CAP_GET_TSC_KHZ:
@@ -4940,6 +4941,17 @@ static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,
vcpu->arch.pkru);
}
+static void kvm_vcpu_ioctl_x86_get_xsave2(struct kvm_vcpu *vcpu,
+ u8 *state, u32 size)
+{
+ if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
+ return;
+
+ fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu,
+ state, size,
+ vcpu->arch.pkru);
+}
+
static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
struct kvm_xsave *guest_xsave)
{
@@ -4951,6 +4963,15 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
supported_xcr0, &vcpu->arch.pkru);
}
+static int kvm_vcpu_ioctl_x86_set_xsave2(struct kvm_vcpu *vcpu, u8 *state)
+{
+ if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
+ return 0;
+
+ return fpu_copy_uabi_to_guest_fpstate(&vcpu->arch.guest_fpu, state,
+ supported_xcr0, &vcpu->arch.pkru);
+}
+
static void kvm_vcpu_ioctl_x86_get_xcrs(struct kvm_vcpu *vcpu,
struct kvm_xcrs *guest_xcrs)
{
@@ -5416,6 +5437,47 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
r = kvm_vcpu_ioctl_x86_set_xsave(vcpu, u.xsave);
break;
}
+ case KVM_GET_XSAVE2: {
+ struct kvm_xsave2 __user *xsave2_arg = argp;
+ struct kvm_xsave2 xsave2;
+
+ r = -EFAULT;
+ if (copy_from_user(&xsave2, xsave2_arg, sizeof(struct kvm_xsave2)))
+ break;
+
+ u.buffer = kzalloc(xsave2.size, GFP_KERNEL_ACCOUNT);
+
+ r = -ENOMEM;
+ if (!u.buffer)
+ break;
+
+ kvm_vcpu_ioctl_x86_get_xsave2(vcpu, u.buffer, xsave2.size);
+
+ r = -EFAULT;
+ if (copy_to_user(xsave2_arg->state, u.buffer, xsave2.size))
+ break;
+
+ r = 0;
+ break;
+ }
+ case KVM_SET_XSAVE2: {
+ struct kvm_xsave2 __user *xsave2_arg = argp;
+ struct kvm_xsave2 xsave2;
+
+ r = -EFAULT;
+ if (copy_from_user(&xsave2, xsave2_arg, sizeof(struct kvm_xsave2)))
+ break;
+
+ u.buffer = memdup_user(xsave2_arg->state, xsave2.size);
+
+ if (IS_ERR(u.buffer)) {
+ r = PTR_ERR(u.buffer);
+ goto out_nofree;
+ }
+
+ r = kvm_vcpu_ioctl_x86_set_xsave2(vcpu, u.buffer);
+ break;
+ }
case KVM_GET_XCRS: {
u.xcrs = kzalloc(sizeof(struct kvm_xcrs), GFP_KERNEL_ACCOUNT);
r = -ENOMEM;
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 0c7b301c7254..603e1ca9ba09 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1132,7 +1132,9 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204
#define KVM_CAP_ARM_MTE 205
#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206
-
+#ifdef __KVM_HAVE_XSAVE2
+#define KVM_CAP_XSAVE2 207
+#endif
#ifdef KVM_CAP_IRQ_ROUTING
struct kvm_irq_routing_irqchip {
@@ -1679,6 +1681,9 @@ struct kvm_xen_hvm_attr {
#define KVM_GET_SREGS2 _IOR(KVMIO, 0xcc, struct kvm_sregs2)
#define KVM_SET_SREGS2 _IOW(KVMIO, 0xcd, struct kvm_sregs2)
+#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave2)
+#define KVM_SET_XSAVE2 _IOW(KVMIO, 0xd0, struct kvm_xsave2)
+
struct kvm_xen_vcpu_attr {
__u16 type;
__u16 pad[3];
next prev parent reply other threads:[~2021-12-07 15:10 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 0:03 [PATCH 00/19] AMX Support in KVM Yang Zhong
2021-12-08 0:03 ` [PATCH 01/19] x86/fpu: Extend prctl() with guest permissions Yang Zhong
2021-12-14 0:16 ` Thomas Gleixner
2021-12-08 0:03 ` [PATCH 02/19] x86/fpu: Prepare KVM for dynamically enabled states Yang Zhong
2021-12-13 9:12 ` Paolo Bonzini
2021-12-13 12:00 ` Thomas Gleixner
2021-12-13 12:45 ` Paolo Bonzini
2021-12-13 19:50 ` Thomas Gleixner
2021-12-08 0:03 ` [PATCH 03/19] kvm: x86: Fix xstate_required_size() to follow XSTATE alignment rule Yang Zhong
2021-12-08 0:03 ` [PATCH 04/19] kvm: x86: Check guest xstate permissions when KVM_SET_CPUID2 Yang Zhong
2021-12-08 0:03 ` [PATCH 05/19] x86/fpu: Move xfd initialization out of __fpstate_reset() to the callers Yang Zhong
2021-12-10 22:33 ` Thomas Gleixner
2021-12-08 0:03 ` [PATCH 06/19] x86/fpu: Add reallocation mechanims for KVM Yang Zhong
2021-12-08 0:03 ` [PATCH 07/19] kvm: x86: Propagate fpstate reallocation error to userspace Yang Zhong
2021-12-10 15:44 ` Paolo Bonzini
2021-12-08 0:03 ` [PATCH 08/19] x86/fpu: Move xfd_update_state() to xstate.c and export symbol Yang Zhong
2021-12-10 22:44 ` Thomas Gleixner
2021-12-08 0:03 ` [PATCH 09/19] kvm: x86: Prepare reallocation check Yang Zhong
2021-12-13 9:16 ` Paolo Bonzini
2021-12-14 7:06 ` Tian, Kevin
2021-12-14 10:16 ` Paolo Bonzini
2021-12-14 14:41 ` Liu, Jing2
2021-12-15 7:09 ` Tian, Kevin
2021-12-08 0:03 ` [PATCH 10/19] kvm: x86: Emulate WRMSR of guest IA32_XFD Yang Zhong
2021-12-10 16:02 ` Paolo Bonzini
2021-12-13 7:51 ` Liu, Jing2
2021-12-13 9:01 ` Paolo Bonzini
2021-12-14 10:26 ` Yang Zhong
2021-12-14 11:24 ` Paolo Bonzini
2021-12-10 23:09 ` Thomas Gleixner
2021-12-13 15:06 ` Paolo Bonzini
2021-12-13 19:45 ` Thomas Gleixner
2021-12-13 21:23 ` Thomas Gleixner
2021-12-14 7:16 ` Tian, Kevin
2021-12-08 0:03 ` [PATCH 11/19] kvm: x86: Check fpstate reallocation in XSETBV emulation Yang Zhong
2021-12-08 0:03 ` [PATCH 12/19] x86/fpu: Prepare KVM for bringing XFD state back in-sync Yang Zhong
2021-12-10 23:11 ` Thomas Gleixner
2021-12-08 0:03 ` [PATCH 13/19] kvm: x86: Disable WRMSR interception for IA32_XFD on demand Yang Zhong
2021-12-08 7:23 ` Liu, Jing2
2021-12-08 0:03 ` [PATCH 14/19] x86/fpu: Prepare for KVM XFD_ERR handling Yang Zhong
2021-12-10 16:16 ` Paolo Bonzini
2021-12-10 23:20 ` Thomas Gleixner
2021-12-08 0:03 ` [PATCH 15/19] kvm: x86: Save and restore guest XFD_ERR properly Yang Zhong
2021-12-10 16:23 ` Paolo Bonzini
2021-12-10 22:01 ` Paolo Bonzini
2021-12-12 13:10 ` Yang Zhong
2021-12-11 0:10 ` Thomas Gleixner
2021-12-11 1:31 ` Paolo Bonzini
2021-12-11 3:23 ` Tian, Kevin
2021-12-11 13:10 ` Thomas Gleixner
2021-12-11 3:07 ` Tian, Kevin
2021-12-11 13:29 ` Thomas Gleixner
2021-12-12 1:50 ` Tian, Kevin
2021-12-12 9:10 ` Paolo Bonzini
2021-12-08 0:03 ` Yang Zhong [this message]
2021-12-10 16:25 ` [PATCH 16/19] kvm: x86: Introduce KVM_{G|S}ET_XSAVE2 ioctl Paolo Bonzini
2021-12-10 16:30 ` Paolo Bonzini
2021-12-10 22:13 ` Paolo Bonzini
2021-12-13 8:23 ` Wang, Wei W
2021-12-13 9:24 ` Paolo Bonzini
2021-12-14 6:06 ` Wang, Wei W
2021-12-14 6:18 ` Paolo Bonzini
2021-12-15 2:39 ` Wang, Wei W
2021-12-15 13:42 ` Paolo Bonzini
2021-12-16 8:25 ` Wang, Wei W
2021-12-16 10:28 ` Paolo Bonzini
2021-12-20 17:54 ` State Component 18 and Palette 1 (Re: [PATCH 16/19] kvm: x86: Introduce KVM_{G|S}ET_XSAVE2 ioctl) Nakajima, Jun
2021-12-22 14:44 ` Paolo Bonzini
2021-12-22 23:47 ` Nakajima, Jun
2021-12-22 14:52 ` Dave Hansen
2021-12-22 23:51 ` Nakajima, Jun
2021-12-13 10:10 ` [PATCH 16/19] kvm: x86: Introduce KVM_{G|S}ET_XSAVE2 ioctl Thomas Gleixner
2021-12-13 10:43 ` Paolo Bonzini
2021-12-13 12:40 ` Thomas Gleixner
2021-12-08 0:03 ` [PATCH 17/19] docs: virt: api.rst: Document the new KVM_{G, S}ET_XSAVE2 ioctls Yang Zhong
2021-12-08 0:03 ` [PATCH 18/19] kvm: x86: AMX XCR0 support for guest Yang Zhong
2021-12-10 16:30 ` Paolo Bonzini
2021-12-08 0:03 ` [PATCH 19/19] kvm: x86: Add AMX CPUIDs support Yang Zhong
2021-12-10 21:52 ` Paolo Bonzini
2021-12-11 21:20 ` [PATCH 00/19] AMX Support in KVM Thomas Gleixner
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=20211208000359.2853257-17-yang.zhong@intel.com \
--to=yang.zhong@intel.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=jing2.liu@intel.com \
--cc=jing2.liu@linux.intel.com \
--cc=jun.nakajima@intel.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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).