]> asedeno.scripts.mit.edu Git - linux.git/commit
vmw_balloon: do not use 2MB without batching
authorNadav Amit <namit@vmware.com>
Tue, 19 Jun 2018 23:00:25 +0000 (16:00 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Jul 2018 10:56:30 +0000 (12:56 +0200)
commit5081efd112560d3febb328e627176235b250d59d
treed0097568b2c08f76cf0c0ae4adcb4c4c6ad77ff1
parent09755690c6b7c1eabdc4651eb3b276f8feb1e447
vmw_balloon: do not use 2MB without batching

If the hypervisor sets 2MB batching is on, while batching is cleared,
the balloon code breaks. In this case the legacy mechanism is used with
2MB page. The VM would report a 2MB page is ballooned, and the
hypervisor would only take the first 4KB.

While the hypervisor should not report such settings, make the code more
robust by not enabling 2MB support without batching.

Fixes: 365bd7ef7ec8e ("VMware balloon: Support 2m page ballooning.")
Cc: stable@vger.kernel.org
Reviewed-by: Xavier Deguillard <xdeguillard@vmware.com>
Signed-off-by: Nadav Amit <nadav.amit@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/vmw_balloon.c