54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
|
Subject: xenpaging: allow only one xenpaging binary per guest
|
||
|
|
|
||
|
|
Make sure only one xenpaging binary is active per domain.
|
||
|
|
Print info when the host lacks the required features for xenpaging.
|
||
|
|
|
||
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||
|
|
Already-Acked-by: Patrick Colp <pjcolp@cs.ubc.ca>
|
||
|
|
Already-Acked-by: Keir Fraser <keir.fraser@citrix.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
v2: use perror for default case
|
||
|
|
|
||
|
|
tools/xenpaging/xenpaging.c | 12 +++++++++++-
|
||
|
|
xen/arch/x86/mm/mem_event.c | 7 +++++++
|
||
|
|
2 files changed, 18 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
|
||
|
|
+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
|
||
|
|
@@ -119,7 +119,17 @@ xenpaging_t *xenpaging_init(domid_t doma
|
||
|
|
paging->mem_event.ring_page);
|
||
|
|
if ( rc != 0 )
|
||
|
|
{
|
||
|
|
- ERROR("Error initialising shared page");
|
||
|
|
+ switch ( errno ) {
|
||
|
|
+ case EBUSY:
|
||
|
|
+ ERROR("xenpaging is (or was) active on this domain");
|
||
|
|
+ break;
|
||
|
|
+ case ENODEV:
|
||
|
|
+ ERROR("EPT not supported for this guest");
|
||
|
|
+ break;
|
||
|
|
+ default:
|
||
|
|
+ perror("Error initialising shared page");
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
goto err;
|
||
|
|
}
|
||
|
|
|
||
|
|
--- xen-4.0.1-testing.orig/xen/arch/x86/mm/mem_event.c
|
||
|
|
+++ xen-4.0.1-testing/xen/arch/x86/mm/mem_event.c
|
||
|
|
@@ -226,6 +226,13 @@ int mem_event_domctl(struct domain *d, x
|
||
|
|
mfn_t ring_mfn;
|
||
|
|
mfn_t shared_mfn;
|
||
|
|
|
||
|
|
+ /* Only one xenpaging at a time. If xenpaging crashed,
|
||
|
|
+ * the cache is in an undefined state and so is the guest
|
||
|
|
+ */
|
||
|
|
+ rc = -EBUSY;
|
||
|
|
+ if ( d->mem_event.enabled )
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
/* Currently only EPT is supported */
|
||
|
|
rc = -ENODEV;
|
||
|
|
if ( !(is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled &&
|