Commit 7f11a2cc authored by Tianyu Lan's avatar Tianyu Lan Committed by Wei Liu

x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump

If kmsg_dump_register() fails, hv_panic_page will not be used
anywhere.  So free and reset it.

Fixes: 81b18bce ("Drivers: HV: Send one page worth of kmsg dump over Hyper-V during panic")
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Signed-off-by: default avatarTianyu Lan <Tianyu.Lan@microsoft.com>
Link: https://lore.kernel.org/r/20200406155331.2105-3-Tianyu.Lan@microsoft.comSigned-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent 74347a99
...@@ -1385,9 +1385,13 @@ static int vmbus_bus_init(void) ...@@ -1385,9 +1385,13 @@ static int vmbus_bus_init(void)
hv_panic_page = (void *)hv_alloc_hyperv_zeroed_page(); hv_panic_page = (void *)hv_alloc_hyperv_zeroed_page();
if (hv_panic_page) { if (hv_panic_page) {
ret = kmsg_dump_register(&hv_kmsg_dumper); ret = kmsg_dump_register(&hv_kmsg_dumper);
if (ret) if (ret) {
pr_err("Hyper-V: kmsg dump register " pr_err("Hyper-V: kmsg dump register "
"error 0x%x\n", ret); "error 0x%x\n", ret);
hv_free_hyperv_page(
(unsigned long)hv_panic_page);
hv_panic_page = NULL;
}
} else } else
pr_err("Hyper-V: panic message page memory " pr_err("Hyper-V: panic message page memory "
"allocation failed"); "allocation failed");
...@@ -1416,7 +1420,6 @@ static int vmbus_bus_init(void) ...@@ -1416,7 +1420,6 @@ static int vmbus_bus_init(void)
hv_remove_vmbus_irq(); hv_remove_vmbus_irq();
bus_unregister(&hv_bus); bus_unregister(&hv_bus);
hv_free_hyperv_page((unsigned long)hv_panic_page);
unregister_sysctl_table(hv_ctl_table_hdr); unregister_sysctl_table(hv_ctl_table_hdr);
hv_ctl_table_hdr = NULL; hv_ctl_table_hdr = NULL;
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment