Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

hv_balloon: Fix balloon_probe() and balloon_remove() error handling

Browse Source 
Add missing cleanup in balloon_probe() if the call to
balloon_connect_vsp() fails.  Also correctly handle cleanup in
balloon_remove() when dm_state is DM_INIT_ERROR because
balloon_resume() failed.

Signed-off-by: Shradha Gupta <shradhagupta@microsoft.com>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20220516045058.GA7933@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net
Signed-off-by: Wei Liu <wei.liu@kernel.org>
This commit is contained in:
Shradha Gupta 2022-05-15 21:50:58 -07:00 committed by Wei Liu
parent 86c8fb4d22
commit d27423bf04
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/hv/hv_balloon.c
View File

@ -1842,7 +1842,7 @@ static int balloon_probe(struct hv_device *dev,
ret = balloon_connect_vsp(dev); ret = balloon_connect_vsp(dev);
if (ret != 0) if (ret != 0)
return ret; goto connect_error;
enable_page_reporting(); enable_page_reporting();
dm_device.state = DM_INITIALIZED; dm_device.state = DM_INITIALIZED;
@ -1861,6 +1861,7 @@ probe_error:
dm_device.thread = NULL; dm_device.thread = NULL;
disable_page_reporting(); disable_page_reporting();
vmbus_close(dev->channel); vmbus_close(dev->channel);
connect_error:
#ifdef CONFIG_MEMORY_HOTPLUG #ifdef CONFIG_MEMORY_HOTPLUG
unregister_memory_notifier(&hv_memory_nb); unregister_memory_notifier(&hv_memory_nb);
restore_online_page_callback(&hv_online_page); restore_online_page_callback(&hv_online_page);
@ -1882,12 +1883,21 @@ static int balloon_remove(struct hv_device *dev)
cancel_work_sync(&dm->ha_wrk.wrk); cancel_work_sync(&dm->ha_wrk.wrk);
kthread_stop(dm->thread); kthread_stop(dm->thread);
disable_page_reporting();
vmbus_close(dev->channel); /*
* This is to handle the case when balloon_resume()
* call has failed and some cleanup has been done as
* a part of the error handling.
*/
if (dm_device.state != DM_INIT_ERROR) {
disable_page_reporting();
vmbus_close(dev->channel);
#ifdef CONFIG_MEMORY_HOTPLUG #ifdef CONFIG_MEMORY_HOTPLUG
unregister_memory_notifier(&hv_memory_nb); unregister_memory_notifier(&hv_memory_nb);
restore_online_page_callback(&hv_online_page); restore_online_page_callback(&hv_online_page);
#endif #endif
}
spin_lock_irqsave(&dm_device.ha_lock, flags); spin_lock_irqsave(&dm_device.ha_lock, flags);
list_for_each_entry_safe(has, tmp, &dm->ha_region_list, list) { list_for_each_entry_safe(has, tmp, &dm->ha_region_list, list) {
list_for_each_entry_safe(gap, tmp_gap, &has->gap_list, list) { list_for_each_entry_safe(gap, tmp_gap, &has->gap_list, list) {
@ -1948,6 +1958,7 @@ close_channel:
vmbus_close(dev->channel); vmbus_close(dev->channel);
out: out:
dm_device.state = DM_INIT_ERROR; dm_device.state = DM_INIT_ERROR;
disable_page_reporting();
#ifdef CONFIG_MEMORY_HOTPLUG #ifdef CONFIG_MEMORY_HOTPLUG
unregister_memory_notifier(&hv_memory_nb); unregister_memory_notifier(&hv_memory_nb);
restore_online_page_callback(&hv_online_page); restore_online_page_callback(&hv_online_page);