From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mukesh Rathor Subject: [RFC PATCH 6/8]: Ballooning changes Date: Wed, 15 Aug 2012 18:05:41 -0700 Message-ID: <20120815180541.2fddead9@mantra.us.oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Konrad Rzeszutek Wilk , "Xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org --- drivers/xen/balloon.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 31ab82f..57960a1 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -358,10 +358,18 @@ static enum bp_state increase_reservation(unsigned long nr_pages) BUG_ON(!xen_feature(XENFEAT_auto_translated_physmap) && phys_to_machine_mapping_valid(pfn)); - set_phys_to_machine(pfn, frame_list[i]); - + if (!xen_pvh_domain()) { + set_phys_to_machine(pfn, frame_list[i]); + } else { + pte_t *ptep; + unsigned int level; + void *addr = __va(pfn << PAGE_SHIFT); + ptep = lookup_address((unsigned long)addr, &level); + set_pte(ptep, pfn_pte(pfn, PAGE_KERNEL)); + } /* Link back into the page tables if not highmem. */ - if (xen_pv_domain() && !PageHighMem(page)) { + if (xen_pv_domain() && !PageHighMem(page) && + !xen_pvh_domain()) { int ret; ret = HYPERVISOR_update_va_mapping( (unsigned long)__va(pfn << PAGE_SHIFT), @@ -417,7 +425,14 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp) scrub_page(page); - if (xen_pv_domain() && !PageHighMem(page)) { + if (xen_pvh_domain() && !PageHighMem(page)) { + unsigned int level; + pte_t *ptep; + void *addr = __va(pfn << PAGE_SHIFT); + ptep = lookup_address((unsigned long)addr, &level); + set_pte(ptep, __pte(0)); + + } else if (xen_pv_domain() && !PageHighMem(page)) { ret = HYPERVISOR_update_va_mapping( (unsigned long)__va(pfn << PAGE_SHIFT), __pte_ma(0), 0); @@ -433,7 +448,8 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp) /* No more mappings: invalidate P2M and add to balloon. */ for (i = 0; i < nr_pages; i++) { pfn = mfn_to_pfn(frame_list[i]); - __set_phys_to_machine(pfn, INVALID_P2M_ENTRY); + if (!xen_pvh_domain()) + __set_phys_to_machine(pfn, INVALID_P2M_ENTRY); balloon_append(pfn_to_page(pfn)); } -- 1.7.2.3