Olaf Hering
3e2a25f4c0
24269-mem_event_move_mem_event_domain_out_of_struct_domain.patch 24270-Free_d-mem_event_on_domain_destruction..patch - fate#310510 - fix xenpaging 24318-x86-mm_Fix_checks_during_foreign_mapping_of_paged_pages.patch - fate#310510 - fix xenpaging 23949-constify_vcpu_set_affinitys_second_parameter.patch - fate#310510 - fix xenpaging 24105-xenpaging_compare_domain_pointer_in_p2m_mem_paging_populate.patch 24106-mem_event_check_capabilities_only_once.patch - fate#310510 - fix xenpaging 24272-xenpaging_Fix_c-s_235070a29c8c3ddf7_update_machine_to_phys_mapping_during_page_deallocation.patch - bnc#727081 - xend domains don't work anymore since update from 12.1 beta to 12.1 RC 1 24344-tools-x86_64_Fix_cpuid_inline_asm_to_not_clobber_stacks_red_zone.patch 24345-tools-libxc_Fix_x86_32_build_breakage_in_previous_changeset..patch - bnc#733449 - Panic in mcfg_ioremap when booting xen-dbg.gz on Xeon E3-1230 24341-x86-64-mmcfg_remove___initdata_annotation_overlooked_in_23749e8d1c8f074ba.patch - fate#310510 - fix xenpaging backport waitqueue changes from xen-unstable 24104-waitqueue_Double_size_of_x86_shadow_stack..patch 24171-x86waitqueue_Allocate_whole_page_for_shadow_stack..patch 24195-waitqueue_Detect_saved-stack_overflow_and_crash_the_guest..patch 24196-waitqueue_Reorder_prepare_to_wait_so_that_vcpu_is_definitely_on_the.patch 24197-x86-waitqueue_Because_we_have_per-cpu_stacks_we_must_wake_up_on_teh.patch 24231-waitqueue_Implement_wake_up_nroneall..patch 24232-waitqueue_Hold_a_reference_to_a_domain_on_a_waitqueue..patch - fate#310510 - fix xenpaging 24227-xenpaging_restrict_pagefile_permissions.patch - fate#310510 - fix xenpaging merge upstream version of our existing patches: 24218-libxc_add_bitmap_clear_function.patch remove old versions: xenpaging.bitmap_clear.patch - fate#310510 - fix xenpaging merge upstream version of our existing patches: 24138-xenpaging_munmap_all_pages_after_page-in.patch 24208-xenpaging_remove_filename_from_comment.patch 24209-xenpaging_remove_obsolete_comment_in_resume_path.patch 24210-xenpaging_use_PERROR_to_print_errno.patch 24211-xenpaging_simplify_file_op.patch 24212-xenpaging_print_gfn_in_failure_case.patch 24213-xenpaging_update_xenpaging_init.patch 24214-xenpaging_remove_xc_dominfo_t_from_paging_t.patch 24215-xenpaging_track_the_number_of_paged-out_pages.patch 24216-xenpaging_move_page_add-resume_loops_into_its_own_function..patch 24217-xenpaging_improve_mainloop_exit_handling.patch 24219-xenpaging_retry_unpageable_gfns.patch 24220-xenpaging_install_into_LIBEXEC_dir.patch 24221-xenpaging_add_XEN_PAGING_DIR_-_libxl_xenpaging_dir_path.patch 24222-xenpaging_use_guests_tot_pages_as_working_target.patch 24223-xenpaging_watch_the_guests_memory-target-tot_pages_xenstore_value.patch 24224-xenpaging_add_cmdline_interface_for_pager.patch 24225-xenpaging_improve_policy_mru_list_handling.patch 24226-xenpaging_add_debug_to_show_received_watch_event..patch remove old versions: xenpaging.XEN_PAGING_DIR.patch xenpaging.add_evict_pages.patch xenpaging.cmdline-interface.patch xenpaging.encapsulate_domain_info.patch xenpaging.file_op-return-code.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 - bnc#733348 - Use 'xm' in various scripts if xend is running. Modified xmclone.sh and xen-updown.sh - Only emit xl warning when xend is running and -f (force) flag is not specified. Modified disable-xl-when-using-xend.patch - Upstream patches from Jan 24190-hap-log-dirty-disable-rc.patch 24193-hap-track-dirty-vram-rc.patch 24201-x86-pcpu-platform-op.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=161
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
changeset: 24219:8eba32b9598c
|
|
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Sun Nov 20 17:02:41 2011 +0100
|
|
files: tools/xenpaging/policy_default.c
|
|
description:
|
|
xenpaging: retry unpageable gfns
|
|
|
|
Nomination of gfns can fail, but may succeed later.
|
|
Thats the case for a guest that starts ballooned.
|
|
|
|
v2:
|
|
- print debug when clearing uncosumed happens
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
Committed-by: Ian Jackson <ian.jackson.citrix.com>
|
|
|
|
|
|
---
|
|
tools/xenpaging/policy_default.c | 14 ++++++++++++++
|
|
1 file changed, 14 insertions(+)
|
|
|
|
Index: xen-4.1.2-testing/tools/xenpaging/policy_default.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/policy_default.c
|
|
+++ xen-4.1.2-testing/tools/xenpaging/policy_default.c
|
|
@@ -32,6 +32,7 @@ static unsigned int i_mru;
|
|
static unsigned int mru_size;
|
|
static unsigned long *bitmap;
|
|
static unsigned long *unconsumed;
|
|
+static unsigned int unconsumed_cleared;
|
|
static unsigned long current_gfn;
|
|
static unsigned long max_pages;
|
|
|
|
@@ -87,8 +88,21 @@ int policy_choose_victim(xenpaging_t *pa
|
|
current_gfn++;
|
|
if ( current_gfn >= max_pages )
|
|
current_gfn = 0;
|
|
+ /* Could not nominate any gfn */
|
|
if ( wrap == current_gfn )
|
|
{
|
|
+ /* Count wrap arounds */
|
|
+ unconsumed_cleared++;
|
|
+ /* Force retry every few seconds (depends on poll() timeout) */
|
|
+ if ( unconsumed_cleared > 123)
|
|
+ {
|
|
+ /* Force retry of unconsumed gfns */
|
|
+ bitmap_clear(unconsumed, max_pages);
|
|
+ unconsumed_cleared = 0;
|
|
+ DPRINTF("clearing unconsumed, wrap %lx", wrap);
|
|
+ /* One more round before returning ENOSPC */
|
|
+ continue;
|
|
+ }
|
|
victim->gfn = INVALID_MFN;
|
|
return -ENOSPC;
|
|
}
|