From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andres Lagar-Cavilla Subject: [PATCH 1 of 3] Improvements over API change for p2m lookups Date: Tue, 08 Nov 2011 16:42:24 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: olaf@aepfle.de, George.Dunlap@eu.citrix.com, andres@gridcentric.ca, tim@xen.org, keir.xen@gmail.com, adin@gridcentric.ca List-Id: xen-devel@lists.xenproject.org xen/arch/x86/hvm/hvm.c | 3 +-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/common/grant_table.c | 2 +- xen/common/memory.c | 6 +++++- 4 files changed, 11 insertions(+), 8 deletions(-) Ranging from the cosmetic to actual bug fixing. Signed-off-by: Andres Lagar-Cavilla diff -r 390d6dc6c34b -r a0c55cc5d696 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1791,8 +1791,7 @@ int hvm_virtual_to_linear_addr( return 0; } -/* We leave this function holding a lock on the p2m entry and a ref - * on the mapped mfn */ +/* We leave this function holding a lock on the p2m entry */ static void *__hvm_map_guest_frame(unsigned long gfn, bool_t writable) { unsigned long mfn; diff -r 390d6dc6c34b -r a0c55cc5d696 xen/arch/x86/mm/p2m.c --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -349,21 +349,21 @@ void p2m_teardown(struct p2m_domain *p2m if (p2m == NULL) return; + p2m_lock(p2m); + #ifdef __x86_64__ for ( gfn=0; gfn < p2m->max_mapped_pfn; gfn++ ) { - mfn = get_gfn_query(d, gfn, &t); + p2m_access_t a; + mfn = p2m->get_entry(p2m, gfn, &t, &a, p2m_query, NULL); if ( mfn_valid(mfn) && (t == p2m_ram_shared) ) { ASSERT(!p2m_is_nestedp2m(p2m)); BUG_ON(mem_sharing_unshare_page(d, gfn, MEM_SHARING_DESTROY_GFN)); } - put_gfn(d, gfn); } #endif - p2m_lock(p2m); - p2m->phys_table = pagetable_null(); while ( (pg = page_list_remove_head(&p2m->pages)) ) diff -r 390d6dc6c34b -r a0c55cc5d696 xen/common/grant_table.c --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -470,7 +470,7 @@ __gnttab_map_grant_ref( struct domain *ld, *rd, *owner; struct vcpu *led; int handle; - unsigned long gfn = INVALID_GFN; + unsigned long gfn = INVALID_GFN; unsigned long frame = 0, nr_gets = 0; struct page_info *pg; int rc = GNTST_okay; diff -r 390d6dc6c34b -r a0c55cc5d696 xen/common/memory.c --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -270,7 +270,7 @@ static long memory_exchange(XEN_GUEST_HA PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k; + unsigned long i, j, k = 0; /* gcc ... */ unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -496,8 +496,12 @@ static long memory_exchange(XEN_GUEST_HA fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) + { + put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) BUG(); + } + dying: rcu_unlock_domain(d); /* Free any output pages we managed to allocate. */