Olaf Hering
e2d8bf077a
Merge paging related fixes from xen-unstable: 23506-x86_Disable_set_gpfn_from_mfn_until_m2p_table_is_allocated..patch 23507-xenpaging_update_machine_to_phys_mapping_during_page_deallocation.patch 23509-x86_32_Fix_build_Define_machine_to_phys_mapping_valid.patch 23562-xenpaging_remove_unused_spinlock_in_pager.patch 23576-x86_show_page_walk_also_for_early_page_faults.patch 23577-tools_merge_several_bitop_functions_into_xc_bitops.h.patch 23578-xenpaging_add_xs_handle_to_struct_xenpaging.patch 23579-xenpaging_drop_xc.c_remove_ASSERT.patch 23580-xenpaging_drop_xc.c_remove_xc_platform_info_t.patch 23581-xenpaging_drop_xc.c_remove_xc_wait_for_event.patch 23582-xenpaging_drop_xc.c_move_xc_mem_paging_flush_ioemu_cache.patch 23583-xenpaging_drop_xc.c_move_xc_wait_for_event_or_timeout.patch 23584-xenpaging_drop_xc.c_remove_xc_files.patch 23585-xenpaging_correct_dropping_of_pages_to_avoid_full_ring_buffer.patch 23586-xenpaging_do_not_bounce_p2mt_back_to_the_hypervisor.patch 23587-xenpaging_remove_srand_call.patch 23588-xenpaging_remove_return_values_from_functions_that_can_not_fail.patch 23589-xenpaging_catch_xc_mem_paging_resume_errors.patch 23590-xenpaging_remove_local_domain_id_variable.patch 23591-xenpaging_move_num_pages_into_xenpaging_struct.patch 23592-xenpaging_start_paging_in_the_middle_of_gfn_range.patch 23593-xenpaging_pass_integer_to_xenpaging_populate_page.patch 23594-xenpaging_add_helper_function_for_unlinking_pagefile.patch 23595-xenpaging_add_watch_thread_to_catch_guest_shutdown.patch 23596-xenpaging_implement_stopping_of_pager_by_sending_SIGTERM-SIGINT.patch 23597-xenpaging_remove_private_mem_event.h.patch 23599-tools_fix_build_after_recent_xenpaging_changes.patch 23817-mem_event_add_ref_counting_for_free_requestslots.patch 23818-mem_event_use_mem_event_mark_and_pause_in_mem_event_check_ring.patch 23827-xenpaging_use_batch_of_pages_during_final_page-in.patch 23841-mem_event_pass_mem_event_domain_pointer_to_mem_event_functions.patch 23842-mem_event_use_different_ringbuffers_for_share_paging_and_access.patch 23874-xenpaging_track_number_of_paged_pages_in_struct_domain.patch 23904-xenpaging_use_p2m-get_entry_in_p2m_mem_paging_functions.patch 23905-xenpaging_fix_locking_in_p2m_mem_paging_functions.patch 23906-xenpaging_remove_confusing_comment_from_p2m_mem_paging_populate.patch 23908-p2m_query-modify_p2mt_with_p2m_lock_held.patch 23943-xenpaging_clear_page_content_after_evict.patch 23953-xenpaging_handle_evict_failures.patch 23978-xenpaging_check_p2mt_in_p2m_mem_paging_functions.patch 23979-xenpaging_document_p2m_mem_paging_functions.patch 23980-xenpaging_disallow_paging_in_a_PoD_guest.patch Remove obsolete patches: x86-show-page-walk-early.patch xenpaging.23817-mem_event_check_ring.patch xenpaging.catch-xc_mem_paging_resume-error.patch xenpaging.guest_remove_page.slow_path.patch xenpaging.mem_event-no-p2mt.patch xenpaging.no-srand.patch xenpaging.return-void.patch xenpaging.xenpaging_populate_page-gfn.patch - xen.spec: use changeset number as patch number for upstream patches OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=151
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
changeset: 23978:fd3fa0a85020
|
|
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Thu Oct 20 11:25:55 2011 +0100
|
|
files: xen/arch/x86/mm/p2m.c
|
|
description:
|
|
xenpaging: check p2mt in p2m_mem_paging functions
|
|
|
|
Add checks to forward the p2m_ram_paging* state properly during page-in.
|
|
|
|
Resume can be called several times if several vcpus called populate for
|
|
the gfn. Finish resume only once.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
Acked-by: Tim Deegan <tim@xen.org>
|
|
Committed-by: Tim Deegan <tim@xen.org>
|
|
|
|
|
|
---
|
|
xen/arch/x86/mm/p2m.c | 20 ++++++++++++++++----
|
|
1 file changed, 16 insertions(+), 4 deletions(-)
|
|
|
|
Index: xen-4.1.2-testing/xen/arch/x86/mm/p2m.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/xen/arch/x86/mm/p2m.c
|
|
+++ xen-4.1.2-testing/xen/arch/x86/mm/p2m.c
|
|
@@ -3020,16 +3020,22 @@ int p2m_mem_paging_prep(struct p2m_domai
|
|
p2m_type_t p2mt;
|
|
p2m_access_t a;
|
|
mfn_t mfn;
|
|
- int ret = -ENOMEM;
|
|
+ int ret;
|
|
|
|
p2m_lock(p2m);
|
|
|
|
mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, p2m_query);
|
|
|
|
+ ret = -ENOENT;
|
|
+ /* Allow only missing pages */
|
|
+ if ( p2mt != p2m_ram_paging_in_start )
|
|
+ goto out;
|
|
+
|
|
/* Allocate a page if the gfn does not have one yet */
|
|
if ( !mfn_valid(mfn) )
|
|
{
|
|
/* Get a free page */
|
|
+ ret = -ENOMEM;
|
|
page = alloc_domheap_page(p2m->domain, 0);
|
|
if ( unlikely(page == NULL) )
|
|
goto out;
|
|
@@ -3064,9 +3070,15 @@ void p2m_mem_paging_resume(struct p2m_do
|
|
{
|
|
p2m_lock(p2m);
|
|
mfn = p2m->get_entry(p2m, rsp.gfn, &p2mt, &a, p2m_query);
|
|
- set_p2m_entry(p2m, rsp.gfn, mfn, 0, p2m_ram_rw, a);
|
|
- set_gpfn_from_mfn(mfn_x(mfn), rsp.gfn);
|
|
- audit_p2m(p2m, 1);
|
|
+ /* Allow only pages which were prepared properly, or pages which
|
|
+ * were nominated but not evicted */
|
|
+ if ( mfn_valid(mfn) &&
|
|
+ (p2mt == p2m_ram_paging_in || p2mt == p2m_ram_paging_in_start) )
|
|
+ {
|
|
+ set_p2m_entry(p2m, rsp.gfn, mfn, 0, p2m_ram_rw, a);
|
|
+ set_gpfn_from_mfn(mfn_x(mfn), rsp.gfn);
|
|
+ audit_p2m(p2m, 1);
|
|
+ }
|
|
p2m_unlock(p2m);
|
|
}
|
|
|