From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753602AbbCSQTC (ORCPT <rfc822;w@1wt.eu>);
	Thu, 19 Mar 2015 12:19:02 -0400
Received: from smtp.citrix.com ([66.165.176.89]:33097 "EHLO SMTP.CITRIX.COM"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751183AbbCSQS6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 19 Mar 2015 12:18:58 -0400
X-IronPort-AV: E=Sophos;i="5.11,430,1422921600"; 
   d="scan'208";a="245008422"
Message-ID: <550AF6EE.9010404@citrix.com>
Date: Thu, 19 Mar 2015 16:18:54 +0000
From: David Vrabel <david.vrabel@citrix.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.4.0
MIME-Version: 1.0
To: Juergen Gross <jgross@suse.com>, <linux-kernel@vger.kernel.org>,
        <xen-devel@lists.xensource.com>, <konrad.wilk@oracle.com>,
        <david.vrabel@citrix.com>, <boris.ostrovsky@oracle.com>,
        <daniel.kiper@oracle.com>
Subject: Re: [Xen-devel] [PATCH 2/2] xen: before ballooning hotplugged memory,
 set frames to invalid
References: <1426775462-981-1-git-send-email-jgross@suse.com>
 <1426775462-981-3-git-send-email-jgross@suse.com>
In-Reply-To: <1426775462-981-3-git-send-email-jgross@suse.com>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
X-DLP: MIA2
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 19/03/15 14:31, Juergen Gross wrote:
> Commit 25b884a83d487fd62c3de7ac1ab5549979188482 ("x86/xen: set
> regions above the end of RAM as 1:1") introduced a regression.
> 
> To be able to add memory pages which were added via memory hotplug to
> a pv domain, the pages must be "invalid" instead of "identity" in the
> p2m list before they can be added.
[...]
> --- a/drivers/xen/balloon.c
> +++ b/drivers/xen/balloon.c
> @@ -221,15 +221,24 @@ static bool balloon_is_inflated(void)
>  
>  static enum bp_state reserve_additional_memory(long credit)
>  {
> -	int nid, rc;
> +	int nid, rc = 0;
>  	u64 hotplug_start_paddr;
>  	unsigned long balloon_hotplug = credit;
> +	unsigned long pfn;
>  
>  	hotplug_start_paddr = PFN_PHYS(SECTION_ALIGN_UP(max_pfn));
>  	balloon_hotplug = round_up(balloon_hotplug, PAGES_PER_SECTION);
>  	nid = memory_add_physaddr_to_nid(hotplug_start_paddr);
>  
> -	rc = add_memory(nid, hotplug_start_paddr, balloon_hotplug << PAGE_SHIFT);
> +	for (pfn = PFN_DOWN(hotplug_start_paddr);
> +	     !rc && pfn < PFN_DOWN(hotplug_start_paddr) + balloon_hotplug;
> +	     pfn++)
> +		if (!set_phys_to_machine(pfn, INVALID_P2M_ENTRY))
> +			rc = 1;

    rc = -ENOMEM;
    break;

> +
> +	if (!rc)
> +		rc = add_memory(nid, hotplug_start_paddr,
> +				balloon_hotplug << PAGE_SHIFT);

Use else here.

>  	if (rc) {
>  		pr_warn("Cannot add additional memory (%i)\n", rc);
>