39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Tim Deegan <tim@xen.org>
|
||
|
|
# Date 1322749036 0
|
||
|
|
# Node ID a06cda9fb25f2d7b7b5c7da170813e4a8bb0cd67
|
||
|
|
# Parent 75f4e4d9f039ea656051e6dfd73e40d4cb32896b
|
||
|
|
x86/mm: Don't lose track of the log dirty bitmap
|
||
|
|
|
||
|
|
hap_log_dirty_init unconditionally sets the top of the log dirty
|
||
|
|
bitmap to INVALID_MFN. If there had been a bitmap allocated, it is
|
||
|
|
then leaked, and the host crashes on an ASSERT when the domain is
|
||
|
|
cleaned up.
|
||
|
|
|
||
|
|
Signed-off-by: Tim Deegan <tim@xen.org>
|
||
|
|
Acked-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
|
||
|
|
Committed-by: Tim Deegan <tim@xen.org>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/mm/paging.c
|
||
|
|
+++ b/xen/arch/x86/mm/paging.c
|
||
|
|
@@ -665,7 +665,6 @@ void paging_log_dirty_init(struct domain
|
||
|
|
d->arch.paging.log_dirty.enable_log_dirty = enable_log_dirty;
|
||
|
|
d->arch.paging.log_dirty.disable_log_dirty = disable_log_dirty;
|
||
|
|
d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap;
|
||
|
|
- d->arch.paging.log_dirty.top = _mfn(INVALID_MFN);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* This function fress log dirty bitmap resources. */
|
||
|
|
@@ -686,6 +685,11 @@ int paging_domain_init(struct domain *d,
|
||
|
|
if ( (rc = p2m_init(d)) != 0 )
|
||
|
|
return rc;
|
||
|
|
|
||
|
|
+ /* This must be initialized separately from the rest of the
|
||
|
|
+ * log-dirty init code as that can be called more than once and we
|
||
|
|
+ * don't want to leak any active log-dirty bitmaps */
|
||
|
|
+ d->arch.paging.log_dirty.top = _mfn(INVALID_MFN);
|
||
|
|
+
|
||
|
|
/* The order of the *_init calls below is important, as the later
|
||
|
|
* ones may rewrite some common fields. Shadow pagetables are the
|
||
|
|
* default... */
|