From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Cathy Avery <cavery@redhat.com>,
Liran Alon <liran.alon@oracle.com>,
Jim Mattson <jmattson@google.com>
Subject: [PATCH 7/7] KVM: SVM: introduce data structures for nested virt state
Date: Fri, 15 May 2020 13:41:44 -0400 [thread overview]
Message-ID: <20200515174144.1727-8-pbonzini@redhat.com> (raw)
In-Reply-To: <20200515174144.1727-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch/x86/include/uapi/asm/kvm.h | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h
index 3f3f780c8c65..cdca0fd1b107 100644
--- a/arch/x86/include/uapi/asm/kvm.h
+++ b/arch/x86/include/uapi/asm/kvm.h
@@ -385,7 +385,7 @@ struct kvm_sync_regs {
#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4)
#define KVM_STATE_NESTED_FORMAT_VMX 0
-#define KVM_STATE_NESTED_FORMAT_SVM 1 /* unused */
+#define KVM_STATE_NESTED_FORMAT_SVM 1
#define KVM_STATE_NESTED_GUEST_MODE 0x00000001
#define KVM_STATE_NESTED_RUN_PENDING 0x00000002
@@ -395,8 +395,14 @@ struct kvm_sync_regs {
#define KVM_STATE_NESTED_SMM_GUEST_MODE 0x00000001
#define KVM_STATE_NESTED_SMM_VMXON 0x00000002
+#define KVM_STATE_NESTED_SVM_VMENTRY_IF 0x00000001
+#define KVM_STATE_NESTED_SVM_GIF 0x00000002
+
#define KVM_STATE_NESTED_VMX_VMCS_SIZE 0x1000
+#define KVM_STATE_NESTED_SVM_VMCB_SIZE 0x1000
+
+
struct kvm_vmx_nested_state_data {
__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
@@ -411,6 +417,17 @@ struct kvm_vmx_nested_state_hdr {
} smm;
};
+struct kvm_svm_nested_state_data {
+ /* Save area only used if KVM_STATE_NESTED_RUN_PENDING. */
+ __u8 vmcb12[KVM_STATE_NESTED_SVM_VMCB_SIZE];
+};
+
+struct kvm_svm_nested_state_hdr {
+ __u64 vmcb_pa;
+
+ __u16 interrupt_flags;
+};
+
/* for KVM_CAP_NESTED_STATE */
struct kvm_nested_state {
__u16 flags;
@@ -419,6 +441,7 @@ struct kvm_nested_state {
union {
struct kvm_vmx_nested_state_hdr vmx;
+ struct kvm_svm_nested_state_hdr svm;
/* Pad the header to 128 bytes. */
__u8 pad[120];
@@ -431,6 +454,7 @@ struct kvm_nested_state {
*/
union {
struct kvm_vmx_nested_state_data vmx[0];
+ struct kvm_svm_nested_state_data svm[0];
} data;
};
--
2.18.2
next prev parent reply other threads:[~2020-05-15 17:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 17:41 [PATCH 0/7] KVM: SVM: baby steps towards nested state migration Paolo Bonzini
2020-05-15 17:41 ` [PATCH 1/7] KVM: SVM: move map argument out of enter_svm_guest_mode Paolo Bonzini
2020-05-15 17:41 ` [PATCH 2/7] KVM: SVM: extract load_nested_vmcb_control Paolo Bonzini
2020-05-15 23:09 ` Krish Sadhukhan
2020-05-15 23:34 ` Paolo Bonzini
2020-05-15 17:41 ` [PATCH 3/7] KVM: SVM: extract preparation of VMCB for nested run Paolo Bonzini
2020-05-15 23:36 ` Paolo Bonzini
2020-05-15 17:41 ` [PATCH 4/7] KVM: SVM: save all control fields in svm->nested Paolo Bonzini
2020-05-15 17:41 ` [PATCH 5/7] KVM: nSVM: remove HF_VINTR_MASK Paolo Bonzini
2020-05-15 17:41 ` [PATCH 6/7] KVM: nSVM: do not reload pause filter fields from VMCB Paolo Bonzini
2020-05-15 17:41 ` Paolo Bonzini [this message]
2020-05-18 20:07 ` [PATCH 0/7] KVM: SVM: baby steps towards nested state migration Krish Sadhukhan
2020-05-18 20:11 ` Paolo Bonzini
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=20200515174144.1727-8-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=cavery@redhat.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liran.alon@oracle.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).