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>
master commit: ddc5a85fbcfbacc34bbd9abcdb12923de2fc27b3
master date: 2019-09-26 18:06:07 +0200

diff --git a/xen/common/memory.c b/xen/common/memory.c
index f71163221f47436d29c46e5ff813eb1505497209..dee85f149661e7eb5415ad108fb7d9ebcdc1fcdc 100644 (file)
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -1163,7 +1163,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;