From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: [PATCH] Balloon driver crash
Date: Tue, 08 Jun 2010 09:43:10 -0700
Message-ID: <4C0E731E.8060308@goop.org>
References: <alpine.GSO.2.00.1006031434080.4562@algedi.dur.ac.uk>
	<alpine.LFD.2.00.1006032028110.20613@vega4.dur.ac.uk>
	<1275597402.2782.47.camel@localhost.localdomain>
	<201006031738.15635.dcm@mccr.org>
	<alpine.LFD.2.00.1006072027300.3888@vega3.dur.ac.uk>
	<1275983765.24218.49851.camel@zakaz.uk.xensource.com>
	<alpine.GSO.2.00.1006080927520.13054@algedi.dur.ac.uk>
	<1275986577.24218.49951.camel@zakaz.uk.xensource.com>
	<alpine.GSO.2.00.1006081019000.13054@algedi.dur.ac.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <alpine.GSO.2.00.1006081019000.13054@algedi.dur.ac.uk>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: M A Young <m.a.young@durham.ac.uk>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Dave McCracken <dcm@mccr.org>, Ian Campbell <Ian.Campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

On 06/08/2010 02:25 AM, M A Young wrote:
> This patch fixes an error in commit
> f4685d0ed041523d1bd5124c5872459681aca876
> "Add hugepage support to balloon driver" that was causing the balloon
> driver to crash when shrinking the memory used by Domain-0.

Thanks.  But why haven't I seen this?

    J

>
> Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
>
> --- linux-2.6.32.x86_64/drivers/xen/balloon.c.orig    2010-06-05
> 22:43:11.000000000 +0100
> +++ linux-2.6.32.x86_64/drivers/xen/balloon.c    2010-06-05
> 22:47:03.000000000 +0100
> @@ -340,7 +340,7 @@
>                  discontig_free = 1;
>
>              set_phys_to_machine(lpfn, INVALID_P2M_ENTRY);
> -            if (!PageHighMem(page)) {
> +            if (!PageHighMem(pfn_to_page(lpfn))) {
>                  ret = HYPERVISOR_update_va_mapping(
>                      (unsigned long)__va(lpfn << PAGE_SHIFT),
>                      __pte_ma(0), 0);
>