Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757740Ab1COOVY (ORCPT ); Tue, 15 Mar 2011 10:21:24 -0400 Received: from router-fw.net-space.pl ([89.174.63.77]:34459 "EHLO router-fw.net-space.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755731Ab1COOVW (ORCPT ); Tue, 15 Mar 2011 10:21:22 -0400 Date: Tue, 15 Mar 2011 15:18:37 +0100 From: Daniel Kiper To: Stefano Stabellini Cc: Daniel Kiper , Ian Campbell , "akpm@linux-foundation.org" , "andi.kleen@intel.com" , "haicheng.li@linux.intel.com" , "fengguang.wu@intel.com" , "jeremy@goop.org" , "konrad.wilk@oracle.com" , Dan Magenheimer , "v.tolstov@selfip.ru" , "pasik@iki.fi" , "dave@linux.vnet.ibm.com" , "wdauchy@gmail.com" , "rientjes@google.com" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" Subject: Re: [PATCH R4 2/7] xen/balloon: HVM mode support Message-ID: <20110315141837.GA12730@router-fw-old.local.net-space.pl> References: <20110308214636.GC27331@router-fw-old.local.net-space.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.28i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2005 Lines: 65 On Wed, Mar 09, 2011 at 01:58:30PM +0000, Stefano Stabellini wrote: > On Tue, 8 Mar 2011, Daniel Kiper wrote: > > HVM mode support. > > I have already a patch in linux-next to do this, please give a look at > "xen: make the ballon driver work for hvm domains": > > git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git linux-next OK, I will remove this patch from memory hotplug patchset, however: @@ -232,7 +232,7 @@ static int increase_reservation(unsigned long nr_pages) set_phys_to_machine(pfn, frame_list[i]); /* Link back into the page tables if not highmem. */ - if (pfn < max_low_pfn) { + if (!xen_hvm_domain() && pfn < max_low_pfn) { Why do not write it as: if (xen_pv_domain() && !PageHighMem(page)) ... For me it is simpler to read (xen_pv_domain()) and make it similar to relevant part in decrease_reservation() (!PageHighMem(page)). @@ -280,7 +280,7 @@ static int decrease_reservation(unsigned long nr_pages) scrub_page(page); - if (!PageHighMem(page)) { + if (!xen_hvm_domain() && !PageHighMem(page)) { As above. @@ -392,15 +392,19 @@ static struct notifier_block xenstore_notifier; static int __init balloon_init(void) { - unsigned long pfn, extra_pfn_end; + unsigned long pfn, nr_pages, extra_pfn_end; struct page *page; - if (!xen_pv_domain()) + if (!xen_domain()) return -ENODEV; pr_info("xen_balloon: Initialising balloon driver.\n"); - balloon_stats.current_pages = min(xen_start_info->nr_pages, max_pfn); + if (xen_pv_domain()) + nr_pages = xen_start_info->nr_pages; + else + nr_pages = max_pfn; + balloon_stats.current_pages = min(nr_pages, max_pfn); It could be simplified: balloon_stats.current_pages = xen_pv_domain() ? min(xen_start_info->nr_pages, max_pfn) : max_pfn; Daniel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/