This change reverses the task of xenpaging. Before this change a fixed number of pages was paged out. With this change the guest will not have access to more than the given number of pages at the same time. The xenpaging= config option is replaced by actmem= A new xm mem-swap-target is added. The xenpaging binary is moved to /usr/lib/xen/bin/ xenpaging.HVMCOPY_gfn_paged_out.patch xenpaging.XEN_PAGING_DIR.patch xenpaging.add_evict_pages.patch xenpaging.bitmap_clear.patch xenpaging.cmdline-interface.patch xenpaging.encapsulate_domain_info.patch xenpaging.file_op-return-code.patch xenpaging.guest-memusage.patch xenpaging.install-to-libexec.patch xenpaging.low_target_policy_nomru.patch xenpaging.main-loop-exit-handling.patch xenpaging.misleading-comment.patch xenpaging.page_in-munmap-size.patch xenpaging.print-gfn.patch xenpaging.record-numer-paged-out-pages.patch xenpaging.reset-uncomsumed.patch xenpaging.stale-comments.patch xenpaging.target-tot_pages.patch xenpaging.use-PERROR.patch xenpaging.watch-target-tot_pages.patch xenpaging.watch_event-DPRINTF.patch xenpaging.xc_interface_open-comment.patch - xen.spec: update filelist package /usr/lib*/xen with wildcard to pickup new files remove duplicate /usr/sbin/xen-list from filelist OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=157
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
# HG changeset patch
|
|
# Parent 8e31f3194c87e1cdb41621caa5a41810ef787293
|
|
xenpaging: track the number of paged-out pages
|
|
|
|
This change is required by subsequent changes.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
tools/xenpaging/xenpaging.c | 8 ++++++++
|
|
tools/xenpaging/xenpaging.h | 1 +
|
|
2 files changed, 9 insertions(+)
|
|
|
|
Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.c
|
|
+++ xen-4.1.2-testing/tools/xenpaging/xenpaging.c
|
|
@@ -467,6 +467,9 @@ static int xenpaging_evict_page(xenpagin
|
|
/* Notify policy of page being paged out */
|
|
policy_notify_paged_out(victim->gfn);
|
|
|
|
+ /* Record number of evicted pages */
|
|
+ paging->num_paged_out++;
|
|
+
|
|
out:
|
|
return ret;
|
|
}
|
|
@@ -480,8 +483,13 @@ static int xenpaging_resume_page(xenpagi
|
|
|
|
/* Notify policy of page being paged in */
|
|
if ( notify_policy )
|
|
+ {
|
|
policy_notify_paged_in(rsp->gfn);
|
|
|
|
+ /* Record number of resumed pages */
|
|
+ paging->num_paged_out--;
|
|
+ }
|
|
+
|
|
/* Tell Xen page is ready */
|
|
ret = xc_mem_paging_resume(paging->xc_handle, paging->mem_event.domain_id,
|
|
rsp->gfn);
|
|
Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.h
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.h
|
|
+++ xen-4.1.2-testing/tools/xenpaging/xenpaging.h
|
|
@@ -49,6 +49,7 @@ typedef struct xenpaging {
|
|
mem_event_t mem_event;
|
|
/* number of pages for which data structures were allocated */
|
|
int max_pages;
|
|
+ int num_paged_out;
|
|
int num_pages;
|
|
int policy_mru_size;
|
|
unsigned long pagein_queue[XENPAGING_PAGEIN_QUEUE_SIZE];
|