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

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

vmw_balloon: VMCI_DOORBELL_SET does not check status 



When vmballoon_vmci_init() sets a doorbell using VMCI_DOORBELL_SET, for
some reason it does not consider the status and looks at the result.
However, the hypervisor does not update the result - it updates the
status. This might cause VMCI doorbell not to be enabled, resulting in
degraded performance.

Fixes: 48e3d668 ("VMware balloon: Enable notification via VMCI")
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 5081efd1

drivers/misc/vmw_balloon.c

+19 −18
Original line number Diff line number Diff line
@@ -1036,29 +1036,30 @@ static void vmballoon_vmci_cleanup(struct vmballoon *b) 
 */

static int vmballoon_vmci_init(struct vmballoon *b)

{

	int error = 0;

	unsigned long error, dummy;



	if ((b->capabilities & VMW_BALLOON_SIGNALLED_WAKEUP_CMD) == 0)

		return 0;



	if ((b->capabilities & VMW_BALLOON_SIGNALLED_WAKEUP_CMD) != 0) {

		error = vmci_doorbell_create(&b->vmci_doorbell,

				VMCI_FLAG_DELAYED_CB,

	error = vmci_doorbell_create(&b->vmci_doorbell, VMCI_FLAG_DELAYED_CB,

				     VMCI_PRIVILEGE_FLAG_RESTRICTED,

				     vmballoon_doorbell, b);



		if (error == VMCI_SUCCESS) {

			VMWARE_BALLOON_CMD(VMCI_DOORBELL_SET,

					b->vmci_doorbell.context,

					b->vmci_doorbell.resource, error);

			STATS_INC(b->stats.doorbell_set);

		}

	}

	if (error != VMCI_SUCCESS)

		goto fail;



	if (error != 0) {

		vmballoon_vmci_cleanup(b);

	error = VMWARE_BALLOON_CMD(VMCI_DOORBELL_SET, b->vmci_doorbell.context,

				   b->vmci_doorbell.resource, dummy);



		return -EIO;

	}

	STATS_INC(b->stats.doorbell_set);



	if (error != VMW_BALLOON_SUCCESS)

		goto fail;



	return 0;

fail:

	vmballoon_vmci_cleanup(b);

	return -EIO;

}



/*