From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [Xen-devel] [PATCH] SVM: split _np_enable VMCB field
Date: Thu, 26 Mar 2020 15:00:12 +0100 [thread overview]
Message-ID: <6f39ca23-4d63-ca73-4916-de64efde1a11@suse.com> (raw)
The nest paging enable is actually just a single bit within the 64-bit
VMCB field, which is particularly relevant for uses like the one in
nsvm_vcpu_vmentry(). Split the field, adding definitions for a few other
bits at the same time. To be able to generate accessors for bitfields,
VMCB_ACCESSORS() needs the type part broken out, as typeof() can't be
applied to bitfields. Unfortunately this means specification of the same
type in two distinct places.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
Note: For the time being compile tested only.
--- a/xen/arch/x86/hvm/svm/svmdebug.c
+++ b/xen/arch/x86/hvm/svm/svmdebug.c
@@ -62,8 +62,8 @@ void svm_vmcb_dump(const char *from, con
vmcb->exitcode, vmcb->exit_int_info.raw);
printk("exitinfo1 = %#"PRIx64" exitinfo2 = %#"PRIx64"\n",
vmcb->exitinfo1, vmcb->exitinfo2);
- printk("np_enable = %#"PRIx64" guest_asid = %#x\n",
- vmcb_get_np_enable(vmcb), vmcb_get_guest_asid(vmcb));
+ printk("np_ctrl = %#"PRIx64" guest_asid = %#x\n",
+ vmcb_get_np_ctrl(vmcb), vmcb_get_guest_asid(vmcb));
printk("virtual vmload/vmsave = %d, virt_ext = %#"PRIx64"\n",
vmcb->virt_ext.fields.vloadsave_enable, vmcb->virt_ext.bytes);
printk("cpl = %d efer = %#"PRIx64" star = %#"PRIx64" lstar = %#"PRIx64"\n",
--- a/xen/include/asm-x86/hvm/svm/vmcb.h
+++ b/xen/include/asm-x86/hvm/svm/vmcb.h
@@ -439,7 +439,17 @@ struct vmcb_struct {
} ei;
};
intinfo_t exit_int_info; /* offset 0x88 */
- u64 _np_enable; /* offset 0x90 - cleanbit 4 */
+ union { /* offset 0x90 - cleanbit 4 */
+ struct {
+ bool _np_enable :1;
+ bool _sev_enable :1;
+ bool _sev_es_enable :1;
+ bool _gmet :1;
+ bool :1;
+ bool _vte :1;
+ };
+ uint64_t _np_ctrl;
+ };
u64 res08[2];
intinfo_t event_inj; /* offset 0xA8 */
u64 _h_cr3; /* offset 0xB0 - cleanbit 4 */
@@ -569,20 +579,23 @@ void svm_intercept_msr(struct vcpu *v, u
* VMCB accessor functions.
*/
-#define VMCB_ACCESSORS(name, cleanbit) \
+#define VMCB_ACCESSORS_(name, type, cleanbit) \
static inline void \
vmcb_set_ ## name(struct vmcb_struct *vmcb, \
- typeof(vmcb->_ ## name) value) \
+ type value) \
{ \
vmcb->_ ## name = value; \
vmcb->cleanbits.fields.cleanbit = 0; \
} \
-static inline typeof(alloc_vmcb()->_ ## name) \
+static inline type \
vmcb_get_ ## name(const struct vmcb_struct *vmcb) \
{ \
return vmcb->_ ## name; \
}
+#define VMCB_ACCESSORS(name, cleanbit) \
+ VMCB_ACCESSORS_(name, typeof(alloc_vmcb()->_ ## name), cleanbit)
+
VMCB_ACCESSORS(cr_intercepts, intercepts)
VMCB_ACCESSORS(dr_intercepts, intercepts)
VMCB_ACCESSORS(exception_intercepts, intercepts)
@@ -595,7 +608,12 @@ VMCB_ACCESSORS(iopm_base_pa, iopm)
VMCB_ACCESSORS(msrpm_base_pa, iopm)
VMCB_ACCESSORS(guest_asid, asid)
VMCB_ACCESSORS(vintr, tpr)
-VMCB_ACCESSORS(np_enable, np)
+VMCB_ACCESSORS(np_ctrl, np)
+VMCB_ACCESSORS_(np_enable, bool, np)
+VMCB_ACCESSORS_(sev_enable, bool, np)
+VMCB_ACCESSORS_(sev_es_enable, bool, np)
+VMCB_ACCESSORS_(gmet, bool, np)
+VMCB_ACCESSORS_(vte, bool, np)
VMCB_ACCESSORS(h_cr3, np)
VMCB_ACCESSORS(g_pat, np)
VMCB_ACCESSORS(cr0, cr)
next reply other threads:[~2020-03-26 14:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 14:00 Jan Beulich [this message]
2020-03-27 13:30 ` [Xen-devel] [PATCH] SVM: split _np_enable VMCB field Andrew Cooper
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=6f39ca23-4d63-ca73-4916-de64efde1a11@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=xen-devel@lists.xenproject.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).