From: Mukesh Rathor <mukesh.rathor@oracle.com>
To: Xen-devel@lists.xensource.com, keir.xen@gmail.com
Subject: [PATCH 09/23] PVH xen: introduce pvh_set_vcpu_info() and vmx_pvh_set_vcpu_info()
Date: Fri, 19 Jul 2013 18:44:51 -0700 [thread overview]
Message-ID: <1374284705-23122-10-git-send-email-mukesh.rathor@oracle.com> (raw)
In-Reply-To: <1374284705-23122-1-git-send-email-mukesh.rathor@oracle.com>
vmx_pvh_set_vcpu_info() is added to a new file pvh.c, to which more changes
are added later, like pvh vmexit handler.
Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com>
---
xen/arch/x86/hvm/vmx/Makefile | 1 +
xen/arch/x86/hvm/vmx/pvh.c | 78 +++++++++++++++++++++++++++++++++++++
xen/arch/x86/hvm/vmx/vmx.c | 1 +
xen/include/asm-x86/hvm/hvm.h | 8 ++++
xen/include/asm-x86/hvm/vmx/vmx.h | 1 +
5 files changed, 89 insertions(+), 0 deletions(-)
create mode 100644 xen/arch/x86/hvm/vmx/pvh.c
diff --git a/xen/arch/x86/hvm/vmx/Makefile b/xen/arch/x86/hvm/vmx/Makefile
index 373b3d9..59fb5d4 100644
--- a/xen/arch/x86/hvm/vmx/Makefile
+++ b/xen/arch/x86/hvm/vmx/Makefile
@@ -1,5 +1,6 @@
obj-bin-y += entry.o
obj-y += intr.o
+obj-y += pvh.o
obj-y += realmode.o
obj-y += vmcs.o
obj-y += vmx.o
diff --git a/xen/arch/x86/hvm/vmx/pvh.c b/xen/arch/x86/hvm/vmx/pvh.c
new file mode 100644
index 0000000..b37e423
--- /dev/null
+++ b/xen/arch/x86/hvm/vmx/pvh.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2013, Mukesh Rathor, Oracle Corp. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#include <xen/hypercall.h>
+#include <xen/guest_access.h>
+#include <asm/p2m.h>
+#include <asm/traps.h>
+#include <asm/hvm/vmx/vmx.h>
+#include <public/sched.h>
+#include <asm/hvm/nestedhvm.h>
+#include <asm/xstate.h>
+
+/*
+ * Set vmcs fields in support of vcpu_op -> VCPUOP_initialise hcall. Called
+ * from arch_set_info_guest() which sets the (PVH relevant) non-vmcs fields.
+ *
+ * In case of linux:
+ * The boot vcpu calls this to set some context for the non boot smp vcpu.
+ * The call comes from cpu_initialize_context(). (boot vcpu 0 context is
+ * set by the tools via do_domctl -> vcpu_initialise).
+ *
+ * NOTE: In case of VMCS, loading a selector doesn't cause the hidden fields
+ * to be automatically loaded. We load selectors here but not the hidden
+ * parts, except for GS_BASE and FS_BASE. This means we require the
+ * guest to have same hidden values as the default values loaded in the
+ * vmcs in pvh_construct_vmcs(), ie, the GDT the vcpu is coming up on
+ * should be something like following,
+ * (from 64bit linux, CS:0x10 DS/SS:0x18) :
+ *
+ * ffff88007f704000: 0000000000000000 00cf9b000000ffff
+ * ffff88007f704010: 00af9b000000ffff 00cf93000000ffff
+ * ffff88007f704020: 00cffb000000ffff 00cff3000000ffff
+ *
+ */
+int vmx_pvh_set_vcpu_info(struct vcpu *v, struct vcpu_guest_context *ctxtp)
+{
+ if ( v->vcpu_id == 0 )
+ return 0;
+
+ if ( !(ctxtp->flags & VGCF_in_kernel) )
+ return -EINVAL;
+
+ vmx_vmcs_enter(v);
+ __vmwrite(GUEST_GDTR_BASE, ctxtp->gdt.pvh.addr);
+ __vmwrite(GUEST_GDTR_LIMIT, ctxtp->gdt.pvh.limit);
+ __vmwrite(GUEST_LDTR_BASE, ctxtp->ldt_base);
+ __vmwrite(GUEST_LDTR_LIMIT, ctxtp->ldt_ents);
+
+ __vmwrite(GUEST_FS_BASE, ctxtp->fs_base);
+ __vmwrite(GUEST_GS_BASE, ctxtp->gs_base_kernel);
+
+ __vmwrite(GUEST_CS_SELECTOR, ctxtp->user_regs.cs);
+ __vmwrite(GUEST_SS_SELECTOR, ctxtp->user_regs.ss);
+ __vmwrite(GUEST_ES_SELECTOR, ctxtp->user_regs.es);
+ __vmwrite(GUEST_DS_SELECTOR, ctxtp->user_regs.ds);
+ __vmwrite(GUEST_FS_SELECTOR, ctxtp->user_regs.fs);
+ __vmwrite(GUEST_GS_SELECTOR, ctxtp->user_regs.gs);
+
+ if ( vmx_add_guest_msr(MSR_SHADOW_GS_BASE) )
+ {
+ vmx_vmcs_exit(v);
+ return -EINVAL;
+ }
+ vmx_write_guest_msr(MSR_SHADOW_GS_BASE, ctxtp->gs_base_user);
+
+ vmx_vmcs_exit(v);
+ return 0;
+}
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 7292357..e3c7515 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1562,6 +1562,7 @@ static struct hvm_function_table __initdata vmx_function_table = {
.sync_pir_to_irr = vmx_sync_pir_to_irr,
.handle_eoi = vmx_handle_eoi,
.nhvm_hap_walk_L1_p2m = nvmx_hap_walk_L1_p2m,
+ .pvh_set_vcpu_info = vmx_pvh_set_vcpu_info,
};
const struct hvm_function_table * __init start_vmx(void)
diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h
index 00489cf..072a2a7 100644
--- a/xen/include/asm-x86/hvm/hvm.h
+++ b/xen/include/asm-x86/hvm/hvm.h
@@ -193,6 +193,8 @@ struct hvm_function_table {
paddr_t *L1_gpa, unsigned int *page_order,
uint8_t *p2m_acc, bool_t access_r,
bool_t access_w, bool_t access_x);
+
+ int (*pvh_set_vcpu_info)(struct vcpu *v, struct vcpu_guest_context *ctxtp);
};
extern struct hvm_function_table hvm_funcs;
@@ -326,6 +328,12 @@ static inline unsigned long hvm_get_shadow_gs_base(struct vcpu *v)
return hvm_funcs.get_shadow_gs_base(v);
}
+static inline int pvh_set_vcpu_info(struct vcpu *v,
+ struct vcpu_guest_context *ctxtp)
+{
+ return hvm_funcs.pvh_set_vcpu_info(v, ctxtp);
+}
+
#define is_viridian_domain(_d) \
(is_hvm_domain(_d) && ((_d)->arch.hvm_domain.params[HVM_PARAM_VIRIDIAN]))
diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h
index c21a303..9e6c481 100644
--- a/xen/include/asm-x86/hvm/vmx/vmx.h
+++ b/xen/include/asm-x86/hvm/vmx/vmx.h
@@ -473,6 +473,7 @@ void vmx_update_guest_eip(void);
void vmx_dr_access(unsigned long exit_qualification,
struct cpu_user_regs *regs);
void vmx_fpu_enter(struct vcpu *v);
+int vmx_pvh_set_vcpu_info(struct vcpu *v, struct vcpu_guest_context *ctxtp);
int alloc_p2m_hap_data(struct p2m_domain *p2m);
void free_p2m_hap_data(struct p2m_domain *p2m);
--
1.7.2.3
next prev parent reply other threads:[~2013-07-20 1:44 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-20 1:44 [PATCH 00/23][V9]PVH xen: Phase I, Version 9 patches Mukesh Rathor
2013-07-20 1:44 ` [PATCH 01/23] PVH xen: Add readme docs/misc/pvh-readme.txt Mukesh Rathor
2013-07-20 1:44 ` [PATCH 02/23] PVH xen: turn gdb_frames/gdt_ents into union Mukesh Rathor
2013-08-05 15:55 ` George Dunlap
2013-08-05 21:51 ` Mukesh Rathor
2013-08-06 7:36 ` Ian Campbell
2013-08-06 13:50 ` George Dunlap
2013-08-06 13:57 ` Ian Campbell
2013-08-06 19:09 ` Mukesh Rathor
2013-08-07 8:32 ` Ian Campbell
2013-07-20 1:44 ` [PATCH 03/23] PVH xen: add params to read_segment_register Mukesh Rathor
2013-07-20 1:44 ` [PATCH 04/23] PVH xen: Move e820 fields out of pv_domain struct Mukesh Rathor
2013-07-20 1:44 ` [PATCH 05/23] PVH xen: hvm related preparatory changes for PVH Mukesh Rathor
2013-07-20 1:44 ` [PATCH 06/23] PVH xen: vmx " Mukesh Rathor
2013-07-20 1:44 ` [PATCH 07/23] PVH xen: vmcs " Mukesh Rathor
2013-07-20 1:44 ` [PATCH 08/23] PVH xen: Introduce PVH guest type and some basic changes Mukesh Rathor
2013-07-20 1:44 ` Mukesh Rathor [this message]
2013-07-20 1:44 ` [PATCH 10/23] PVH xen: domain create, context switch related code changes Mukesh Rathor
2013-07-20 1:44 ` [PATCH 11/23] PVH xen: support invalid op emulation for PVH Mukesh Rathor
2013-07-20 1:44 ` [PATCH 12/23] PVH xen: Support privileged " Mukesh Rathor
2013-07-20 1:44 ` [PATCH 13/23] PVH xen: interrupt/event-channel delivery to PVH Mukesh Rathor
2013-07-20 1:44 ` [PATCH 14/23] PVH xen: additional changes to support PVH guest creation and execution Mukesh Rathor
2013-07-20 1:44 ` [PATCH 15/23] PVH xen: mapcache and show registers Mukesh Rathor
2013-07-20 1:44 ` [PATCH 16/23] PVH xen: mtrr, tsc, grant changes Mukesh Rathor
2013-07-20 1:44 ` [PATCH 17/23] PVH xen: Checks, asserts, and limitations for PVH Mukesh Rathor
2013-07-20 1:45 ` [PATCH 18/23] PVH xen: add hypercall support " Mukesh Rathor
2013-07-20 1:45 ` [PATCH 19/23] PVH xen: vmcs related changes Mukesh Rathor
2013-07-20 1:45 ` [PATCH 20/23] PVH xen: HVM support of PVH guest creation/destruction Mukesh Rathor
2013-07-20 1:45 ` [PATCH 21/23] PVH xen: VMX " Mukesh Rathor
2013-07-22 14:25 ` Egger, Christoph
2013-07-20 1:45 ` [PATCH 22/23] PVH xen: preparatory patch for the pvh vmexit handler patch Mukesh Rathor
2013-07-20 1:45 ` [PATCH 23/23] PVH xen: introduce vmexit handler for PVH Mukesh Rathor
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=1374284705-23122-10-git-send-email-mukesh.rathor@oracle.com \
--to=mukesh.rathor@oracle.com \
--cc=Xen-devel@lists.xensource.com \
--cc=keir.xen@gmail.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).