9a05aa7fc4
22707-x2apic-preenabled-check.patch - bnc#641419 - L3: Xen: qemu-dm reports "xc_map_foreign_batch: mmap failed: Cannot allocate memory" 7434-qemu-rlimit-as.patch - Additional or upstream patches from Jan 22693-fam10-mmio-conf-base-protect.patch 22694-x86_64-no-weak.patch 22708-xenctx-misc.patch 21432-4.0-cpu-boot-failure.patch 22645-amd-flush-filter.patch qemu-fix-7433.patch - Maintain compatibility with the extid flag even though it is deprecated for both legacy and sxp config files. hv_extid_compatibility.patch - bnc#649209-improve suspend eventchn lock suspend_evtchn_lock.patch - Removed the hyper-v shim patches in favor of using the upstream version. - bnc#641419 - L3: Xen: qemu-dm reports "xc_map_foreign_batch: mmap failed: Cannot allocate memory" qemu-rlimit-as.patch - Upstream c/s 7433 to replace qemu_altgr_more.patch 7433-qemu-altgr.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=90
87 lines
3.3 KiB
Diff
87 lines
3.3 KiB
Diff
Subject: xenpaging: update machine_to_phys_mapping during page-in and page deallocation
|
|
|
|
The machine_to_phys_mapping array needs updating during page-in, and
|
|
during page deallocation. If a page is gone, a call to
|
|
get_gpfn_from_mfn will still return the old gfn for an already paged-out
|
|
page. This happens when the entire guest ram is paged-out before
|
|
xen_vga_populate_vram() runs. Then XENMEM_populate_physmap is called
|
|
with gfn 0xff000. A new page is allocated with alloc_domheap_pages.
|
|
This new page does not have a gfn yet. However, in
|
|
guest_physmap_add_entry() the passed mfn maps still to an old gfn
|
|
(perhaps from another old guest). This old gfn is in paged-out state in
|
|
this guests context and has no mfn anymore. As a result, the ASSERT()
|
|
triggers because p2m_is_ram() is true for p2m_ram_paging* types.
|
|
|
|
If the machine_to_phys_mapping array is updated properly, both loops in
|
|
guest_physmap_add_entry() turn into no-ops for the new page and the
|
|
mfn/gfn mapping will be done at the end of the function.
|
|
|
|
The same thing needs to happen dring a page-in, the current gfn must be
|
|
written for the page.
|
|
|
|
If XENMEM_add_to_physmap is used with XENMAPSPACE_gmfn,
|
|
get_gpfn_from_mfn() will return an appearently valid gfn. As a result,
|
|
guest_physmap_remove_page() is called. The ASSERT in p2m_remove_page
|
|
triggers because the passed mfn does not match the old mfn for the
|
|
passed gfn.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
v3:
|
|
invalidate machine_to_phys_mapping[] during page deallocation
|
|
v2:
|
|
call set_gpfn_from_mfn only if mfn is valid
|
|
|
|
xen/arch/x86/mm/p2m.c | 13 ++++++++++---
|
|
xen/common/page_alloc.c | 9 +++++++++
|
|
2 files changed, 19 insertions(+), 3 deletions(-)
|
|
|
|
Index: xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/xen/arch/x86/mm/p2m.c
|
|
+++ xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
|
|
@@ -2595,9 +2595,16 @@ void p2m_mem_paging_resume(struct domain
|
|
|
|
/* Fix p2m entry */
|
|
mfn = gfn_to_mfn(d, rsp.gfn, &p2mt);
|
|
- p2m_lock(d->arch.p2m);
|
|
- set_p2m_entry(d, rsp.gfn, mfn, 0, p2m_ram_rw);
|
|
- p2m_unlock(d->arch.p2m);
|
|
+ if ( mfn_valid(mfn) )
|
|
+ {
|
|
+ p2m_lock(d->arch.p2m);
|
|
+ set_p2m_entry(d, rsp.gfn, mfn, 0, p2m_ram_rw);
|
|
+ set_gpfn_from_mfn(mfn_x(mfn), rsp.gfn);
|
|
+ p2m_unlock(d->arch.p2m);
|
|
+ } else {
|
|
+ gdprintk(XENLOG_ERR, "invalid mfn %lx for gfn %lx p2mt %x flags %lx\n",
|
|
+ mfn_x(mfn), rsp.gfn, p2mt, (unsigned long)rsp.flags);
|
|
+ }
|
|
|
|
/* Unpause domain */
|
|
if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED )
|
|
Index: xen-4.0.1-testing/xen/common/page_alloc.c
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/xen/common/page_alloc.c
|
|
+++ xen-4.0.1-testing/xen/common/page_alloc.c
|
|
@@ -1178,9 +1178,18 @@ void free_domheap_pages(struct page_info
|
|
{
|
|
int i, drop_dom_ref;
|
|
struct domain *d = page_get_owner(pg);
|
|
+ unsigned long mfn;
|
|
|
|
ASSERT(!in_irq());
|
|
|
|
+ /* this page is not a gfn anymore */
|
|
+ mfn = page_to_mfn(pg);
|
|
+ if ( mfn_valid(mfn) )
|
|
+ {
|
|
+ for ( i = 0; i < (1 << order); i++ )
|
|
+ set_gpfn_from_mfn(mfn + i, INVALID_M2P_ENTRY);
|
|
+ }
|
|
+
|
|
if ( unlikely(is_xen_heap_page(pg)) )
|
|
{
|
|
/* NB. May recursively lock from relinquish_memory(). */
|