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
86 lines
2.7 KiB
Diff
86 lines
2.7 KiB
Diff
changeset: 23908:88b6e08b8aa8
|
|
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Thu Oct 06 14:15:43 2011 +0100
|
|
files: xen/arch/x86/mm/p2m.c
|
|
description:
|
|
p2m: query/modify p2mt with p2m_lock held
|
|
|
|
Query and update the p2mt in set_mmio_p2m_entry, clear_mmio_p2m_entry
|
|
and set_shared_p2m_entry with the p2m_lock held.
|
|
|
|
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 | 15 +++++++++------
|
|
1 file changed, 9 insertions(+), 6 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
|
|
@@ -2751,9 +2751,11 @@ set_mmio_p2m_entry(struct p2m_domain *p2
|
|
if ( !paging_mode_translate(p2m->domain) )
|
|
return 0;
|
|
|
|
+ p2m_lock(p2m);
|
|
omfn = gfn_to_mfn_query(p2m, gfn, &ot);
|
|
if ( p2m_is_grant(ot) )
|
|
{
|
|
+ p2m_unlock(p2m);
|
|
domain_crash(p2m->domain);
|
|
return 0;
|
|
}
|
|
@@ -2764,7 +2766,6 @@ set_mmio_p2m_entry(struct p2m_domain *p2
|
|
}
|
|
|
|
P2M_DEBUG("set mmio %lx %lx\n", gfn, mfn_x(mfn));
|
|
- p2m_lock(p2m);
|
|
rc = set_p2m_entry(p2m, gfn, mfn, 0, p2m_mmio_direct, p2m->default_access);
|
|
audit_p2m(p2m, 1);
|
|
p2m_unlock(p2m);
|
|
@@ -2785,18 +2786,20 @@ clear_mmio_p2m_entry(struct p2m_domain *
|
|
if ( !paging_mode_translate(p2m->domain) )
|
|
return 0;
|
|
|
|
- mfn = gfn_to_mfn(p2m, gfn, &t);
|
|
+ p2m_lock(p2m);
|
|
+ mfn = gfn_to_mfn_query(p2m, gfn, &t);
|
|
|
|
/* Do not use mfn_valid() here as it will usually fail for MMIO pages. */
|
|
if ( (INVALID_MFN == mfn_x(mfn)) || (t != p2m_mmio_direct) )
|
|
{
|
|
gdprintk(XENLOG_ERR,
|
|
"clear_mmio_p2m_entry: gfn_to_mfn failed! gfn=%08lx\n", gfn);
|
|
- return 0;
|
|
+ goto out;
|
|
}
|
|
- p2m_lock(p2m);
|
|
rc = set_p2m_entry(p2m, gfn, _mfn(INVALID_MFN), 0, p2m_invalid, p2m->default_access);
|
|
audit_p2m(p2m, 1);
|
|
+
|
|
+out:
|
|
p2m_unlock(p2m);
|
|
|
|
return rc;
|
|
@@ -2813,6 +2816,8 @@ set_shared_p2m_entry(struct p2m_domain *
|
|
if ( !paging_mode_translate(p2m->domain) )
|
|
return 0;
|
|
|
|
+ if ( need_lock )
|
|
+ p2m_lock(p2m);
|
|
omfn = gfn_to_mfn_query(p2m, gfn, &ot);
|
|
/* At the moment we only allow p2m change if gfn has already been made
|
|
* sharable first */
|
|
@@ -2822,8 +2827,6 @@ set_shared_p2m_entry(struct p2m_domain *
|
|
set_gpfn_from_mfn(mfn_x(omfn), INVALID_M2P_ENTRY);
|
|
|
|
P2M_DEBUG("set shared %lx %lx\n", gfn, mfn_x(mfn));
|
|
- if ( need_lock )
|
|
- p2m_lock(p2m);
|
|
rc = set_p2m_entry(p2m, gfn, mfn, 0, p2m_ram_shared, p2m->default_access);
|
|
if ( need_lock )
|
|
p2m_unlock(p2m);
|