Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09755690 authored by Nadav Amit's avatar Nadav Amit Committed by Greg Kroah-Hartman
Browse files

vmw_balloon: fix inflation of 64-bit GFNs 



When balloon batching is not supported by the hypervisor, the guest
frame number (GFN) must fit in 32-bit. However, due to a bug, this check
was mistakenly ignored. In practice, when total RAM is greater than
16TB, the balloon does not work currently, making this bug unlikely to
happen.

Fixes: ef0f8f11 ("VMware balloon: partially inline vmballoon_reserve_page.")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarXavier Deguillard <xdeguillard@vmware.com>
Signed-off-by: default avatarNadav Amit <namit@vmware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 10f14663

drivers/misc/vmw_balloon.c

+7 −6
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static int vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn, 


	pfn32 = (u32)pfn;

	if (pfn32 != pfn)

		return -1;

		return -EINVAL;



	STATS_INC(b->stats.lock[false]);
@@ -460,7 +460,7 @@ static int vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn, 


	pr_debug("%s - ppn %lx, hv returns %ld\n", __func__, pfn, status);

	STATS_INC(b->stats.lock_fail[false]);

	return 1;

	return -EIO;

}



static int vmballoon_send_batched_lock(struct vmballoon *b,
@@ -597,11 +597,12 @@ static int vmballoon_lock_page(struct vmballoon *b, unsigned int num_pages, 


	locked = vmballoon_send_lock_page(b, page_to_pfn(page), &hv_status,

								target);

	if (locked > 0) {

	if (locked) {

		STATS_INC(b->stats.refused_alloc[false]);



		if (hv_status == VMW_BALLOON_ERROR_RESET ||

				hv_status == VMW_BALLOON_ERROR_PPN_NOTNEEDED) {

		if (locked == -EIO &&

		    (hv_status == VMW_BALLOON_ERROR_RESET ||

		     hv_status == VMW_BALLOON_ERROR_PPN_NOTNEEDED)) {

			vmballoon_free_page(page, false);

			return -EIO;

		}
@@ -617,7 +618,7 @@ static int vmballoon_lock_page(struct vmballoon *b, unsigned int num_pages, 
		} else {

			vmballoon_free_page(page, false);

		}

		return -EIO;

		return locked;

	}



	/* track allocated page */