From: Mukesh Rathor <mukesh.rathor@oracle.com>
To: Xen-devel@lists.xensource.com, keir.xen@gmail.com
Subject: [PATCH 20/23] PVH xen: HVM support of PVH guest creation/destruction
Date: Fri, 19 Jul 2013 18:45:02 -0700 [thread overview]
Message-ID: <1374284705-23122-21-git-send-email-mukesh.rathor@oracle.com> (raw)
In-Reply-To: <1374284705-23122-1-git-send-email-mukesh.rathor@oracle.com>
This patch implements the HVM portion of the guest create, ie
vcpu and domain initilization. Some changes to support the destroy path.
Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com>
---
xen/arch/x86/hvm/hvm.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 0be98a1..a21391f 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -510,6 +510,30 @@ static int hvm_print_line(
return X86EMUL_OKAY;
}
+static int pvh_dom_initialise(struct domain *d)
+{
+ int rc;
+
+ if ( !d->arch.hvm_domain.hap_enabled )
+ return -EINVAL;
+
+ spin_lock_init(&d->arch.hvm_domain.irq_lock);
+
+ hvm_init_cacheattr_region_list(d);
+
+ if ( (rc = paging_enable(d, PG_refcounts|PG_translate|PG_external)) != 0 )
+ goto pvh_dominit_fail;
+
+ if ( (rc = hvm_funcs.domain_initialise(d)) != 0 )
+ goto pvh_dominit_fail;
+
+ return 0;
+
+pvh_dominit_fail:
+ hvm_destroy_cacheattr_region_list(d);
+ return rc;
+}
+
int hvm_domain_initialise(struct domain *d)
{
int rc;
@@ -520,6 +544,8 @@ int hvm_domain_initialise(struct domain *d)
"on a non-VT/AMDV platform.\n");
return -EINVAL;
}
+ if ( is_pvh_domain(d) )
+ return pvh_dom_initialise(d);
spin_lock_init(&d->arch.hvm_domain.pbuf_lock);
spin_lock_init(&d->arch.hvm_domain.irq_lock);
@@ -584,6 +610,9 @@ int hvm_domain_initialise(struct domain *d)
void hvm_domain_relinquish_resources(struct domain *d)
{
+ if ( is_pvh_domain(d) )
+ return;
+
if ( hvm_funcs.nhvm_domain_relinquish_resources )
hvm_funcs.nhvm_domain_relinquish_resources(d);
@@ -609,10 +638,14 @@ void hvm_domain_relinquish_resources(struct domain *d)
void hvm_domain_destroy(struct domain *d)
{
hvm_funcs.domain_destroy(d);
+ hvm_destroy_cacheattr_region_list(d);
+
+ if ( is_pvh_domain(d) )
+ return;
+
rtc_deinit(d);
stdvga_deinit(d);
vioapic_deinit(d);
- hvm_destroy_cacheattr_region_list(d);
}
static int hvm_save_tsc_adjust(struct domain *d, hvm_domain_context_t *h)
@@ -1066,6 +1099,30 @@ static int __init __hvm_register_CPU_XSAVE_save_and_restore(void)
}
__initcall(__hvm_register_CPU_XSAVE_save_and_restore);
+static int pvh_vcpu_initialise(struct vcpu *v)
+{
+ int rc;
+
+ if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 )
+ return rc;
+
+ softirq_tasklet_init(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet,
+ (void(*)(unsigned long))hvm_assert_evtchn_irq,
+ (unsigned long)v);
+
+ v->arch.hvm_vcpu.hcall_64bit = 1; /* PVH 32bitfixme. */
+ v->arch.user_regs.eflags = 2;
+ v->arch.hvm_vcpu.inject_trap.vector = -1;
+
+ if ( (rc = hvm_vcpu_cacheattr_init(v)) != 0 )
+ {
+ hvm_funcs.vcpu_destroy(v);
+ return rc;
+ }
+
+ return 0;
+}
+
int hvm_vcpu_initialise(struct vcpu *v)
{
int rc;
@@ -1077,6 +1134,9 @@ int hvm_vcpu_initialise(struct vcpu *v)
spin_lock_init(&v->arch.hvm_vcpu.tm_lock);
INIT_LIST_HEAD(&v->arch.hvm_vcpu.tm_list);
+ if ( is_pvh_vcpu(v) )
+ return pvh_vcpu_initialise(v);
+
if ( (rc = vlapic_init(v)) != 0 )
goto fail1;
@@ -1165,7 +1225,10 @@ void hvm_vcpu_destroy(struct vcpu *v)
tasklet_kill(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet);
hvm_vcpu_cacheattr_destroy(v);
- vlapic_destroy(v);
+
+ if ( !is_pvh_vcpu(v) )
+ vlapic_destroy(v);
+
hvm_funcs.vcpu_destroy(v);
/* Event channel is already freed by evtchn_destroy(). */
--
1.7.2.3
next prev parent reply other threads:[~2013-07-20 1:45 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 ` [PATCH 09/23] PVH xen: introduce pvh_set_vcpu_info() and vmx_pvh_set_vcpu_info() Mukesh Rathor
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 ` Mukesh Rathor [this message]
2013-07-20 1:45 ` [PATCH 21/23] PVH xen: VMX support of PVH guest creation/destruction 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-21-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).