Drivers: hv: vmbus: Cleanup vmbus_teardown_gpadl() (66be6530) · Commits · 戴 / test

Eliminate calls to BUG_ON() by properly handling errors. In cases where rollback is possible, we will return the appropriate error to have the calling code decide how to rollback state. In the case where we are transferring ownership of the guest physical pages to the host, we will wait for the host to respond. Signed-off-by:

K. Y. Srinivasan <kys@microsoft.com> Cc: <stable@vger.kernel.org> Tested-by:

Sitsofe Wheeler <sitsofe@yahoo.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/hv/channel.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -435,7 +435,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
		struct vmbus_channel_gpadl_teardown *msg;
		struct vmbus_channel_msginfo *info;
		unsigned long flags;
		int ret, t;
		int ret;

		info = kmalloc(sizeof(*info) +
		sizeof(struct vmbus_channel_gpadl_teardown), GFP_KERNEL);
		@@ -457,11 +457,12 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
		ret = vmbus_post_msg(msg,
		sizeof(struct vmbus_channel_gpadl_teardown));

		BUG_ON(ret != 0);
		t = wait_for_completion_timeout(&info->waitevent, 5*HZ);
		BUG_ON(t == 0);
		if (ret)
		goto post_msg_err;

		wait_for_completion(&info->waitevent);

		/* Received a torndown response */
		post_msg_err:
		spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
		list_del(&info->msglistentry);
		spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);

Admin message