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

Commit 75ff3a8a authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Greg Kroah-Hartman
Browse files

Drivers: hv: vmbus: avoid wait_for_completion() on crash 



wait_for_completion() may sleep, it enables interrupts and this
is something we really want to avoid on crashes because interrupt
handlers can cause other crashes. Switch to the recently introduced
vmbus_wait_for_unload() doing busy wait instead.

Reported-by: default avatarRadim Krcmar <rkrcmar@redhat.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarRadim <Kr.má&lt;rkrcmar@redhat.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7be3e169

drivers/hv/channel_mgmt.c

+2 −2
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static void vmbus_unload_response(struct vmbus_channel_message_header *hdr) 
	complete(&vmbus_connection.unload_event);

}



void vmbus_initiate_unload(void)

void vmbus_initiate_unload(bool crash)

{

	struct vmbus_channel_message_header hdr;
@@ -658,7 +658,7 @@ void vmbus_initiate_unload(void) 
	 * vmbus_initiate_unload() is also called on crash and the crash can be

	 * happening in an interrupt context, where scheduling is impossible.

	 */

	if (!in_interrupt())

	if (!crash)

		wait_for_completion(&vmbus_connection.unload_event);

	else

		vmbus_wait_for_unload();

drivers/hv/connection.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ void vmbus_disconnect(void) 
	/*

	 * First send the unload request to the host.

	 */

	vmbus_initiate_unload();

	vmbus_initiate_unload(false);



	if (vmbus_connection.work_queue) {

		drain_workqueue(vmbus_connection.work_queue);

drivers/hv/hyperv_vmbus.h

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ void hv_vss_onchannelcallback(void *); 
int hv_fcopy_init(struct hv_util_service *);

void hv_fcopy_deinit(void);

void hv_fcopy_onchannelcallback(void *);

void vmbus_initiate_unload(void);

void vmbus_initiate_unload(bool crash);



static inline void hv_poll_channel(struct vmbus_channel *channel,

				   void (*cb)(void *))

drivers/hv/vmbus_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ static void hv_kexec_handler(void) 
	int cpu;



	hv_synic_clockevents_cleanup();

	vmbus_initiate_unload();

	vmbus_initiate_unload(false);

	for_each_online_cpu(cpu)

		smp_call_function_single(cpu, hv_synic_cleanup, NULL, 1);

	hv_cleanup();
@@ -1299,7 +1299,7 @@ static void hv_kexec_handler(void) 


static void hv_crash_handler(struct pt_regs *regs)

{

	vmbus_initiate_unload();

	vmbus_initiate_unload(true);

	/*

	 * In crash handler we can't schedule synic cleanup for all CPUs,

	 * doing the cleanup for current CPU only. This should be sufficient