From: Sergey Dyasli <sergey.dyasli@citrix.com>
Date: Thu, 26 Sep 2019 16:06:07 +0000 (+0200)
Subject: x86/shim: fix ballooning down the guest
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1428
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ddc5a85fbcfbacc34bbd9abcdb12923de2fc27b3;p=xen.git

x86/shim: fix ballooning down the guest

Currently ballooning down a pvshim guest causes the following errors
inside the shim:

    d3v0 failed to reserve 512 extents of order 512 for offlining

And the ballooned-out pages stay inside shim and don't reach L0 Xen.

Fix this by passing the correct arguments to pv_shim_offline_memory()
during a XENMEM_decrease_reservation request.

Fixes: b2245acc60c3 ('xen/pvshim: memory hotplug')
Signed-off-by: Sergey Dyasli <sergey.dyasli@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
---

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 7364fd2c33..309e872edf 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -1225,7 +1225,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
              * hypercall has failed and only part of the extents where
              * processed.
              */
-            pv_shim_offline_memory(args.nr_extents, args.nr_done);
+            pv_shim_offline_memory(args.nr_done, args.extent_order);
 #endif
 
         break;