8f6e1e085f
- pass -j N to stubdom build - add xenalzye from http://xenbits.xensource.com/ext/xenalyze.hg - hotplug-block-losetup-a.patch allow hardlinked blockdevices - fate#310510 - fix xenpaging xenpaging.paging_prep_enomem.patch - retry page-in if guest is temporary out-of-memory xenpaging.print-arguments.patch - print arguments passed to xenpaging xenpaging.machine_to_phys_mapping.patch - invalidate array during page deallocation xenpaging.autostart_delay.patch - fold xenpaging.enabled.patch into this patch - set xenpaging_delay to 0.0 to start xenpaging right away - blktap2 patch - fix problem that blktap2 device info not cleared when block-attach fail. blktap2.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=88
76 lines
2.4 KiB
Diff
76 lines
2.4 KiB
Diff
Subject: xenpaging: handle temporary out-of-memory conditions during page-in
|
|
|
|
p2m_mem_paging_prep() should return -ENOMEM if a new page could not be
|
|
allocated. This can be handled in xenpaging to retry the page-in. Right
|
|
now such condition would stall the guest because the requested page will
|
|
not come back, xenpaging simply exits. So xenpaging could very well
|
|
retry the allocation forever to rescue the guest.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
tools/xenpaging/xenpaging.c | 27 ++++++++++++++++++++-------
|
|
xen/arch/x86/mm/p2m.c | 2 +-
|
|
2 files changed, 21 insertions(+), 8 deletions(-)
|
|
|
|
--- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
|
|
+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
|
|
@@ -23,6 +23,7 @@
|
|
#include <inttypes.h>
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
+#include <unistd.h>
|
|
#include <xc_private.h>
|
|
|
|
#include <xen/mem_event.h>
|
|
@@ -409,19 +410,31 @@ static int xenpaging_populate_page(
|
|
unsigned long _gfn;
|
|
void *page;
|
|
int ret;
|
|
+ unsigned char oom = 0;
|
|
|
|
- /* Tell Xen to allocate a page for the domain */
|
|
- ret = xc_mem_paging_prep(paging->xc_handle, paging->mem_event.domain_id,
|
|
- *gfn);
|
|
- if ( ret != 0 )
|
|
+ _gfn = *gfn;
|
|
+ do
|
|
{
|
|
- ERROR("Error preparing for page in");
|
|
- goto out_map;
|
|
+ /* Tell Xen to allocate a page for the domain */
|
|
+ ret = xc_mem_paging_prep(paging->xc_handle, paging->mem_event.domain_id,
|
|
+ _gfn);
|
|
+ if ( ret != 0 )
|
|
+ {
|
|
+ if ( errno == ENOMEM )
|
|
+ {
|
|
+ if ( oom++ == 0 )
|
|
+ DPRINTF("ENOMEM while preparing gfn %lx\n", _gfn);
|
|
+ sleep(1);
|
|
+ continue;
|
|
+ }
|
|
+ ERROR("Error preparing for page in");
|
|
+ goto out_map;
|
|
+ }
|
|
}
|
|
+ while ( ret && !interrupted );
|
|
|
|
/* Map page */
|
|
ret = -EFAULT;
|
|
- _gfn = *gfn;
|
|
page = xc_map_foreign_pages(paging->xc_handle, paging->mem_event.domain_id,
|
|
PROT_READ | PROT_WRITE, &_gfn, 1);
|
|
*gfn = _gfn;
|
|
--- xen-4.0.1-testing.orig/xen/arch/x86/mm/p2m.c
|
|
+++ xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
|
|
@@ -2614,7 +2614,7 @@ int p2m_mem_paging_prep(struct domain *d
|
|
/* Get a free page */
|
|
page = alloc_domheap_page(d, 0);
|
|
if ( unlikely(page == NULL) )
|
|
- return -EINVAL;
|
|
+ return -ENOMEM;
|
|
|
|
/* Fix p2m mapping */
|
|
p2m_lock(d->arch.p2m);
|