Re: [PATCH] xen/balloon: cancel ballooning if adding new memory failed

[Ian Campbell <Ian.Campbell@citrix.com>]

On Mon, 2014-09-01 at 18:52 +0100, David Vrabel wrote:
> If the balloon driver is adding additional memory regions to the
> balloon and add_memory() fails it will likely continuously fail so
> cancel the balloon operation.
> 
> Signed-off-by: David Vrabel <david.vrabel@citrix.com>

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776448 and
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1304001 seem to
suggest this should be a candidate for stable backports?

Ian.

> ---
>  drivers/xen/balloon.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
> index 5c660c7..1e0a317 100644
> --- a/drivers/xen/balloon.c
> +++ b/drivers/xen/balloon.c
> @@ -230,8 +230,8 @@ static enum bp_state reserve_additional_memory(long credit)
>  	rc = add_memory(nid, hotplug_start_paddr, balloon_hotplug << PAGE_SHIFT);
>  
>  	if (rc) {
> -		pr_info("%s: add_memory() failed: %i\n", __func__, rc);
> -		return BP_EAGAIN;
> +		pr_warn("Cannot add additional memory (%i)\n", rc);
> +		return BP_ECANCELED;
>  	}
>  
>  	balloon_hotplug -= credit;