* [PATCH 11/13] Nested Virtualization: enablement
@ 2010-09-01 15:12 Christoph Egger
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Egger @ 2010-09-01 15:12 UTC (permalink / raw)
To: xen-devel@lists.xensource.com; +Cc: Dong, Eddie, Tim Deegan
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
[-- Attachment #2: xen_nh11_enable.diff --]
[-- Type: text/x-diff, Size: 2171 bytes --]
# HG changeset patch
# User cegger
# Date 1283345888 -7200
Implement generic piece to finally enable nested virtualization
diff -r ef5e3a27c689 -r c1a95c7ef858 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -830,10 +830,16 @@ int hvm_vcpu_initialise(struct vcpu *v)
if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 )
goto fail2;
+ rc = nestedhvm_vcpu_initialise(v);
+ if ( rc < 0 ) {
+ printk("%s: nestedhvm_vcpu_initialise returned %i\n", __func__, rc);
+ goto fail3;
+ }
+
/* Create ioreq event channel. */
rc = alloc_unbound_xen_event_channel(v, 0);
if ( rc < 0 )
- goto fail3;
+ goto fail4;
/* Register ioreq event channel. */
v->arch.hvm_vcpu.xen_port = rc;
@@ -847,7 +853,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
rc = hvm_vcpu_cacheattr_init(v);
if ( rc != 0 )
- goto fail3;
+ goto fail4;
tasklet_init(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet,
(void(*)(unsigned long))hvm_assert_evtchn_irq,
@@ -872,6 +878,8 @@ int hvm_vcpu_initialise(struct vcpu *v)
return 0;
+ fail4:
+ nestedhvm_vcpu_destroy(v);
fail3:
hvm_funcs.vcpu_destroy(v);
fail2:
@@ -882,6 +890,12 @@ int hvm_vcpu_initialise(struct vcpu *v)
void hvm_vcpu_destroy(struct vcpu *v)
{
+ int rc;
+
+ rc = nestedhvm_vcpu_destroy(v);
+ if (rc)
+ gdprintk(XENLOG_ERR, "nestedhvm_vcpu_destroy() failed with %i\n", rc);
+
tasklet_kill(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet);
hvm_vcpu_cacheattr_destroy(v);
vlapic_destroy(v);
@@ -3029,6 +3043,16 @@ long do_hvm_op(unsigned long op, XEN_GUE
rc = -EINVAL;
break;
+ case HVM_PARAM_NESTEDHVM:
+ if ( a.value > 1 )
+ rc = -EINVAL;
+ if ( !is_hvm_domain(d) )
+ rc = -EINVAL;
+ /* Remove the check below once we have
+ * shadow-on-shadow.
+ */
+ if ( !paging_mode_hap(d) && a.value )
+ rc = -EINVAL;
}
if ( rc == 0 )
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 11/13] Nested Virtualization: enablement
@ 2010-10-15 13:09 Christoph Egger
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Egger @ 2010-10-15 13:09 UTC (permalink / raw)
To: xen-devel@lists.xensource.com; +Cc: Dong, Eddie, Tim Deegan
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
[-- Attachment #2: xen_nh11_enable.diff --]
[-- Type: text/x-diff, Size: 2229 bytes --]
# HG changeset patch
# User cegger
# Date 1287145236 -7200
Implement generic piece to finally enable nested virtualization
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
diff -r 8649a9cd1da9 -r 14df56ffde2e xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -830,10 +830,16 @@ int hvm_vcpu_initialise(struct vcpu *v)
if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 )
goto fail2;
+ rc = nestedhvm_vcpu_initialise(v);
+ if ( rc < 0 ) {
+ printk("%s: nestedhvm_vcpu_initialise returned %i\n", __func__, rc);
+ goto fail3;
+ }
+
/* Create ioreq event channel. */
rc = alloc_unbound_xen_event_channel(v, 0);
if ( rc < 0 )
- goto fail3;
+ goto fail4;
/* Register ioreq event channel. */
v->arch.hvm_vcpu.xen_port = rc;
@@ -847,7 +853,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
rc = hvm_vcpu_cacheattr_init(v);
if ( rc != 0 )
- goto fail3;
+ goto fail4;
tasklet_init(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet,
(void(*)(unsigned long))hvm_assert_evtchn_irq,
@@ -872,6 +878,8 @@ int hvm_vcpu_initialise(struct vcpu *v)
return 0;
+ fail4:
+ nestedhvm_vcpu_destroy(v);
fail3:
hvm_funcs.vcpu_destroy(v);
fail2:
@@ -882,6 +890,12 @@ int hvm_vcpu_initialise(struct vcpu *v)
void hvm_vcpu_destroy(struct vcpu *v)
{
+ int rc;
+
+ rc = nestedhvm_vcpu_destroy(v);
+ if (rc)
+ gdprintk(XENLOG_ERR, "nestedhvm_vcpu_destroy() failed with %i\n", rc);
+
tasklet_kill(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet);
hvm_vcpu_cacheattr_destroy(v);
vlapic_destroy(v);
@@ -3049,6 +3063,16 @@ long do_hvm_op(unsigned long op, XEN_GUE
rc = -EINVAL;
break;
+ case HVM_PARAM_NESTEDHVM:
+ if ( a.value > 1 )
+ rc = -EINVAL;
+ if ( !is_hvm_domain(d) )
+ rc = -EINVAL;
+ /* Remove the check below once we have
+ * shadow-on-shadow.
+ */
+ if ( !paging_mode_hap(d) && a.value )
+ rc = -EINVAL;
}
if ( rc == 0 )
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 11/13] Nested Virtualization: enablement
@ 2010-11-12 18:44 Christoph Egger
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Egger @ 2010-11-12 18:44 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
[-- Attachment #2: xen_nh11_enable.diff --]
[-- Type: text/x-diff, Size: 2300 bytes --]
# HG changeset patch
# User cegger
# Date 1289584014 -3600
Implement generic piece to finally enable nested virtualization
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
diff -r b18448601670 -r 8eab8e9ce98e xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -818,10 +818,16 @@ int hvm_vcpu_initialise(struct vcpu *v)
if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 )
goto fail2;
+ rc = nestedhvm_vcpu_initialise(v);
+ if ( rc < 0 ) {
+ printk("%s: nestedhvm_vcpu_initialise returned %i\n", __func__, rc);
+ goto fail3;
+ }
+
/* Create ioreq event channel. */
rc = alloc_unbound_xen_event_channel(v, 0);
if ( rc < 0 )
- goto fail3;
+ goto fail4;
/* Register ioreq event channel. */
v->arch.hvm_vcpu.xen_port = rc;
@@ -835,7 +841,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
rc = hvm_vcpu_cacheattr_init(v);
if ( rc != 0 )
- goto fail3;
+ goto fail4;
tasklet_init(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet,
(void(*)(unsigned long))hvm_assert_evtchn_irq,
@@ -860,6 +866,8 @@ int hvm_vcpu_initialise(struct vcpu *v)
return 0;
+ fail4:
+ nestedhvm_vcpu_destroy(v);
fail3:
hvm_funcs.vcpu_destroy(v);
fail2:
@@ -870,6 +878,12 @@ int hvm_vcpu_initialise(struct vcpu *v)
void hvm_vcpu_destroy(struct vcpu *v)
{
+ int rc;
+
+ rc = nestedhvm_vcpu_destroy(v);
+ if (rc)
+ gdprintk(XENLOG_ERR, "nestedhvm_vcpu_destroy() failed with %i\n", rc);
+
tasklet_kill(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet);
hvm_vcpu_cacheattr_destroy(v);
vlapic_destroy(v);
@@ -3039,6 +3053,16 @@ long do_hvm_op(unsigned long op, XEN_GUE
case HVM_PARAM_ACPI_IOPORTS_LOCATION:
rc = pmtimer_change_ioport(d, a.value);
break;
+ case HVM_PARAM_NESTEDHVM:
+ if ( a.value > 1 )
+ rc = -EINVAL;
+ if ( !is_hvm_domain(d) )
+ rc = -EINVAL;
+ /* Remove the check below once we have
+ * shadow-on-shadow.
+ */
+ if ( !paging_mode_hap(d) && a.value )
+ rc = -EINVAL;
}
if ( rc == 0 )
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-12 18:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-12 18:44 [PATCH 11/13] Nested Virtualization: enablement Christoph Egger
-- strict thread matches above, loose matches on Subject: below --
2010-10-15 13:09 Christoph Egger
2010-09-01 15:12 Christoph Egger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.